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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 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 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 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 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 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
53use Coro::Util (); 51use Coro::Util ();
54 52
55use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
56use BDB (); 54use BDB ();
57use Data::Dumper; 55use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 56use Fcntl;
60use YAML::XS (); 57use YAML::XS ();
61use IO::AIO (); 58use IO::AIO ();
62use Time::HiRes; 59use Time::HiRes;
63use Compress::LZF; 60use Compress::LZF;
79# strictly for debugging 76# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 78
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83 80
81our @ORIG_INC;
82
84our %COMMAND = (); 83our %COMMAND = ();
85our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
86 85
87our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
88our %EXTCMD = (); 87our %EXTCMD = ();
94our @EVENT; 93our @EVENT;
95our @REFLECT; # set by XS 94our @REFLECT; # set by XS
96our %REFLECT; # set by us 95our %REFLECT; # set by us
97 96
98our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
99our $DATADIR = datadir; 99our $DATADIR = datadir;
100our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
101our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
102our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
103our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
104our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
106our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
107our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 112
112our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
113 120
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 123our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
119our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 129our $DB_ENV;
123 130
124our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 132
126our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
127 135
128our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
130our $NOW; 139our $NOW;
131 140
132our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
133our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
134our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
143 152
144our @POST_INIT; 153our @POST_INIT;
145 154
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :) 156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
148 160
149binmode STDOUT; 161binmode STDOUT;
150binmode STDERR; 162binmode STDERR;
151 163
152# read virtual server time, if available 164# read virtual server time, if available
163 175
164our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
165 177
166sub cf::map::normalise; 178sub cf::map::normalise;
167 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
168############################################################################# 184#############################################################################
169 185
170%REFLECT = (); 186%REFLECT = ();
171for (@REFLECT) { 187for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 188 my $reflect = JSON::XS::decode_json $_;
182 198
183=over 4 199=over 4
184 200
185=item $cf::UPTIME 201=item $cf::UPTIME
186 202
187The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
188 219
189=item $cf::RUNTIME 220=item $cf::RUNTIME
190 221
191The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
192every server tick. 223every server tick.
198Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
199directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
200unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
201database environment. 232database environment.
202 233
203=item $cf::NOW
204
205The time of the last (current) server tick.
206
207=item $cf::TICK
208
209The interval between server ticks, in seconds.
210
211=item $cf::LOADAVG 234=item $cf::LOADAVG
212 235
213The current CPU load on the server (alpha-smoothed), as a value between 0 236The current CPU load on the server (alpha-smoothed), as a value between 0
214(none) and 1 (overloaded), indicating how much time is spent on processing 237(none) and 1 (overloaded), indicating how much time is spent on processing
215objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
224from wherever your confdir points to. 247from wherever your confdir points to.
225 248
226=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
227 250
228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
229returns directly I<after> the tick processing (and consequently, can only wake one process 252returns directly I<after> the tick processing (and consequently, can only wake one thread
230per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
231 271
232=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
233 273
234This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
243 283
244=back 284=back
245 285
246=cut 286=cut
247 287
288sub error(@) { LOG llevError, join "", @_ }
289sub warn (@) { LOG llevWarn , join "", @_ }
290sub info (@) { LOG llevInfo , join "", @_ }
291sub debug(@) { LOG llevDebug, join "", @_ }
292sub trace(@) { LOG llevTrace, join "", @_ }
293
248$Coro::State::WARNHOOK = sub { 294$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 295 my $msg = join "", @_;
250 296
251 $msg .= "\n" 297 $msg .= "\n"
252 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
253 299
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 300 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 301
256 LOG llevError, $msg; 302 LOG llevWarn, $msg;
257}; 303};
258 304
259$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
261 307
262 warn Carp::longmess $_[0]; 308 error Carp::longmess $_[0];
263 309
264 if ($Coro::current == $Coro::main) {#d# 310 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 312 return;#d#
267 }#d# 313 }#d#
268 314
269 # kill coroutine otherwise 315 # kill coroutine otherwise
270 Coro::terminate 316 Coro::terminate
290)) { 336)) {
291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
292} 338}
293 339
294$EV::DIED = sub { 340$EV::DIED = sub {
295 Carp::cluck "error in event callback: @_"; 341 warn "error in event callback: $@";
296}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
297 348
298############################################################################# 349#############################################################################
299 350
300=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
301 352
322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
323 $d 374 $d
324 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
325} 376}
326 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
327=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
328 431
329Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
330 433
331=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338 441
339sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
341 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
342=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
343 477
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
346 480
347The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 482is a reload or not.
349 483
350=cut 484=cut
351 485
352sub post_init(&) { 486sub post_init(&) {
353 push @POST_INIT, shift; 487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
354} 505}
355 506
356=item cf::lock_wait $string 507=item cf::lock_wait $string
357 508
358Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
397} 548}
398 549
399=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
400 551
401Like EV::periodic, but randomly selects a starting point so that the actions 552Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 553get spread over time.
403 554
404=cut 555=cut
405 556
406sub periodic($$) { 557sub periodic($$) {
407 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
411 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
412} 563}
413 564
414=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
415 566
416Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
417This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
418of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
419 574
420The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
422 577
423Useful for short background jobs. 578Useful for short background jobs.
424 579
425=cut 580=cut
426 581
427our @SLOT_QUEUE; 582our @SLOT_QUEUE;
428our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
429 585
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
433 589
434 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
435 592
436 while () { 593 while () {
437 next_job: 594 next_job:
595
438 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 597
440 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 602 $job->[2]->send;
444 Coro::cede; 603 Coro::cede;
445 goto next_job; 604 goto next_job;
446 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 607 }
448 } 608 }
449 609
450 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
453 $signal->wait;
454 } else { 613 } else {
614 $busy = 0;
455 Coro::schedule; 615 Coro::schedule;
456 } 616 }
457 } 617 }
458}; 618};
459 619
460sub get_slot($;$$) { 620sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
462 622
463 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
464 624
465 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
466 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
467 628
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
496=cut 657=cut
497 658
498sub sync_job(&) { 659sub sync_job(&) {
499 my ($job) = @_; 660 my ($job) = @_;
500 661
501 if ($Coro::current == $Coro::main) { 662 if (in_main) {
502 my $time = EV::time; 663 my $time = AE::time;
503 664
504 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
506 667
507 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
508 669
509 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
510 671
511 my $busy = 1; 672 my $busy = 1;
512 my @res; 673 my @res;
513 674
514 (async { 675 (async {
515 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 677 @res = eval { $job->() };
517 warn $@ if $@; 678 error $@ if $@;
518 undef $busy; 679 undef $busy;
519 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
520 681
521 while ($busy) { 682 while ($busy) {
522 if (Coro::nready) { 683 if (Coro::nready) {
524 } else { 685 } else {
525 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
526 } 687 }
527 } 688 }
528 689
529 my $time = EV::time - $time; 690 my $time = AE::time - $time;
530 691
531 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
532 693
533 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
534 } else { 695 } else {
556 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
557 718
558 $coro 719 $coro
559} 720}
560 721
561=item fork_call { }, $args 722=item fork_call { }, @args
562 723
563Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 727never block itself or use any form of event handling.
567 728
568=cut 729=cut
569 730
731sub post_fork {
732 reset_signals;
733}
734
570sub fork_call(&@) { 735sub fork_call(&@) {
571 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
572 737
573 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
576 741
577 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
578 reset_signals; 743 cf::post_fork;
579 &$cb 744 &$cb
580 }, @args; 745 } @args;
581 746
582 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
748}
749
750sub objinfo {
751 (
752 "counter value" => cf::object::object_count,
753 "objects created" => cf::object::create_count,
754 "objects destroyed" => cf::object::destroy_count,
755 "freelist size" => cf::object::free_count,
756 "allocated objects" => cf::object::objects_size,
757 "active objects" => cf::object::actives_size,
758 )
583} 759}
584 760
585=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
586 762
587=cut 763=cut
624within each server. 800within each server.
625 801
626=cut 802=cut
627 803
628sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
629 my ($name) = @_; 808 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
631 810
632 eval { 811 eval {
633 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
643} 822}
644 823
645our $DB; 824our $DB;
646 825
647sub db_init { 826sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
650 };
651} 828}
652 829
653sub db_get($$) { 830sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
655 832
656 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
657 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
658 837
659 $! ? () 838 $! ? ()
660 : $data 839 : $data
661 }
662} 840}
663 841
664sub db_put($$$) { 842sub db_put($$$) {
665 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
694 872
695 my @data; 873 my @data;
696 my $md5; 874 my $md5;
697 875
698 for (0 .. $#$src) { 876 for (0 .. $#$src) {
699 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
700 or Carp::croak "$src->[$_]: $!";
701 } 878 }
702 879
703 # if processing is expensive, check 880 # if processing is expensive, check
704 # checksum first 881 # checksum first
705 if (1) { 882 if (1) {
722 899
723 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 901 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
726 903
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 905
729 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
732 909
742 919
743=cut 920=cut
744 921
745sub datalog($@) { 922sub datalog($@) {
746 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 925}
749 926
750=back 927=back
751 928
752=cut 929=cut
947 1124
948 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1127
951 } elsif (ref $type) { 1128 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
953 1130
954 } else { 1131 } else {
955 shift @arg; 1132 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
957 } 1134 }
958 } 1135 }
959} 1136}
960 1137
961sub _object_attach { 1138sub _object_attach {
971 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
972 } 1149 }
973 1150
974 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
975 } else { 1152 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1154 }
978 1155
979 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
980} 1157}
981 1158
1040 1217
1041 for (@$callbacks) { 1218 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1043 1220
1044 if ($@) { 1221 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1223 override;
1048 } 1224 }
1049 1225
1050 return 1 if $override; 1226 return 1 if $override;
1051 } 1227 }
1130 for (@$attach) { 1306 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1133 } 1309 }
1134 } else { 1310 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1312 }
1137 } 1313 }
1138} 1314}
1139 1315
1140cf::attachable->attach ( 1316cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1168 1344
1169 sync_job { 1345 sync_job {
1170 if (length $$rdata) { 1346 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1174 1351
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1355 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1201 1378
1202 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1381 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1206 } 1383 }
1207 } else { 1384 } else {
1208 aio_unlink $filename; 1385 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1210 } 1387 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1412 $av = $st->{objs};
1236 } 1413 }
1237 1414
1238 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1241 1419
1242 ($data, $av) 1420 ($data, $av)
1243} 1421}
1244 1422
1245=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1304} 1482}
1305 1483
1306use File::Glob (); 1484use File::Glob ();
1307 1485
1308cf::player->attach ( 1486cf::player->attach (
1309 on_command => sub { 1487 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1311 1489
1312 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1313 or return; 1491 or return;
1314 1492
1322 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1323 1501
1324 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1325 1503
1326 if (ref $msg) { 1504 if (ref $msg) {
1327 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1328 "ARRAY" eq ref $msg
1329 ? @$msg
1330 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1331 1506
1332 my @reply; 1507 my @reply;
1333 1508
1334 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1335 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1337 1512
1338 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1514 if $reply;
1340 1515
1341 } else { 1516 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1518 }
1344 1519
1345 cf::override; 1520 cf::override;
1346 }, 1521 },
1347); 1522);
1357 }; 1532 };
1358 1533
1359 $grp 1534 $grp
1360} 1535}
1361 1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1362sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1363 cf::sync_job { 1553 cf::sync_job {
1364 my %todo; 1554 my %todo;
1365 1555
1366 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1557 next unless -r $path;
1385 1575
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1578
1389 $ext{source} = 1579 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1392 . $source 1582 . $source
1393 . "\n};\n1"; 1583 . "\n};\n1";
1394 1584
1395 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1396 } 1586 }
1397 1587
1588 my $pass = 0;
1398 my %done; 1589 my %done;
1399 while (%todo) { 1590 while (%todo) {
1400 my $progress; 1591 my $progress;
1401 1592
1593 ++$pass;
1594
1595 ext:
1402 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1598 next ext
1405 unless exists $done{$_}; 1599 unless exists $done{$_};
1406 } 1600 }
1407 1601
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1603
1410 unless (eval $v->{source}) { 1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1613 my $active = eval $source;
1614
1615 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1617
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1619 if exists $v->{meta}{mandatory};
1418 1620
1419 warn $msg; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1623 } else {
1624 $done{$k} = delete $todo{$k};
1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1420 } 1630 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1631 }
1426 1632
1427 skip: 1633 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1635
1636 while (my ($k, $v) = each %todo) {
1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1638 if exists $v->{meta}{mandatory};
1639 }
1640
1641 last;
1642 }
1430 } 1643 }
1431 }; 1644 };
1432} 1645}
1433 1646
1434############################################################################# 1647#############################################################################
1518 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1519 } 1732 }
1520 } 1733 }
1521} 1734}
1522 1735
1736cf::player->attach (
1737 on_load => sub {
1738 my ($pl, $path) = @_;
1739
1740 # restore slots saved in save, below
1741 my $slots = delete $pl->{_slots};
1742
1743 $pl->ob->current_weapon ($slots->[0]);
1744 $pl->combat_ob ($slots->[1]);
1745 $pl->ranged_ob ($slots->[2]);
1746 },
1747);
1748
1523sub save($) { 1749sub save($) {
1524 my ($pl) = @_; 1750 my ($pl) = @_;
1525 1751
1526 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1527 1753
1532 1758
1533 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1535 1761
1536 cf::get_slot 0.01; 1762 cf::get_slot 0.01;
1763
1764 # save slots, to be restored later
1765 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1766
1538 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1768 cf::cede_to_tick;
1540} 1769}
1541 1770
1575 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1576 1805
1577 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1808
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1810 $pl->deactivate;
1811
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1585 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1586 1817
1587 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1643 \@logins 1874 \@logins
1644} 1875}
1645 1876
1646=item $player->maps 1877=item $player->maps
1647 1878
1879=item cf::player::maps $login
1880
1648Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1649player. May block. 1882player. May block.
1650 1883
1651=cut 1884=cut
1652 1885
1714=cut 1947=cut
1715 1948
1716sub find_by_path($) { 1949sub find_by_path($) {
1717 my ($path) = @_; 1950 my ($path) = @_;
1718 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1719 my ($match, $specificity); 1954 my ($match, $specificity);
1720 1955
1721 for my $region (list) { 1956 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
1751sub generate_random_map { 1986sub generate_random_map {
1752 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1753 1988
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1990
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768 (cf::region::find $rmp->{region}), $rmp->{custom}
1769 )
1770} 1992}
1771 1993
1772=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1773 1995
1774Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
1779 2001
1780sub register { 2002sub register {
1781 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 2004 my $pkg = caller;
1783 2005
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 2007
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 2009}
1789 2010
1790# also paths starting with '/' 2011# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 2013
1793sub thawer_merge { 2014sub thawer_merge {
1794 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1795 2016
1796 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1801} 2022}
1802 2023
1803sub normalise { 2024sub normalise {
1804 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1805 2026
1806 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1807 2028
1808 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1809 2030
1810 # map plan: 2031 # map plan:
1811 # 2032 #
1826 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 2048 $path = "$base/$path";
1828 } 2049 }
1829 2050
1830 for ($path) { 2051 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1834 } 2054 }
1835 2055
1836 $path 2056 $path
1850 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1851 return $self; 2071 return $self;
1852 } 2072 }
1853 } 2073 }
1854 2074
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 2076 ()
1857} 2077}
1858 2078
2079# may re-bless or do other evil things
1859sub init { 2080sub init {
1860 my ($self) = @_; 2081 my ($self) = @_;
1861 2082
1862 $self 2083 $self
1863} 2084}
1928 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1929 2150
1930 1 2151 1
1931} 2152}
1932 2153
2154# used to laod the header of an original map
1933sub load_header_orig { 2155sub load_header_orig {
1934 my ($self) = @_; 2156 my ($self) = @_;
1935 2157
1936 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1937} 2159}
1938 2160
2161# used to laod the header of an instantiated map
1939sub load_header_temp { 2162sub load_header_temp {
1940 my ($self) = @_; 2163 my ($self) = @_;
1941 2164
1942 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1943} 2166}
1944 2167
2168# called after loading the header from an instantiated map
1945sub prepare_temp { 2169sub prepare_temp {
1946 my ($self) = @_; 2170 my ($self) = @_;
1947 2171
1948 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1949 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1950 # safety 2174 # safety
1951 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1952 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1953} 2177}
1954 2178
2179# called after loading the header from an original map
1955sub prepare_orig { 2180sub prepare_orig {
1956 my ($self) = @_; 2181 my ($self) = @_;
1957 2182
1958 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1959 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1983 2208
1984sub find; 2209sub find;
1985sub find { 2210sub find {
1986 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1987 2212
2213 cf::cede_to_tick;
2214
1988 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1989 2216
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2219
1993 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
2010 2237
2011 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2012 } 2239 }
2013} 2240}
2014 2241
2015sub pre_load { } 2242sub pre_load { }
2016sub post_load { } 2243#sub post_load { } # XS
2017 2244
2018sub load { 2245sub load {
2019 my ($self) = @_; 2246 my ($self) = @_;
2020 2247
2021 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2024 2251
2025 { 2252 {
2026 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2027 2254
2028 return unless $self->valid; 2255 return unless $self->valid;
2029 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2030
2031 $self->in_memory (cf::MAP_LOADING);
2032 2257
2033 $self->alloc; 2258 $self->alloc;
2034 2259
2035 $self->pre_load; 2260 $self->pre_load;
2036 cf::cede_to_tick; 2261 cf::cede_to_tick;
2037 2262
2263 if (exists $self->{load_path}) {
2038 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block; 2265 $f->skip_block;
2040 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2041 or return; 2267 or return;
2042 2268
2043 $self->post_load_original 2269 $self->post_load_original
2044 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2045 2271
2046 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2047 utf8::encode $uniq; 2273 utf8::encode $uniq;
2048 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2050 $self->clear_unique_items; 2276 $self->clear_unique_items;
2051 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2053 } 2280 }
2054 } 2281 }
2055 }
2056 2282
2057 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2058 2290
2059 cf::cede_to_tick; 2291 cf::cede_to_tick;
2060 # now do the right thing for maps 2292 # now do the right thing for maps
2061 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2062 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2066 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2067 $self->decay_objects; 2299 $self->decay_objects;
2068 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2069 $self->update_buttons; 2301 $self->update_buttons;
2070 cf::cede_to_tick; 2302 cf::cede_to_tick;
2071 $self->activate; 2303 #$self->activate; # no longer activate maps automatically
2072 } 2304 }
2073 2305
2074 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2308 }
2079 2309
2080 $self->post_load; 2310 $self->post_load;
2081}
2082 2311
2312 1
2313}
2314
2315# customize the map for a given player, i.e.
2316# return the _real_ map. used by e.g. per-player
2317# maps to change the path to ~playername/mappath
2083sub customise_for { 2318sub customise_for {
2084 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2085 2320
2086 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2322 if $self->per_player;
2090# if $self->per_party; 2325# if $self->per_party;
2091 2326
2092 $self 2327 $self
2093} 2328}
2094 2329
2095# find and load all maps in the 3x3 area around a map
2096sub load_neighbours {
2097 my ($map) = @_;
2098
2099 my @neigh; # diagonal neighbours
2100
2101 for (0 .. 3) {
2102 my $neigh = $map->tile_path ($_)
2103 or next;
2104 $neigh = find $neigh, $map
2105 or next;
2106 $neigh->load;
2107
2108 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 }
2112
2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
2115 my $neigh = find $path, $origin
2116 or next;
2117 $neigh->load;
2118 }
2119}
2120
2121sub find_sync { 2330sub find_sync {
2122 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2123 2332
2124 cf::sync_job { find $path, $origin } 2333 # it's a bug to call this from the main context
2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2335 if $Coro::current == $Coro::main;
2336
2337 find $path, $origin
2125} 2338}
2126 2339
2127sub do_load_sync { 2340sub do_load_sync {
2128 my ($map) = @_; 2341 my ($map) = @_;
2129 2342
2343 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2132 2346
2133 cf::sync_job { $map->load }; 2347 $map->load;
2134} 2348}
2135 2349
2136our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2138 2352
2139sub find_async { 2353sub find_async {
2140 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2141 2355
2142 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2143 2357
2144 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2146 } 2360 }
2147 2361
2148 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2149 2363
2150 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2164 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2165 2379
2166 () 2380 ()
2167} 2381}
2168 2382
2383# common code, used by both ->save and ->swapout
2169sub save { 2384sub _save {
2170 my ($self) = @_; 2385 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2386
2174 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2175 2388
2176 return unless $self->dirty; 2389 return unless $self->dirty;
2177 2390
2197 } else { 2410 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2411 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2412 }
2200} 2413}
2201 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2202sub swap_out { 2423sub swap_out {
2203 my ($self) = @_; 2424 my ($self) = @_;
2204 2425
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2210 return if $self->players; 2430 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2431
2432 # first deactivate the map and "unlink" it from the core
2433 $self->deactivate;
2434 $_->clear_links_to ($self) for values %cf::MAP;
2435 $self->state (cf::MAP_SWAPPED);
2436
2437 # then atomically save
2438 $self->_save;
2439
2440 # then free the map
2441 $self->clear;
2442}
2443
2444sub reset_at {
2445 my ($self) = @_;
2446
2447 # TODO: safety, remove and allow resettable per-player maps
2212 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2213 2449
2450 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2451 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2452
2453 $time + $to
2454}
2455
2456sub should_reset {
2457 my ($self) = @_;
2458
2459 $self->reset_at <= $cf::RUNTIME
2460}
2461
2462sub reset {
2463 my ($self) = @_;
2464
2465 my $lock = cf::lock_acquire "map_data:$self->{path}";
2466
2467 return if $self->players;
2468
2469 cf::trace "resetting map ", $self->path, "\n";
2470
2214 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # need to save uniques path
2474 unless ($self->{deny_save}) {
2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2476
2477 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2478 if $uniq;
2479 }
2480
2481 delete $cf::MAP{$self->path};
2215 2482
2216 $self->deactivate; 2483 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2485 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2486
2264 $self->unlink_save; 2487 $self->unlink_save;
2265 $self->destroy; 2488 $self->destroy;
2266} 2489}
2267 2490
2275 2498
2276 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2277 2500
2278 $self->unlink_save; 2501 $self->unlink_save;
2279 2502
2280 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2508
2515 2738
2516Freezes the player and moves him/her to a special map (C<{link}>). 2739Freezes the player and moves him/her to a special map (C<{link}>).
2517 2740
2518The player should be reasonably safe there for short amounts of time (e.g. 2741The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2742for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2743though, as the player cannot control the character while it is on the link
2521map. 2744map.
2522 2745
2523Will never block. 2746Will never block.
2524 2747
2525=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2546sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2547 my ($self) = @_; 2770 my ($self) = @_;
2548 2771
2549 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2550 2773
2774 ++$self->{_link_recursion};
2775
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2777
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2555 2780
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2782}
2558 2783
2559sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2561 2786
2581 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2582 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2583 if $x <= 0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2584 2809
2585 $map->load; 2810 $map->load;
2586 $map->load_neighbours;
2587 2811
2588 return unless $self->contr->active; 2812 return unless $self->contr->active;
2589 2813
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2592 2816 # entering was successful
2817 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2818 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2819 $self->activate_recursive;
2595} 2820 }
2596 2821
2822}
2823
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2824=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2825
2599Moves the player to the given map-path and coordinates by first freezing 2826Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2828that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2829the new (success) or old (failed) map position. In either case, $done will
2609 2836
2610our $GOTOGEN; 2837our $GOTOGEN;
2611 2838
2612sub cf::object::player::goto { 2839sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2841
2842 if ($self->{_link_recursion} >= $MAX_LINKS) {
2843 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2844 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2845 ($path, $x, $y) = @$EMERGENCY_POSITION;
2846 }
2614 2847
2615 # do generation counting so two concurrent goto's will be executed in-order 2848 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2850
2618 $self->enter_link; 2851 $self->enter_link;
2638 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2639 } 2872 }
2640 } 2873 }
2641 2874
2642 my $map = eval { 2875 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2644 2877
2645 if ($map) { 2878 if ($map) {
2646 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2881 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2882 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2883 }
2651 2884
2652 $map 2885 $map
2660 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2663 } 2896 }
2664 2897
2665 $done->() if $done; 2898 $done->($self) if $done;
2666 })->prio (1); 2899 })->prio (1);
2667} 2900}
2668 2901
2669=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2670 2903
2738 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2739 2972
2740 unless (eval { 2973 unless (eval {
2741 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2742 2975
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2752 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp; 2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
2754 3002
2755 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2756 3004
2757 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
2763 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 3012 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2767 3015
2768 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 3017 $self->leave_link;
2770 } 3018 }
2771 })->prio (1); 3019 })->prio (1);
2772} 3020}
2773 3021
3000=cut 3248=cut
3001 3249
3002sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
3003 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
3004 3252
3005 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3007 } elsif ($self->extcmd == 1) {
3008 #TODO: version 1, remove
3009 unshift @msg, msgtype => "reply", msgid => $id;
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
3012} 3256}
3013 3257
3014=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
3015 3259
3016Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
3071 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3072 3316
3073 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3074 3318
3075 if (ref $msg) { 3319 if (ref $msg) {
3076 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3077 "ARRAY" eq ref $msg
3078 ? @$msg
3079 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3080 3321
3081 my @reply; 3322 my @reply;
3082 3323
3083 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3084 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3086 3327
3087 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3329 if $reply;
3089 3330
3090 } else { 3331 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3333 }
3093 3334
3094 cf::override; 3335 cf::override;
3095 }, 3336 },
3096); 3337);
3116 3357
3117 $coro 3358 $coro
3118} 3359}
3119 3360
3120cf::client->attach ( 3361cf::client->attach (
3121 on_destroy => sub { 3362 on_client_destroy => sub {
3122 my ($ns) = @_; 3363 my ($ns) = @_;
3123 3364
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3366 },
3126); 3367);
3142our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3143 3384
3144$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3145 3386
3146$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3149 sort time 3390 sort time
3150)); 3391));
3151 3392
3152# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3177 decrease split destroy change_exp value msg lore send_msg)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3178 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3179 ["cf::player" => qw(peaceful send_msg)], 3420 ["cf::player" => qw(peaceful send_msg)],
3180 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3181) { 3422) {
3182 no strict 'refs';
3183 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3185 for @funs; 3425 for @funs;
3186} 3426}
3187 3427
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3206 3446
3207 %vars = (_dummy => 0) unless %vars; 3447 %vars = (_dummy => 0) unless %vars;
3208 3448
3449 my @res;
3209 local $_; 3450 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3451
3212 my $eval = 3452 my $eval =
3213 "do {\n" 3453 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3456 . $code
3217 . "\n}" 3457 . "\n}"
3218 ; 3458 ;
3219 3459
3460 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3464 sub_generation_inc;
3465 } else {
3466 local @cf::_safe_eval_args = values %vars;
3467 @res = wantarray ? eval eval : scalar eval $eval;
3468 }
3223 3469
3224 if ($@) { 3470 if ($@) {
3225 warn "$@"; 3471 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3228 } 3474 }
3229 3475
3230 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3231} 3477}
3232 3478
3246=cut 3492=cut
3247 3493
3248sub register_script_function { 3494sub register_script_function {
3249 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3250 3496
3251 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3253} 3499}
3254 3500
3255=back 3501=back
3256 3502
3257=cut 3503=cut
3258 3504
3259############################################################################# 3505#############################################################################
3260# the server's init and main functions 3506# the server's init and main functions
3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3261 3509
3262sub load_facedata($) { 3510sub load_facedata($) {
3263 my ($path) = @_; 3511 my ($path) = @_;
3264 3512
3265 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3266 # for this (global event?) 3514 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3516
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3518
3271 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3272 3520
3273 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3274 0 < aio_load $path, $facedata
3275 or die "$path: $!";
3276
3277 $facedata = Coro::Storable::thaw $facedata;
3278 3522
3279 $facedata->{version} == 2 3523 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3525
3282 # patch in the exptable 3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3529 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3532 };
3287 cf::cede_to_tick; 3533 cf::cede_to_tick;
3288 3534
3289 { 3535 {
3290 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3291 3537
3292 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3541
3295 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3299 3548
3300 cf::cede_to_tick; 3549 cf::cede_to_tick;
3301 } 3550 }
3302 3551
3303 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
3308 3557
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3558 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3559 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3561 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3562 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3563 }
3315 3564
3316 cf::cede_to_tick; 3565 cf::cede_to_tick;
3317 } 3566 }
3318 } 3567 }
3327 3576
3328 cf::anim::invalidate_all; # d'oh 3577 cf::anim::invalidate_all; # d'oh
3329 } 3578 }
3330 3579
3331 { 3580 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3335 3582
3336 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3587
3341 if ($info->{type} & 1) { 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3356 } else { 3592 } else {
3357 $RESOURCE{$name} = $info; 3593# $RESOURCE{$name} = $info; # unused
3358 } 3594 }
3359 3595
3360 cf::cede_to_tick; 3596 cf::cede_to_tick;
3361 } 3597 }
3362 } 3598 }
3363 3599
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3601
3366 1 3602 1
3367} 3603}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3604
3389register_exticmd fx_want => sub { 3605register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3606 my ($ns, $want) = @_;
3391 3607
3392 while (my ($k, $v) = each %$want) { 3608 while (my ($k, $v) = each %$want) {
3431sub reload_treasures { 3647sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3648 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3649 or die "unable to load treasurelists\n";
3434} 3650}
3435 3651
3652sub reload_sound {
3653 trace "loading sound config from $DATADIR/sound\n";
3654
3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3656
3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3658 my $sound = $soundconf->{compat}[$_]
3659 or next;
3660
3661 my $face = cf::face::find "sound/$sound->[1]";
3662 cf::sound::set $sound->[0] => $face;
3663 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3664 }
3665
3666 while (my ($k, $v) = each %{$soundconf->{event}}) {
3667 my $face = cf::face::find "sound/$v";
3668 cf::sound::set $k => $face;
3669 }
3670}
3671
3436sub reload_resources { 3672sub reload_resources {
3437 warn "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3438 3674
3675 reload_exp_table;
3676 reload_materials;
3439 reload_facedata; 3677 reload_facedata;
3678 reload_sound;
3440 reload_archetypes; 3679 reload_archetypes;
3441 reload_regions; 3680 reload_regions;
3442 reload_treasures; 3681 reload_treasures;
3443 3682
3444 warn "finished reloading resource files\n"; 3683 trace "finished reloading resource files\n";
3445} 3684}
3446 3685
3447sub reload_config { 3686sub reload_config {
3448 warn "reloading config file...\n"; 3687 trace "reloading config file...\n";
3449 3688
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3689 my $config = load_file "$CONFDIR/config";
3451 or return; 3690 utf8::decode $config;
3691 *CFG = decode_yaml $config;
3452 3692
3453 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>;
3455
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3694
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3695 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3696 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3697
3461 if (exists $CFG{mlockall}) { 3698 if (exists $CFG{mlockall}) {
3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3700 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3701 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3702 };
3466 warn $@ if $@; 3703 warn $@ if $@;
3467 } 3704 }
3468
3469 warn "finished reloading resource files\n";
3470} 3705}
3471 3706
3472sub pidfile() { 3707sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3708 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3709 or die "$PIDFILE: $!";
3487 seek $fh, 0, 0; 3722 seek $fh, 0, 0;
3488 print $fh $$; 3723 print $fh $$;
3489} 3724}
3490 3725
3491sub main_loop { 3726sub main_loop {
3492 warn "EV::loop starting\n"; 3727 trace "EV::loop starting\n";
3493 if (1) { 3728 if (1) {
3494 EV::loop; 3729 EV::loop;
3495 } 3730 }
3496 warn "EV::loop returned\n"; 3731 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3732 goto &main_loop unless $REALLY_UNLOOP;
3498} 3733}
3499 3734
3500sub main { 3735sub main {
3501 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3502 3737
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3742
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3744
3515 # we must not ever block the main coroutine 3745 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3746 local $Coro::idle = sub {
3522 }; 3752 };
3523 3753
3524 evthread_start IO::AIO::poll_fileno; 3754 evthread_start IO::AIO::poll_fileno;
3525 3755
3526 cf::sync_job { 3756 cf::sync_job {
3757 cf::incloader::init ();
3758
3759 cf::init_anim;
3760 cf::init_attackmess;
3761 cf::init_dynamic;
3762
3763 cf::load_settings;
3764
3527 reload_resources; 3765 reload_resources;
3528 reload_config; 3766 reload_config;
3529 db_init; 3767 db_init;
3530 3768
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3769 cf::init_uuid;
3534 cf::init_signals; 3770 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3771 cf::init_skills;
3537 3772
3538 cf::init_beforeplay; 3773 cf::init_beforeplay;
3539 3774
3540 atomic; 3775 atomic;
3545 3780
3546 # no (long-running) fork's whatsoever before this point(!) 3781 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX (); 3782 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3783 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3784
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3785 cf::_post_init 0;
3551 }; 3786 };
3552 3787
3788 cf::object::thawer::errors_are_fatal 0;
3789 info "parse errors in files are no longer fatal from this point on.\n";
3790
3791 AE::postpone {
3792 undef &main; # free gobs of memory :)
3793 };
3794
3553 main_loop; 3795 goto &main_loop;
3554} 3796}
3555 3797
3556############################################################################# 3798#############################################################################
3557# initialisation and cleanup 3799# initialisation and cleanup
3558 3800
3559# install some emergency cleanup handlers 3801# install some emergency cleanup handlers
3560BEGIN { 3802BEGIN {
3561 our %SIGWATCHER = (); 3803 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3804 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3805 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3806 cf::cleanup "SIG$signal";
3565 }; 3807 };
3566 } 3808 }
3567} 3809}
3568 3810
3569sub write_runtime_sync { 3811sub write_runtime_sync {
3812 my $t0 = AE::time;
3813
3570 # first touch the runtime file to show we are still running: 3814 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3815 # the fsync below can take a very very long time.
3572 3816
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3817 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3818
3575 my $guard = cf::lock_acquire "write_runtime"; 3819 my $guard = cf::lock_acquire "write_runtime";
3576 3820
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3821 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3822 or return;
3579 3823
3580 my $value = $cf::RUNTIME + 90 + 10; 3824 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3825 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3826 # 60 allows for the watchdog to kill the server.
3595 or return; 3839 or return;
3596 3840
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3841 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3842 and return;
3599 3843
3600 warn "runtime file written.\n"; 3844 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3845
3602 1 3846 1
3603} 3847}
3604 3848
3605our $uuid_lock; 3849our $uuid_lock;
3617 or return; 3861 or return;
3618 3862
3619 my $value = uuid_seq uuid_cur; 3863 my $value = uuid_seq uuid_cur;
3620 3864
3621 unless ($value) { 3865 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3866 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3867 return;
3624 } 3868 }
3625 3869
3626 my $value = uuid_str $value + $uuid_skip; 3870 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3871 $uuid_skip = 0;
3637 or return; 3881 or return;
3638 3882
3639 aio_rename "$uuid~", $uuid 3883 aio_rename "$uuid~", $uuid
3640 and return; 3884 and return;
3641 3885
3642 warn "uuid file written ($value).\n"; 3886 trace "uuid file written ($value).\n";
3643 3887
3644 1 3888 1
3645 3889
3646} 3890}
3647 3891
3653} 3897}
3654 3898
3655sub emergency_save() { 3899sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3900 my $freeze_guard = cf::freeze_mainloop;
3657 3901
3658 warn "emergency_perl_save: enter\n"; 3902 info "emergency_perl_save: enter\n";
3903
3904 # this is a trade-off: we want to be very quick here, so
3905 # save all maps without fsync, and later call a global sync
3906 # (which in turn might be very very slow)
3907 local $USE_FSYNC = 0;
3659 3908
3660 cf::sync_job { 3909 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3910 cf::write_runtime_sync; # external watchdog should not bark
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665 3911
3666 # use a peculiar iteration method to avoid tripping on perl 3912 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3913 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3914 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3915 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3916 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3917 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3918 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3919 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3920 $pl->save;
3675 } 3921 }
3676 warn "emergency_perl_save: end player save\n"; 3922 info "emergency_perl_save: end player save\n";
3677 3923
3924 cf::write_runtime_sync; # external watchdog should not bark
3925
3678 warn "emergency_perl_save: begin map save\n"; 3926 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3927 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3928 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3929 $map->valid or next;
3682 $map->save; 3930 $map->save;
3683 } 3931 }
3684 warn "emergency_perl_save: end map save\n"; 3932 info "emergency_perl_save: end map save\n";
3685 3933
3934 cf::write_runtime_sync; # external watchdog should not bark
3935
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3936 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3937 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3938 info "emergency_perl_save: end database checkpoint\n";
3689 3939
3690 warn "emergency_perl_save: begin write uuid\n"; 3940 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3941 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3942 info "emergency_perl_save: end write uuid\n";
3943
3944 cf::write_runtime_sync; # external watchdog should not bark
3945
3946 trace "emergency_perl_save: syncing database to disk";
3947 BDB::db_env_txn_checkpoint $DB_ENV;
3948
3949 info "emergency_perl_save: starting sync\n";
3950 IO::AIO::aio_sync sub {
3951 info "emergency_perl_save: finished sync\n";
3952 };
3953
3954 cf::write_runtime_sync; # external watchdog should not bark
3955
3956 trace "emergency_perl_save: flushing outstanding aio requests";
3957 while (IO::AIO::nreqs || BDB::nreqs) {
3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3959 }
3960
3961 cf::write_runtime_sync; # external watchdog should not bark
3693 }; 3962 };
3694 3963
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3700 warn "emergency_perl_save: leave\n"; 3964 info "emergency_perl_save: leave\n";
3701} 3965}
3702 3966
3703sub post_cleanup { 3967sub post_cleanup {
3704 my ($make_core) = @_; 3968 my ($make_core) = @_;
3705 3969
3970 IO::AIO::flush;
3971
3706 warn Carp::longmess "post_cleanup backtrace" 3972 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3973 if $make_core;
3708 3974
3709 my $fh = pidfile; 3975 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3976 unlink $PIDFILE if <$fh> == $$;
3711} 3977}
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3997 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3998 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3999 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4000# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 4001 }
3736 warn "cleared package $pkg\n";#d#
3737} 4002}
3738 4003
3739sub do_reload_perl() { 4004sub do_reload_perl() {
3740 # can/must only be called in main 4005 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 4006 unless (in_main) {
3742 warn "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3743 return; 4008 return;
3744 } 4009 }
3745 4010
3746 return if $RELOAD++; 4011 return if $RELOAD++;
3747 4012
3748 my $t1 = EV::time; 4013 my $t1 = AE::time;
3749 4014
3750 while ($RELOAD) { 4015 while ($RELOAD) {
3751 warn "reloading..."; 4016 cf::get_slot 0.1, -1, "reload_perl";
4017 info "perl_reload: reloading...";
3752 4018
3753 warn "entering sync_job"; 4019 trace "perl_reload: entering sync_job";
3754 4020
3755 cf::sync_job { 4021 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 4022 #cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark
3759 4023
3760 warn "syncing database to disk";
3761 BDB::db_env_txn_checkpoint $DB_ENV;
3762
3763 # if anything goes wrong in here, we should simply crash as we already saved
3764
3765 warn "flushing outstanding aio requests";
3766 while (IO::AIO::nreqs || BDB::nreqs) {
3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768 }
3769
3770 warn "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 4026 %EXT_CORO = ();
3773 4027
3774 warn "removing commands"; 4028 trace "perl_reload: removing commands";
3775 %COMMAND = (); 4029 %COMMAND = ();
3776 4030
3777 warn "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3778 %EXTCMD = (); 4032 %EXTCMD = ();
3779 %EXTICMD = (); 4033 %EXTICMD = ();
3780 4034
3781 warn "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 4037 trace "... unloading $pkg";
3784 4038
3785 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3786 eval { 4040 eval {
3787 $cb->($pkg); 4041 $cb->($pkg);
3788 1 4042 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 4043 } or error "$pkg unloaded, but with errors: $@";
3790 } 4044 }
3791 4045
3792 warn "... clearing $pkg"; 4046 trace "... clearing $pkg";
3793 clear_package $pkg; 4047 clear_package $pkg;
3794 } 4048 }
3795 4049
3796 warn "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 4053
3800 warn "... unloading $k"; 4054 trace "... unloading $k";
3801 delete $INC{$k}; 4055 delete $INC{$k};
3802 4056
3803 $k =~ s/\.pm$//; 4057 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 4058 $k =~ s/\//::/g;
3805 4059
3808 } 4062 }
3809 4063
3810 clear_package $k; 4064 clear_package $k;
3811 } 4065 }
3812 4066
3813 warn "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 4068 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4069 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 4070
3817 warn "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 4074
3821 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3822 # and global variables created in xs 4076 # and global variables created in xs
3823 #clear_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3824 4078
3825 warn "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3826 4080
3827 warn "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3828 require cf; 4082 require cf;
3829 cf::_connect_to_perl_1; 4083 cf::_connect_to_perl_1;
3830 4084
3831 warn "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3832 cf::reload_config; 4086 cf::reload_config;
3833 4087
3834 warn "loading extensions"; 4088 trace "perl_reload: loading extensions";
3835 cf::load_extensions; 4089 cf::load_extensions;
3836 4090
3837 if ($REATTACH_ON_RELOAD) { 4091 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3841 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
3844 } 4098 }
3845 4099
3846 warn "running post_init jobs"; 4100 cf::_post_init 1;
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848 4101
3849 warn "leaving sync_job"; 4102 trace "perl_reload: leaving sync_job";
3850 4103
3851 1 4104 1
3852 } or do { 4105 } or do {
3853 warn $@; 4106 error $@;
3854 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
3855 }; 4108 };
3856 4109
3857 warn "reloaded";
3858 --$RELOAD; 4110 --$RELOAD;
3859 } 4111 }
3860 4112
3861 $t1 = EV::time - $t1; 4113 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 4114 info "perl_reload: completed in ${t1}s\n";
3863}; 4115};
3864 4116
3865our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3866 4118
3867sub reload_perl() { 4119sub reload_perl() {
3869 # coro crashes during coro_state_free->destroy here. 4121 # coro crashes during coro_state_free->destroy here.
3870 4122
3871 $RELOAD_WATCHER ||= cf::async { 4123 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 4124 Coro::AIO::aio_wait cache_extensions;
3873 4125
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4126 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 4127 do_reload_perl;
3876 undef $RELOAD_WATCHER; 4128 undef $RELOAD_WATCHER;
3877 }; 4129 };
3878 }; 4130 };
3879} 4131}
3888 reload_perl; 4140 reload_perl;
3889 }; 4141 };
3890 } 4142 }
3891}; 4143};
3892 4144
3893unshift @INC, $LIBDIR; 4145#############################################################################
3894 4146
3895my $bug_warning = 0; 4147my $bug_warning = 0;
3896 4148
3897our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN;
3899
3900sub wait_for_tick { 4149sub wait_for_tick() {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3902 4151
3903 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
3904 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait;
3906} 4153}
3907 4154
3908sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3910 4157
3911 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4160 $signal->wait;
3914} 4161}
3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3919 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
3920 return; 4167 return;
3921 } 4168 }
3922 4169
3923 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4171
4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3924 4173
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4176 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4177 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4178 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4179 or error "ERROR: unable to write runtime file: $!";
3931 }; 4180 };
3932 } 4181 }
3933 4182
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4184 $sig->send;
3936 } 4185 }
3937 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
3938 $sig->send;
3939 }
3940 4187
3941 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3943 4190
3944 if (0) { 4191 if (0) {
3945 if ($NEXT_TICK) { 4192 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4193 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4194 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4195 debug "jitter $JITTER\n";#d#
3949 } 4196 }
3950 } 4197 }
3951} 4198}
3952 4199
3953{ 4200{
3954 # configure BDB 4201 # configure BDB
3955 4202
3956 BDB::min_parallel 8; 4203 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
3959 4206
3960 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3998 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
3999 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
4000 undef $AnyEvent::AIO::WATCHER; 4247 undef $AnyEvent::AIO::WATCHER;
4001} 4248}
4002 4249
4003my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
4004 4252
4005sub _log_backtrace { 4253sub _log_backtrace {
4006 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
4007 4255
4008 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
4009 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4010 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
4011 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
4012 ++$_log_backtrace; 4264 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg; 4265 my $perl_bt = Carp::longmess $msg;
4014 async { 4266 async {
4015 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
4016 4268
4036 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
4037 --$_log_backtrace; 4289 --$_log_backtrace;
4038 }; 4290 };
4039 } else { 4291 } else {
4040 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
4041 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4042 } 4294 }
4043} 4295}
4044 4296
4045# load additional modules 4297# load additional modules
4046require "cf/$_.pm" for @EXTRA_MODULES; 4298require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines