ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.394 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 184
123############################################################################# 185#############################################################################
124 186
125=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
126 188
162 224
163The raw value load value from the last tick. 225The raw value load value from the last tick.
164 226
165=item %cf::CFG 227=item %cf::CFG
166 228
167Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 230from wherever your confdir points to.
169 231
170=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
171 233
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 237
176=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
177 239
178This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 242that call.
181 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
182=back 250=back
183 251
184=cut 252=cut
185 253
186BEGIN { 254$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 255 my $msg = join "", @_;
189 256
190 $msg .= "\n" 257 $msg .= "\n"
191 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
192 259
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 261
195 LOG llevError, $msg; 262 LOG llevError, $msg;
196 }; 263};
197} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
198 278
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 289for my $pkg (qw(
210 cf::global cf::attachable 290 cf::global cf::attachable
211 cf::object cf::object::player 291 cf::object cf::object::player
212 cf::client cf::player 292 cf::client cf::player
213 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
214 cf::map cf::party cf::region 295 cf::party cf::region
215)) { 296)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 298}
219 299
220$Event::DIED = sub { 300$EV::DIED = sub {
221 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
222}; 302};
223 303
224############################################################################# 304#############################################################################
225 305
226=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 329 $d
250 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
251} 331}
252 332
253=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
254 334
255Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
256 336
257=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
258 338
259Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
260 340
261=cut 341=cut
262 342
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 344
265sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
267 361
268=item cf::lock_wait $string 362=item cf::lock_wait $string
269 363
270Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
271 365
272=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
273 367
274Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
277returned. 371returned.
278 372
279Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 374deadlocked coro.
286 380
287Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
288 382
289=cut 383=cut
290 384
291our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 386
294sub lock_wait($) { 387sub lock_wait($) {
295 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 389}
308 390
309sub lock_acquire($) { 391sub lock_acquire($) {
310 my ($key) = @_; 392 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 393}
324 394
325sub lock_active($) { 395sub lock_active($) {
326 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 397}
330 398
331sub freeze_mainloop { 399sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
333 401
334 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 403}
336 }; 404
337 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
338 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
339} 418}
340 419
341=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
342 421
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 430
352=cut 431=cut
353 432
354our @SLOT_QUEUE; 433our @SLOT_QUEUE;
355our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
356 436
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
360 440
361 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
362 443
363 while () { 444 while () {
364 next_job: 445 next_job:
446
365 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 448
367 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 453 $job->[2]->send;
371 Coro::cede; 454 Coro::cede;
372 goto next_job; 455 goto next_job;
373 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 458 }
375 } 459 }
376 460
377 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 464 $signal->wait;
381 } else { 465 } else {
466 $busy = 0;
382 Coro::schedule; 467 Coro::schedule;
383 } 468 }
384 } 469 }
385}; 470};
386 471
387sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
388 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
389 476
390 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
391 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
392 480
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
422 510
423sub sync_job(&) { 511sub sync_job(&) {
424 my ($job) = @_; 512 my ($job) = @_;
425 513
426 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 515 my $time = AE::time;
428 516
429 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
431 519
432 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
433 521
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
437 523
438 my $busy = 1; 524 my $busy = 1;
439 my @res; 525 my @res;
440 526
447 533
448 while ($busy) { 534 while ($busy) {
449 if (Coro::nready) { 535 if (Coro::nready) {
450 Coro::cede_notself; 536 Coro::cede_notself;
451 } else { 537 } else {
452 Event::one_event; 538 EV::loop EV::LOOP_ONESHOT;
453 } 539 }
454 } 540 }
455 541
456 $time = Event::time - $time; 542 my $time = AE::time - $time;
457 543
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
462 545
463 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
464 } else { 547 } else {
465 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
466 549
491=item fork_call { }, $args 574=item fork_call { }, $args
492 575
493Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
497 580
498=cut 581=cut
499 582
500sub fork_call(&@) { 583sub fork_call(&@) {
501 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
508 reset_signals; 591 reset_signals;
509 &$cb 592 &$cb
510 }, @args; 593 }, @args;
511 594
512 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
513} 634}
514 635
515=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
516 637
517Returns a single value from the environment database. 638Returns a single value from the environment database.
656 777
657############################################################################# 778#############################################################################
658 779
659=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
660 781
661Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
664 785
665In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
716=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
717 838
718Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
720 841
721Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
723 844
724These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
725 846
726=over 4 847=over 4
954 } 1075 }
955 1076
956 0 1077 0
957} 1078}
958 1079
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1081
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1083
963Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
964 1085
1017 1138
1018sub reattach { 1139sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1141 my ($obj) = @_;
1021 1142
1143 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1145
1024 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1025 1147
1026 @$registry = (); 1148 @$registry = ();
1027 1149
1042cf::attachable->attach ( 1164cf::attachable->attach (
1043 prio => -1000000, 1165 prio => -1000000,
1044 on_instantiate => sub { 1166 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1046 1168
1047 $data = from_json $data; 1169 $data = decode_json $data;
1048 1170
1049 for (@$data) { 1171 for (@$data) {
1050 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1051 1173
1052 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1076 1198
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1204 aio_fsync $fh;
1205 }
1081 close $fh; 1206 aio_close $fh;
1082 1207
1083 if (@$objs) { 1208 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1089 close $fh; 1217 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1219 }
1092 } else { 1220 } else {
1093 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1094 } 1222 }
1095 1223
1096 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1228 } else {
1098 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1099 } 1230 }
1100 } else { 1231 } else {
1101 aio_unlink $filename; 1232 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1103 } 1234 }
1194 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1195 1326
1196 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1197} 1328}
1198 1329
1330use File::Glob ();
1331
1199cf::player->attach ( 1332cf::player->attach (
1200 on_command => sub { 1333 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1202 1335
1203 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1204 or return; 1337 or return;
1205 1338
1235 1368
1236 cf::override; 1369 cf::override;
1237 }, 1370 },
1238); 1371);
1239 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1240sub load_extensions { 1386sub load_extensions {
1241 cf::sync_job { 1387 cf::sync_job {
1242 my %todo; 1388 my %todo;
1243 1389
1244 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1263 1409
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1412
1267 $ext{source} = 1413 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1270 . $source 1416 . $source
1271 . "\n};\n1"; 1417 . "\n};\n1";
1272 1418
1273 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1274 } 1420 }
1275 1421
1422 my $pass = 0;
1276 my %done; 1423 my %done;
1277 while (%todo) { 1424 while (%todo) {
1278 my $progress; 1425 my $progress;
1279 1426
1427 ++$pass;
1428
1429 ext:
1280 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1432 next ext
1283 unless exists $done{$_}; 1433 unless exists $done{$_};
1284 } 1434 }
1285 1435
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1437
1288 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1293 warn $msg; 1445
1294 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1447 delete $todo{$k};
1296 } 1448 } else {
1297 1449 $done{$k} = delete $todo{$k};
1298 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1299 } 1455 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1456 }
1305 1457
1306 skip: 1458 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1309 } 1466 }
1310 }; 1467 };
1311} 1468}
1312 1469
1313############################################################################# 1470#############################################################################
1314 1471
1315=back 1472=back
1316 1473
1317=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1318 1475
1319Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1320 1477
1321=cut 1478=cut
1322 1479
1323package cf::player; 1480package cf::player;
1324 1481
1367 1524
1368sub exists($) { 1525sub exists($) {
1369 my ($login) = @_; 1526 my ($login) = @_;
1370 1527
1371 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1373} 1530}
1374 1531
1375sub find($) { 1532sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1534 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1547 or return;
1391 1548
1392 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1393 or return; 1550 or return;
1551
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1397 } 1555 }
1398 } 1556 }
1399} 1557}
1400 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1401sub save($) { 1572sub save($) {
1402 my ($pl) = @_; 1573 my ($pl) = @_;
1403 1574
1404 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1405 1576
1408 1579
1409 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1410 1581
1411 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1589
1414 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1591 cf::cede_to_tick;
1416} 1592}
1417 1593
1449 my ($pl) = @_; 1625 my ($pl) = @_;
1450 1626
1451 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1452 1628
1453 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1631
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1460 1638
1461 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1679
1502 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1503 my $path = path $login; 1681 my $path = path $login;
1504 1682
1505 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1689 }
1511 1690
1542 } 1721 }
1543 1722
1544 \@paths 1723 \@paths
1545} 1724}
1546 1725
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1727
1549Expand crossfire pod fragments into protocol xml. 1728Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1729
1640=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1641 1731
1642Sends an ext reply to the player. 1732Sends an ext reply to the player.
1643 1733
1710our $MAX_RESET = 3600; 1800our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1801our $DEFAULT_RESET = 3000;
1712 1802
1713sub generate_random_map { 1803sub generate_random_map {
1714 my ($self, $rmp) = @_; 1804 my ($self, $rmp) = @_;
1805
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807
1715 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1809 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1720 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1721 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1722 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1723 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1841 1934
1842# the temporary/swap location 1935# the temporary/swap location
1843sub save_path { 1936sub save_path {
1844 my ($self) = @_; 1937 my ($self) = @_;
1845 1938
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1939 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1940 "$TMPDIR/$path.map"
1848} 1941}
1849 1942
1850# the unique path, undef == no special unique path 1943# the unique path, undef == no special unique path
1851sub uniq_path { 1944sub uniq_path {
1852 my ($self) = @_; 1945 my ($self) = @_;
1853 1946
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 1949}
1866 1950
1867sub decay_objects { 1951sub decay_objects {
1868 my ($self) = @_; 1952 my ($self) = @_;
1869 1953
1953sub find { 2037sub find {
1954 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
1955 2039
1956 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
1957 2041
1958 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2044
1961 $cf::MAP{$path} || do { 2045 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 2046 my $map = new_from_path cf::map $path
1966 or return; 2047 or return;
1967 2048
1968 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
1969 2050
1971 or return; 2052 or return;
1972 2053
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2054 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2055 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2056 #$cf::WAIT_FOR_TICK->wait;
2057 undef $guard2;
1976 undef $guard1; 2058 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2059 $map->reset;
1979 return find $path; 2060 return find $path;
1980 } 2061 }
1981 2062
1982 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
1983 } 2064 }
1984} 2065}
1985 2066
1986sub pre_load { } 2067sub pre_load { }
1987sub post_load { } 2068#sub post_load { } # XS
1988 2069
1989sub load { 2070sub load {
1990 my ($self) = @_; 2071 my ($self) = @_;
1991 2072
1992 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2090 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2091 $f->skip_block;
2011 $self->_load_objects ($f) 2092 $self->_load_objects ($f)
2012 or return; 2093 or return;
2013 2094
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2095 $self->post_load_original
2015 if delete $self->{load_original}; 2096 if delete $self->{load_original};
2016 2097
2017 if (my $uniq = $self->uniq_path) { 2098 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2099 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2100 unless (aio_stat $uniq) {
2037 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2119 $self->decay_objects;
2039 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2040 $self->update_buttons; 2121 $self->update_buttons;
2041 cf::cede_to_tick; 2122 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2123 $self->activate;
2045 } 2124 }
2046 2125
2047 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2049 2128
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2130 }
2052 2131
2053 $self->post_load; 2132 $self->post_load;
2054} 2133}
2055 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2056sub customise_for { 2138sub customise_for {
2057 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2058 2140
2059 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2060 if $self->per_player; 2142 if $self->per_player;
2113 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2114 2196
2115 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2116 2198
2117 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2201 }
2120 2202
2121 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2122 2204
2123 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2137 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2138 2220
2139 () 2221 ()
2140} 2222}
2141 2223
2224# common code, used by both ->save and ->swapout
2142sub save { 2225sub _save {
2143 my ($self) = @_; 2226 my ($self) = @_;
2144
2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
2146 2227
2147 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2148 2229
2149 return unless $self->dirty; 2230 return unless $self->dirty;
2150 2231
2159 2240
2160 cf::async { 2241 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2242 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2243 $_->contr->save for $self->players;
2163 }; 2244 };
2245
2246 cf::get_slot 0.02;
2164 2247
2165 if ($uniq) { 2248 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2250 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2251 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2253 }
2171} 2254}
2172 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2173sub swap_out { 2264sub swap_out {
2174 my ($self) = @_; 2265 my ($self) = @_;
2175 2266
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2268
2269 return if $self->in_memory != cf::MAP_ACTIVE;
2270 return if $self->{deny_save};
2181 return if $self->players; 2271 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2183 return if $self->{deny_save};
2184 2272
2185 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2186
2187 $self->deactivate; 2274 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2189 $self->clear; 2282 $self->clear;
2190} 2283}
2191 2284
2192sub reset_at { 2285sub reset_at {
2193 my ($self) = @_; 2286 my ($self) = @_;
2212 2305
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2307
2215 return if $self->players; 2308 return if $self->players;
2216 2309
2217 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2218 2311
2219 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2220 2313
2221 # need to save uniques path 2314 # need to save uniques path
2222 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2305 2398
2306sub unique_maps() { 2399sub unique_maps() {
2307 [ 2400 [
2308 map { 2401 map {
2309 utf8::decode $_; 2402 utf8::decode $_;
2310 /\.map$/ 2403 s/\.map$//; # TODO future compatibility hack
2404 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2405 ? ()
2311 ? normalise $_ 2406 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2408 ]
2315} 2409}
2316 2410
2317package cf; 2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2318 2442
2319=back 2443=back
2320 2444
2321=head3 cf::object 2445=head3 cf::object
2322 2446
2326 2450
2327=over 4 2451=over 4
2328 2452
2329=item $ob->inv_recursive 2453=item $ob->inv_recursive
2330 2454
2331Returns the inventory of the object _and_ their inventories, recursively. 2455Returns the inventory of the object I<and> their inventories, recursively,
2456but I<not> the object itself.
2332 2457
2333=cut 2458=cut
2334 2459
2335sub inv_recursive_; 2460sub inv_recursive_;
2336sub inv_recursive_ { 2461sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2466 inv_recursive_ inv $_[0]
2342} 2467}
2343 2468
2344=item $ref = $ob->ref 2469=item $ref = $ob->ref
2345 2470
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2471Creates and returns a persistent reference to an object that can be stored as a string.
2347 2472
2348=item $ob = cf::object::deref ($refstring) 2473=item $ob = cf::object::deref ($refstring)
2349 2474
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2475returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2476even if the object actually exists. May block.
2383can be C<undef>. Does the right thing when the player is currently in a 2508can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2509dialogue with the given NPC character.
2385 2510
2386=cut 2511=cut
2387 2512
2513our $SAY_CHANNEL = {
2514 id => "say",
2515 title => "Map",
2516 reply => "say ",
2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2518};
2519
2520our $CHAT_CHANNEL = {
2521 id => "chat",
2522 title => "Chat",
2523 reply => "chat ",
2524 tooltip => "Player chat and shouts, global to the server.",
2525};
2526
2388# rough implementation of a future "reply" method that works 2527# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2528# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2529#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2530sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2531 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2542 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2543 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2544
2406 } else { 2545 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2546 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2547 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2548 }
2410 } 2549 }
2411} 2550}
2412 2551
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2552=item $object->send_msg ($channel, $msg, $color, [extra...])
2438 2577
2439=item $player_object->enter_link 2578=item $player_object->enter_link
2440 2579
2441Freezes the player and moves him/her to a special map (C<{link}>). 2580Freezes the player and moves him/her to a special map (C<{link}>).
2442 2581
2443The player should be reasonably safe there for short amounts of time. You 2582The player should be reasonably safe there for short amounts of time (e.g.
2444I<MUST> call C<leave_link> as soon as possible, though. 2583for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link
2585map.
2445 2586
2446Will never block. 2587Will never block.
2447 2588
2448=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2449 2590
2474 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2475 2616
2476 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2477 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2478 2619
2479 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2480} 2621}
2481 2622
2482sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2483 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2484 2625
2501 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2502 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2503 2644
2504 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2505 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2506 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2507 2648
2508 $map->load; 2649 $map->load;
2509 $map->load_neighbours; 2650 $map->load_neighbours;
2510 2651
2511 return unless $self->contr->active; 2652 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2653
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2516} 2659}
2517 2660
2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2519 2662
2520Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2521her, loading and preparing them map, calling the provided $check callback 2664her, loading and preparing them map, calling the provided $check callback
2522that has to return the map if sucecssful, and then unfreezes the player on 2665that has to return the map if sucecssful, and then unfreezes the player on
2523the new (success) or old (failed) map position. In either case, $done will 2666the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process. 2667be called at the end of this process.
2668
2669Note that $check will be called with a potentially non-loaded map, so if
2670it needs a loaded map it has to call C<< ->load >>.
2525 2671
2526=cut 2672=cut
2527 2673
2528our $GOTOGEN; 2674our $GOTOGEN;
2529 2675
2608} 2754}
2609 2755
2610sub prepare_random_map { 2756sub prepare_random_map {
2611 my ($exit) = @_; 2757 my ($exit) = @_;
2612 2758
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2759 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2760 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2761 # that depends on the exit object
2618 2762
2619 my $rmp = parse_random_map_params $exit->msg; 2763 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2765 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2766 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2767 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2768 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2769 $rmp->{origin_y} = $exit->y;
2770
2771 $exit->map->touch;
2626 } 2772 }
2627 2773
2628 $rmp->{random_seed} ||= $exit->random_seed; 2774 $rmp->{random_seed} ||= $exit->random_seed;
2629 2775
2630 my $data = cf::to_json $rmp; 2776 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2777 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2778 my $meta = "$RANDOMDIR/$md5.meta";
2633 2779
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2780 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2781 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2782 undef $fh;
2637 aio_rename "$meta~", $meta; 2783 aio_rename "$meta~", $meta;
2638 2784
2785 my $slaying = "?random/$md5";
2786
2787 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2788 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2789 $exit->msg (undef);
2790 }
2641 } 2791 }
2642} 2792}
2643 2793
2644sub cf::object::player::enter_exit { 2794sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2795 my ($self, $exit) = @_;
2646 2796
2647 return unless $self->type == cf::PLAYER; 2797 return unless $self->type == cf::PLAYER;
2648 2798
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2799 $self->enter_link;
2661 2800
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2801 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2802 $Coro::current->{desc} = "enter_exit";
2668 2803
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2804 unless (eval {
2805 $self->deactivate_recursive; # just to be sure
2806
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2816 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp;
2818
2671 $self->goto ($slaying, $hp, $sp); 2819 $self->goto ($map, $x, $y);
2672 2820
2821 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y)
2823 if $exit->flag (cf::FLAG_DAMNED);
2824
2673 1; 2825 1
2674 }) { 2826 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "I'll try to bring you back to the map you were before. " 2828 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2831
2680 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
2697sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2698 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2699 2851
2700 utf8::encode $text; 2852 utf8::encode $text;
2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2854}
2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2702} 2879}
2703 2880
2704=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2705 2882
2706Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2710 2887
2711=cut 2888=cut
2712 2889
2713# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2714our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2715 "c/identify" => { 2898 "c/identify" => {
2716 id => "infobox", 2899 id => "infobox",
2717 title => "Identify", 2900 title => "Identify",
2718 reply => undef, 2901 reply => undef,
2719 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2721 "c/examine" => { 2904 "c/examine" => {
2722 id => "infobox", 2905 id => "infobox",
2723 title => "Examine", 2906 title => "Examine",
2724 reply => undef, 2907 reply => undef,
2725 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2726 }, 2915 },
2727 "c/book" => { 2916 "c/book" => {
2728 id => "infobox", 2917 id => "infobox",
2729 title => "Book", 2918 title => "Book",
2730 reply => undef, 2919 reply => undef,
2746 id => "infobox", 2935 id => "infobox",
2747 title => "Body Parts", 2936 title => "Body Parts",
2748 reply => undef, 2937 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2750 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2946 "c/skills" => {
2947 id => "infobox",
2948 title => "Skills",
2949 reply => undef,
2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2751 "c/uptime" => { 2976 "c/uptime" => {
2752 id => "infobox", 2977 id => "infobox",
2753 title => "Uptime", 2978 title => "Uptime",
2754 reply => undef, 2979 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
2758 id => "infobox", 2983 id => "infobox",
2759 title => "Map Info", 2984 title => "Map Info",
2760 reply => undef, 2985 reply => undef,
2761 tooltip => "Information related to the maps", 2986 tooltip => "Information related to the maps",
2762 }, 2987 },
2988 "c/party" => {
2989 id => "party",
2990 title => "Party",
2991 reply => "gsay ",
2992 tooltip => "Messages and chat related to your party",
2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2763); 3002);
2764 3003
2765sub cf::client::send_msg { 3004sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2767 3006
2768 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2769 3009
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 3011
2772 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2775 3015
2776 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2780 3018
2781 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 3024 }
2788 3025
2789 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2790 } 3027 }
2791 3028
2792 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2793 3030
2794 if ($self->can_msg) {
2795 # default colour, mask it out 3031 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2798 3034
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 3038 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 3039
2813 $color &= cf::NDI_COLOR_MASK; 3040 $self->send_big_packet ($pkt);
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826} 3041}
2827 3042
2828=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2829 3044
2830Sends an ext event to the client. 3045Sends an ext event to the client.
2833 3048
2834sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2835 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2836 3051
2837 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2840 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 } 3057 }
2843} 3058}
2844 3059
2845=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2846 3061
2850 3065
2851sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2853 3068
2854 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove 3072 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 } 3075 }
2861} 3076}
2862 3077
2863=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2864 3079
2965 3180
2966 $coro 3181 $coro
2967} 3182}
2968 3183
2969cf::client->attach ( 3184cf::client->attach (
2970 on_destroy => sub { 3185 on_client_destroy => sub {
2971 my ($ns) = @_; 3186 my ($ns) = @_;
2972 3187
2973 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2974 }, 3189 },
2975); 3190);
2991our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
2992 3207
2993$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
2994 3209
2995$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
2997 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
2998 sort time 3213 sort time
2999)); 3214));
3000 3215
3001# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3004 3219
3005The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3006 3221
3007 cf::object 3222 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3224 insert remove name archname title slaying race decrease split
3225 value
3010 3226
3011 cf::object::player 3227 cf::object::player
3012 player 3228 player
3013 3229
3014 cf::player 3230 cf::player
3019 3235
3020=cut 3236=cut
3021 3237
3022for ( 3238for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3029) { 3245) {
3030 no strict 'refs'; 3246 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 3266
3051 my $qcode = $code; 3267 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3054 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3055 local $_; 3274 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars;
3057 3275
3058 my $eval = 3276 my $eval =
3059 "do {\n" 3277 "do {\n"
3060 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3061 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3062 . $code 3280 . $code
3063 . "\n}" 3281 . "\n}"
3064 ; 3282 ;
3065 3283
3284 if ($CFG{safe_eval}) {
3066 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3067 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3068 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3069 3293
3070 if ($@) { 3294 if ($@) {
3071 warn "$@"; 3295 warn "$@";
3072 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3073 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3092=cut 3316=cut
3093 3317
3094sub register_script_function { 3318sub register_script_function {
3095 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3096 3320
3097 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3098 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3099} 3323}
3100 3324
3101=back 3325=back
3102 3326
3103=cut 3327=cut
3124 3348
3125 $facedata->{version} == 2 3349 $facedata->{version} == 2
3126 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127 3351
3128 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3129 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC, 3355 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3132 }; 3358 };
3133 cf::cede_to_tick; 3359 cf::cede_to_tick;
3134 3360
3135 { 3361 {
3136 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3137 3363
3138 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3366
3140 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3144 3371
3145 cf::cede_to_tick; 3372 cf::cede_to_tick;
3146 } 3373 }
3147 3374
3148 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3376 next unless $info->{smooth};
3377
3150 my $idx = cf::face::find $face 3378 my $idx = cf::face::find $face
3151 or next; 3379 or next;
3380
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3381 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3382 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3384 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3385 warn "smooth face '$info->{smooth}' not found for face '$face'";
3170 3399
3171 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3172 } 3401 }
3173 3402
3174 { 3403 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3178 3405
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3407 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184 3409
3185 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3186 # prepend meta info 3411 cf::face::set_type $idx, $info->{type};
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else { 3412 } else {
3195 $data = $info->{data}; 3413 $RESOURCE{$name} = $info;
3196 } 3414 }
3197 3415
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3416 cf::cede_to_tick;
3202 } 3417 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3418 }
3419
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3421
3223 1 3422 1
3224} 3423}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
3225 3444
3226register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3228 3447
3229 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
3231 } 3450 }
3232}; 3451};
3452
3453sub load_resource_file($) {
3454 my $guard = lock_acquire "load_resource_file";
3455
3456 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100;
3458 cf::arch::commit_load;
3459
3460 $status
3461}
3233 3462
3234sub reload_regions { 3463sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3464 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3465 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3480}
3252 3481
3253sub reload_archetypes { 3482sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3484 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3485}
3262 3486
3263sub reload_treasures { 3487sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3266} 3490}
3267 3491
3268sub reload_resources { 3492sub reload_resources {
3269 warn "reloading resource files...\n"; 3493 warn "reloading resource files...\n";
3270 3494
3495 reload_facedata;
3496 reload_archetypes;
3271 reload_regions; 3497 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3498 reload_treasures;
3276 3499
3277 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3278} 3501}
3279 3502
3280sub init {
3281 reload_resources;
3282}
3283
3284sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3507 or return;
3287 3508
3288 local $/; 3509 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3290 3511
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3513
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3299 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3300 }; 3521 };
3301 warn $@ if $@; 3522 warn $@ if $@;
3302 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3526}
3527
3528sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!";
3531 flock $fh, &Fcntl::LOCK_EX
3532 or die "$PIDFILE: flock: $!";
3533 $fh
3534}
3535
3536# make sure only one server instance is running at any one time
3537sub atomic {
3538 my $fh = pidfile;
3539
3540 my $pid = <$fh>;
3541 kill 9, $pid if $pid > 0;
3542
3543 seek $fh, 0, 0;
3544 print $fh $$;
3545}
3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3303} 3554}
3304 3555
3305sub main { 3556sub main {
3557 cf::init_globals; # initialise logging
3558
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565
3306 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3569 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3571 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3313 }; 3573 };
3314 3574
3575 evthread_start IO::AIO::poll_fileno;
3576
3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3586 reload_resources;
3315 reload_config; 3587 reload_config;
3316 db_init; 3588 db_init;
3589
3590 cf::init_uuid;
3591 cf::init_signals;
3592 cf::init_skills;
3593
3594 cf::init_beforeplay;
3595
3596 atomic;
3597
3317 load_extensions; 3598 load_extensions;
3318 3599
3319 $TICK_WATCHER->start; 3600 utime time, time, $RUNTIMEFILE;
3320 Event::loop; 3601
3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605
3606 (pop @POST_INIT)->(0) while @POST_INIT;
3607 };
3608
3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3321} 3613}
3322 3614
3323############################################################################# 3615#############################################################################
3324# initialisation and cleanup 3616# initialisation and cleanup
3325 3617
3326# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3327BEGIN { 3619BEGIN {
3620 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3336 },
3337 ); 3624 };
3338 } 3625 }
3339} 3626}
3340 3627
3341sub write_runtime { 3628sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3343 3630
3344 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3346 3633
3347 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3635
3349 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3350 3637
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3352 or return; 3639 or return;
3353 3640
3354 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3367 3654
3368 close $fh 3655 close $fh
3369 or return; 3656 or return;
3370 3657
3371 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3659 and return;
3373 3660
3374 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3375 3662
3376 1 3663 1
3664}
3665
3666our $uuid_lock;
3667our $uuid_skip;
3668
3669sub write_uuid_sync($) {
3670 $uuid_skip ||= $_[0];
3671
3672 return if $uuid_lock;
3673 local $uuid_lock = 1;
3674
3675 my $uuid = "$LOCALDIR/uuid";
3676
3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3678 or return;
3679
3680 my $value = uuid_seq uuid_cur;
3681
3682 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n";
3684 return;
3685 }
3686
3687 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0;
3689
3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3691 and return;
3692
3693 # always fsync - this file is important
3694 aio_fsync $fh
3695 and return;
3696
3697 close $fh
3698 or return;
3699
3700 aio_rename "$uuid~", $uuid
3701 and return;
3702
3703 warn "uuid file written ($value).\n";
3704
3705 1
3706
3707}
3708
3709sub write_uuid($$) {
3710 my ($skip, $sync) = @_;
3711
3712 $sync ? write_uuid_sync $skip
3713 : async { write_uuid_sync $skip };
3377} 3714}
3378 3715
3379sub emergency_save() { 3716sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3381 3718
3382 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3383 3720
3384 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3385 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3733 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3735 $pl->save;
3394 } 3736 }
3395 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3396 3738
3397 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3398 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3742 $map->valid or next;
3401 $map->save; 3743 $map->save;
3402 } 3744 }
3403 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3404 3746
3405 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3750
3751 warn "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n";
3408 }; 3754 };
3409 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3410 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3411} 3762}
3412 3763
3413sub post_cleanup { 3764sub post_cleanup {
3414 my ($make_core) = @_; 3765 my ($make_core) = @_;
3415 3766
3416 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3768 if $make_core;
3769
3770 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$;
3772}
3773
3774# a safer delete_package, copied from Symbol
3775sub clear_package($) {
3776 my $pkg = shift;
3777
3778 # expand to full symbol table name if needed
3779 unless ($pkg =~ /^main::.*::$/) {
3780 $pkg = "main$pkg" if $pkg =~ /^::/;
3781 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3782 $pkg .= '::' unless $pkg =~ /::$/;
3783 }
3784
3785 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3786 my $stem_symtab = *{$stem}{HASH};
3787
3788 defined $stem_symtab and exists $stem_symtab->{$leaf}
3789 or return;
3790
3791 # clear all symbols
3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3793 for my $name (keys %$leaf_symtab) {
3794 _gv_clear *{"$pkg$name"};
3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3796 }
3418} 3797}
3419 3798
3420sub do_reload_perl() { 3799sub do_reload_perl() {
3421 # can/must only be called in main 3800 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3423 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3424 return; 3803 return;
3425 } 3804 }
3426 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3427 warn "reloading..."; 3811 warn "reloading...";
3428 3812
3429 warn "entering sync_job"; 3813 warn "entering sync_job";
3430 3814
3431 cf::sync_job { 3815 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3817 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3435 3819
3436 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3822
3439 # if anything goes wrong in here, we should simply crash as we already saved 3823 # if anything goes wrong in here, we should simply crash as we already saved
3440 3824
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3825 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3828 }
3478 3829
3479 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3481 } 3832 %EXT_CORO = ();
3482 3833
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3844
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3494 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3495 } 3854 }
3496 3855
3497 Symbol::delete_package $k; 3856 warn "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859
3860 warn "... unloading $k";
3861 delete $INC{$k};
3862
3863 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g;
3865
3866 if (my $cb = $k->can ("unload_module")) {
3867 $cb->();
3868 }
3869
3870 clear_package $k;
3498 } 3871 }
3499 3872
3500 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 3876
3504 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3880
3508 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3882 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3511 3884
3512 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3513 3886
3514 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3515 require cf; 3888 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3517 3890
3518 warn "loading config and database again"; 3891 warn "loading config and database again";
3519 cf::reload_config; 3892 cf::reload_config;
3520 3893
3521 warn "loading extensions"; 3894 warn "loading extensions";
3522 cf::load_extensions; 3895 cf::load_extensions;
3523 3896
3897 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3530 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3531 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3532 3910
3533 1 3911 1
3534 } or do { 3912 } or do {
3535 warn $@; 3913 warn $@;
3536 warn "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3915 };
3539 3916
3540 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3541}; 3923};
3542 3924
3543our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3544 3926
3545sub reload_perl() { 3927sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3548 3930
3549 $RELOAD_WATCHER ||= Event->timer ( 3931 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 3932 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 3933
3552 data => WF_AUTOCANCEL, 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 3935 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3556 }, 3937 };
3557 ); 3938 };
3558} 3939}
3559 3940
3560register_command "reload" => sub { 3941register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3562 3943
3575 3956
3576our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3578 3959
3579sub wait_for_tick { 3960sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3962
3583 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3965 $signal->wait;
3586} 3966}
3587 3967
3588sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3970
3592 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3973 $signal->wait;
3595} 3974}
3596 3975
3597$TICK_WATCHER = Event->timer ( 3976sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3977 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3978 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3607 return; 3980 return;
3608 } 3981 }
3609 3982
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3613 3984
3614 $RUNTIME += $TICK; 3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK += $TICK;
3616 3986
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3989 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3991 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3992 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3993 };
3994 }
3625 3995
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3997 $sig->send;
3628 } 3998 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3999 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 4000 $sig->send;
3631 } 4001 }
3632 4002
3633 $NOW = Event::time; 4003 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4004 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 4005
3644 _post_tick; 4006 if (0) {
4007 if ($NEXT_TICK) {
4008 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d#
4011 }
3645 }, 4012 }
3646); 4013}
3647 4014
3648{ 4015{
4016 # configure BDB
4017
3649 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3650 BDB::max_poll_time $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 4020 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 4021
3675 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4026 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4027 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4028 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 4029
3682 cf::sync_job { 4030 cf::sync_job {
3683 eval { 4031 eval {
3693 4041
3694 cf::cleanup "db_env_open(db): $@" if $@; 4042 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 4043 };
3696 } 4044 }
3697 4045
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 4046 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4047 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 4048 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4049 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4050 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 4051 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 4052 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4053 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 4054 };
3728} 4055}
3729 4056
3730{ 4057{
4058 # configure IO::AIO
4059
3731 IO::AIO::min_parallel 8; 4060 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 4061 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 4062 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 4063}
3744 4064
3745my $_log_backtrace; 4065my $_log_backtrace;
3746 4066
3747sub _log_backtrace { 4067sub _log_backtrace {
3750 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3751 4071
3752 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3755 async { 4076 async {
3756 $Coro::current->{desc} = "abt $msg"; 4077 $Coro::current->{desc} = "abt $msg";
3757 4078
3758 my @bt = fork_call { 4079 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3770 } 4091 }
3771 4092
3772 @funcs 4093 @funcs
3773 }; 4094 };
3774 4095
3775 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 4099 --$_log_backtrace;
3778 }; 4100 };
3779 } else { 4101 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3782 } 4104 }
3783} 4105}
3784 4106
3785# load additional modules 4107# load additional modules
3786use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3787 4110
3788END { cf::emergency_save } 4111END { cf::emergency_save }
3789 4112
37901 41131
3791 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines