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.524 by root, Sun Apr 18 07:08:07 2010 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 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,2009,2010 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.
… …
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;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
132our $NOW; 138our $NOW;
133 139
134our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
145 151
146our @POST_INIT; 152our @POST_INIT;
147 153
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
150 159
151binmode STDOUT; 160binmode STDOUT;
152binmode STDERR; 161binmode STDERR;
153 162
154# read virtual server time, if available 163# read virtual server time, if available
… …
188 197
189=over 4 198=over 4
190 199
191=item $cf::UPTIME 200=item $cf::UPTIME
192 201
193The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
194 218
195=item $cf::RUNTIME 219=item $cf::RUNTIME
196 220
197The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
198every server tick. 222every server tick.
… …
204Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
205directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
207database environment. 231database environment.
208 232
209=item $cf::NOW
210
211The time of the last (current) server tick.
212
213=item $cf::TICK
214
215The interval between server ticks, in seconds.
216
217=item $cf::LOADAVG 233=item $cf::LOADAVG
218 234
219The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
220(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
221objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
230from wherever your confdir points to. 246from wherever your confdir points to.
231 247
232=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
233 249
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
237 270
238=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
239 272
240This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
249 282
250=back 283=back
251 284
252=cut 285=cut
253 286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
254$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 294 my $msg = join "", @_;
256 295
257 $msg .= "\n" 296 $msg .= "\n"
258 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
259 298
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 300
262 LOG llevError, $msg; 301 LOG llevWarn, $msg;
263}; 302};
264 303
265$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
267 306
268 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
269 308
270 if (in_main) {#d# 309 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 311 return;#d#
273 }#d# 312 }#d#
274 313
275 # kill coroutine otherwise 314 # kill coroutine otherwise
276 Coro::terminate 315 Coro::terminate
… …
298} 337}
299 338
300$EV::DIED = sub { 339$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
302}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
303 347
304############################################################################# 348#############################################################################
305 349
306=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
307 351
… …
328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329 $d 373 $d
330 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
331} 375}
332 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
333=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
334 430
335Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
336 432
337=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
… …
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 440
345sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
347 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
348=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
349 476
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
352 479
353The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 481is a reload or not.
355 482
356=cut 483=cut
357 484
358sub post_init(&) { 485sub post_init(&) {
359 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
360} 504}
361 505
362=item cf::lock_wait $string 506=item cf::lock_wait $string
363 507
364Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
418} 562}
419 563
420=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
421 565
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
423This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
424of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
425 573
426The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
427used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
428 576
429Useful for short background jobs. 577Useful for short background jobs.
… …
458 } 606 }
459 } 607 }
460 608
461 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
462 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
463 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
464 $signal->wait;
465 } else { 612 } else {
466 $busy = 0; 613 $busy = 0;
467 Coro::schedule; 614 Coro::schedule;
468 } 615 }
469 } 616 }
… …
509=cut 656=cut
510 657
511sub sync_job(&) { 658sub sync_job(&) {
512 my ($job) = @_; 659 my ($job) = @_;
513 660
514 if ($Coro::current == $Coro::main) { 661 if (in_main) {
515 my $time = AE::time; 662 my $time = AE::time;
516 663
517 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
519 666
520 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
521 668
522 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
523 670
524 my $busy = 1; 671 my $busy = 1;
525 my @res; 672 my @res;
526 673
527 (async { 674 (async {
528 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 676 @res = eval { $job->() };
530 warn $@ if $@; 677 error $@ if $@;
531 undef $busy; 678 undef $busy;
532 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
533 680
534 while ($busy) { 681 while ($busy) {
535 if (Coro::nready) { 682 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
570 717
571 $coro 718 $coro
572} 719}
573 720
574=item fork_call { }, $args 721=item fork_call { }, @args
575 722
576Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 726never block itself or use any form of event handling.
580 727
581=cut 728=cut
582 729
730sub post_fork {
731 reset_signals;
732}
733
583sub fork_call(&@) { 734sub fork_call(&@) {
584 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
585 736
586 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
589 740
590 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
591 reset_signals; 742 cf::post_fork;
592 &$cb 743 &$cb
593 }, @args; 744 } @args;
594 745
595 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
596} 747}
597 748
598sub objinfo { 749sub objinfo {
… …
648within each server. 799within each server.
649 800
650=cut 801=cut
651 802
652sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
653 my ($name) = @_; 807 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
655 809
656 eval { 810 eval {
657 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
… …
667} 821}
668 822
669our $DB; 823our $DB;
670 824
671sub db_init { 825sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
674 };
675} 827}
676 828
677sub db_get($$) { 829sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
679 831
680 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
681 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
682 836
683 $! ? () 837 $! ? ()
684 : $data 838 : $data
685 }
686} 839}
687 840
688sub db_put($$$) { 841sub db_put($$$) {
689 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 871
719 my @data; 872 my @data;
720 my $md5; 873 my $md5;
721 874
722 for (0 .. $#$src) { 875 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 877 }
726 878
727 # if processing is expensive, check 879 # if processing is expensive, check
728 # checksum first 880 # checksum first
729 if (1) { 881 if (1) {
… …
746 898
747 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 900 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
750 902
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 904
753 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
756 908
… …
766 918
767=cut 919=cut
768 920
769sub datalog($@) { 921sub datalog($@) {
770 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 924}
773 925
774=back 926=back
775 927
776=cut 928=cut
… …
971 1123
972 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1126
975 } elsif (ref $type) { 1127 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
977 1129
978 } else { 1130 } else {
979 shift @arg; 1131 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
981 } 1133 }
982 } 1134 }
983} 1135}
984 1136
985sub _object_attach { 1137sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
996 } 1148 }
997 1149
998 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
999 } else { 1151 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1153 }
1002 1154
1003 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
1004} 1156}
1005 1157
… …
1064 1216
1065 for (@$callbacks) { 1217 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1067 1219
1068 if ($@) { 1220 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1222 override;
1072 } 1223 }
1073 1224
1074 return 1 if $override; 1225 return 1 if $override;
1075 } 1226 }
… …
1154 for (@$attach) { 1305 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1157 } 1308 }
1158 } else { 1309 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1311 }
1161 } 1312 }
1162} 1313}
1163 1314
1164cf::attachable->attach ( 1315cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1192 1343
1193 sync_job { 1344 sync_job {
1194 if (length $$rdata) { 1345 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1198 1350
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1352 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1354 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1225 1377
1226 $filename =~ s%/[^/]+$%%; 1378 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1379 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1380 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1230 } 1382 }
1231 } else { 1383 } else {
1232 aio_unlink $filename; 1384 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1234 } 1386 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1411 $av = $st->{objs};
1260 } 1412 }
1261 1413
1262 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1265 1418
1266 ($data, $av) 1419 ($data, $av)
1267} 1420}
1268 1421
1269=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
… …
1346 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1347 1500
1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349 1502
1350 if (ref $msg) { 1503 if (ref $msg) {
1351 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355 1505
1356 my @reply; 1506 my @reply;
1357 1507
1358 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1359 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
1361 1511
1362 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1513 if $reply;
1364 1514
1365 } else { 1515 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1517 }
1368 1518
1369 cf::override; 1519 cf::override;
1370 }, 1520 },
1371); 1521);
… …
1382 1532
1383 $grp 1533 $grp
1384} 1534}
1385 1535
1386sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1387 cf::sync_job { 1539 cf::sync_job {
1388 my %todo; 1540 my %todo;
1389 1541
1390 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1543 next unless -r $path;
… …
1409 1561
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1564
1413 $ext{source} = 1565 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1416 . $source 1568 . $source
1417 . "\n};\n1"; 1569 . "\n};\n1";
1418 1570
1419 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1584 next ext
1433 unless exists $done{$_}; 1585 unless exists $done{$_};
1434 } 1586 }
1435 1587
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1589
1438 my $active = eval $v->{source}; 1590 my $active = eval $v->{source};
1439 1591
1440 if (length $@) { 1592 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1593 error "$v->{path}: $@\n";
1442 1594
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1596 if exists $v->{meta}{mandatory};
1445 1597
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1600 } else {
1449 $done{$k} = delete $todo{$k}; 1601 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1602 push @EXTS, $v->{pkg};
1451 $progress = 1; 1603 $progress = 1;
1452 1604
1453 warn "$v->{base}: extension inactive.\n" 1605 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1606 unless $active;
1455 } 1607 }
1456 } 1608 }
1457 1609
1458 unless ($progress) { 1610 unless ($progress) {
… …
1460 1612
1461 while (my ($k, $v) = each %todo) { 1613 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1615 if exists $v->{meta}{mandatory};
1464 } 1616 }
1617
1618 last;
1465 } 1619 }
1466 } 1620 }
1467 }; 1621 };
1468} 1622}
1469 1623
… …
1627 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1628 1782
1629 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1785
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1787 $pl->deactivate;
1788
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1637 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1638 1794
1639 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1963sub generate_random_map {
1808 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1809 1965
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1967
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1969}
1827 1970
1828=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1829 1972
1830Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
… …
1835 1978
1836sub register { 1979sub register {
1837 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1981 my $pkg = caller;
1839 1982
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1984
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1986}
1845 1987
… …
1857} 1999}
1858 2000
1859sub normalise { 2001sub normalise {
1860 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1861 2003
1862 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1863 2005
1864 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1865 2007
1866 # map plan: 2008 # map plan:
1867 # 2009 #
… …
1882 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 2025 $path = "$base/$path";
1884 } 2026 }
1885 2027
1886 for ($path) { 2028 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1890 } 2031 }
1891 2032
1892 $path 2033 $path
… …
1906 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1907 return $self; 2048 return $self;
1908 } 2049 }
1909 } 2050 }
1910 2051
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2053 ()
1913} 2054}
1914 2055
2056# may re-bless or do other evil things
1915sub init { 2057sub init {
1916 my ($self) = @_; 2058 my ($self) = @_;
1917 2059
1918 $self 2060 $self
1919} 2061}
… …
1984 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1985 2127
1986 1 2128 1
1987} 2129}
1988 2130
2131# used to laod the header of an original map
1989sub load_header_orig { 2132sub load_header_orig {
1990 my ($self) = @_; 2133 my ($self) = @_;
1991 2134
1992 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1993} 2136}
1994 2137
2138# used to laod the header of an instantiated map
1995sub load_header_temp { 2139sub load_header_temp {
1996 my ($self) = @_; 2140 my ($self) = @_;
1997 2141
1998 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1999} 2143}
2000 2144
2145# called after loading the header from an instantiated map
2001sub prepare_temp { 2146sub prepare_temp {
2002 my ($self) = @_; 2147 my ($self) = @_;
2003 2148
2004 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
2005 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
2006 # safety 2151 # safety
2007 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
2008 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
2009} 2154}
2010 2155
2156# called after loading the header from an original map
2011sub prepare_orig { 2157sub prepare_orig {
2012 my ($self) = @_; 2158 my ($self) = @_;
2013 2159
2014 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
2015 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2039 2185
2040sub find; 2186sub find;
2041sub find { 2187sub find {
2042 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2043 2189
2190 cf::cede_to_tick;
2191
2044 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2045 2193
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2196
2049 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2080 2228
2081 { 2229 {
2082 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2083 2231
2084 return unless $self->valid; 2232 return unless $self->valid;
2085 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2086
2087 $self->in_memory (cf::MAP_LOADING);
2088 2234
2089 $self->alloc; 2235 $self->alloc;
2090 2236
2091 $self->pre_load; 2237 $self->pre_load;
2092 cf::cede_to_tick; 2238 cf::cede_to_tick;
2093 2239
2240 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2242 $f->skip_block;
2096 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2097 or return; 2244 or return;
2098 2245
2099 $self->post_load_original 2246 $self->post_load_original
2100 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2101 2248
2102 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2250 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2253 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2109 } 2257 }
2110 } 2258 }
2111 }
2112 2259
2113 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2114 2267
2115 cf::cede_to_tick; 2268 cf::cede_to_tick;
2116 # now do the right thing for maps 2269 # now do the right thing for maps
2117 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2122 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2123 $self->decay_objects; 2276 $self->decay_objects;
2124 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2125 $self->update_buttons; 2278 $self->update_buttons;
2126 cf::cede_to_tick; 2279 cf::cede_to_tick;
2127 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2128 } 2281 }
2129 2282
2130 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2132
2133 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2285 }
2135 2286
2136 $self->post_load; 2287 $self->post_load;
2288
2289 1
2137} 2290}
2138 2291
2139# customize the map for a given player, i.e. 2292# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2293# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2294# maps to change the path to ~playername/mappath
… …
2149# if $self->per_party; 2302# if $self->per_party;
2150 2303
2151 $self 2304 $self
2152} 2305}
2153 2306
2154# find and load all maps in the 3x3 area around a map
2155sub load_neighbours {
2156 my ($map) = @_;
2157
2158 my @neigh; # diagonal neighbours
2159
2160 for (0 .. 3) {
2161 my $neigh = $map->tile_path ($_)
2162 or next;
2163 $neigh = find $neigh, $map
2164 or next;
2165 $neigh->load;
2166
2167 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 }
2171
2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
2174 my $neigh = find $path, $origin
2175 or next;
2176 $neigh->load;
2177 }
2178}
2179
2180sub find_sync { 2307sub find_sync {
2181 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2182 2309
2183 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2184} 2315}
2185 2316
2186sub do_load_sync { 2317sub do_load_sync {
2187 my ($map) = @_; 2318 my ($map) = @_;
2188 2319
2320 # it's a bug to call this from the main context
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2191 2323
2192 cf::sync_job { $map->load }; 2324 $map->load;
2193} 2325}
2194 2326
2195our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2197 2329
2198sub find_async { 2330sub find_async {
2199 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2200 2332
2201 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2202 2334
2203 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2205 } 2337 }
2206 2338
2207 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2208 2340
2209 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2268sub swap_out { 2400sub swap_out {
2269 my ($self) = @_; 2401 my ($self) = @_;
2270 2402
2271 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272 2404
2273 return if $self->in_memory != cf::MAP_ACTIVE; 2405 return if !$self->linkable;
2274 return if $self->{deny_save}; 2406 return if $self->{deny_save};
2275 return if $self->players; 2407 return if $self->players;
2276 2408
2277 # first deactivate the map and "unlink" it from the core 2409 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate; 2410 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP; 2411 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED); 2412 $self->state (cf::MAP_SWAPPED);
2281 2413
2282 # then atomically save 2414 # then atomically save
2283 $self->_save; 2415 $self->_save;
2284 2416
2285 # then free the map 2417 # then free the map
… …
2309 2441
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2443
2312 return if $self->players; 2444 return if $self->players;
2313 2445
2314 warn "resetting map ", $self->path, "\n"; 2446 cf::trace "resetting map ", $self->path, "\n";
2315 2447
2316 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2317 2449
2318 # need to save uniques path 2450 # need to save uniques path
2319 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321 2453
… …
2583 2715
2584Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2585 2717
2586The player should be reasonably safe there for short amounts of time (e.g. 2718The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2719for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2720though, as the player cannot control the character while it is on the link
2589map. 2721map.
2590 2722
2591Will never block. 2723Will never block.
2592 2724
2593=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2615 my ($self) = @_; 2747 my ($self) = @_;
2616 2748
2617 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2618 2750
2751 ++$self->{_link_recursion};
2752
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2754
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2623 2757
… …
2649 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2650 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2651 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2652 2786
2653 $map->load; 2787 $map->load;
2654 $map->load_neighbours;
2655 2788
2656 return unless $self->contr->active; 2789 return unless $self->contr->active;
2657 2790
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2660 2793 # entering was successful
2794 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2795 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2796 $self->activate_recursive;
2663} 2797 }
2664 2798
2799}
2800
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2802
2667Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2805that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2806the new (success) or old (failed) map position. In either case, $done will
… …
2677 2813
2678our $GOTOGEN; 2814our $GOTOGEN;
2679 2815
2680sub cf::object::player::goto { 2816sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2682 2824
2683 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2827
2686 $self->enter_link; 2828 $self->enter_link;
… …
2706 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2707 } 2849 }
2708 } 2850 }
2709 2851
2710 my $map = eval { 2852 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712 2854
2713 if ($map) { 2855 if ($map) {
2714 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2858 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2860 }
2719 2861
2720 $map 2862 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2731 } 2873 }
2732 2874
2733 $done->() if $done; 2875 $done->($self) if $done;
2734 })->prio (1); 2876 })->prio (1);
2735} 2877}
2736 2878
2737=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2738 2880
… …
2806 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2807 2949
2808 unless (eval { 2950 unless (eval {
2809 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2810 2952
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2820 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2822 2979
2823 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2824 2981
2825 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2992
2836 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2994 $self->leave_link;
2838 } 2995 }
2839 })->prio (1); 2996 })->prio (1);
2840} 2997}
2841 2998
… …
3068=cut 3225=cut
3069 3226
3070sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3071 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3072 3229
3073 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075 } elsif ($self->extcmd == 1) {
3076 #TODO: version 1, remove
3077 unshift @msg, msgtype => "reply", msgid => $id;
3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079 }
3080} 3233}
3081 3234
3082=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3083 3236
3084Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3139 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3140 3293
3141 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142 3295
3143 if (ref $msg) { 3296 if (ref $msg) {
3144 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145 "ARRAY" eq ref $msg
3146 ? @$msg
3147 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148 3298
3149 my @reply; 3299 my @reply;
3150 3300
3151 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3152 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3154 3304
3155 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3306 if $reply;
3157 3307
3158 } else { 3308 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3310 }
3161 3311
3162 cf::override; 3312 cf::override;
3163 }, 3313 },
3164); 3314);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3249) { 3399) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3402 for @funs;
3254} 3403}
3255 3404
… …
3294 local @cf::_safe_eval_args = values %vars; 3443 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3444 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3445 }
3297 3446
3298 if ($@) { 3447 if ($@) {
3299 warn "$@"; 3448 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3302 } 3451 }
3303 3452
3304 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3305} 3454}
3306 3455
… …
3340 # for this (global event?) 3489 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3491
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3493
3345 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3346 3495
3347 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3497
3353 $facedata->{version} == 2 3498 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3355 3500
3356 # patch in the exptable 3501 # patch in the exptable
… …
3370 3515
3371 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3375 3521
3376 cf::cede_to_tick; 3522 cf::cede_to_tick;
3377 } 3523 }
3378 3524
3379 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3384 3530
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3534 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3536 }
3391 3537
3392 cf::cede_to_tick; 3538 cf::cede_to_tick;
3393 } 3539 }
3394 } 3540 }
… …
3406 3552
3407 { 3553 {
3408 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3409 3555
3410 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3411 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3560
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3416 } else { 3564 } else {
3417 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3418 } 3566 }
3419 3567
3420 cf::cede_to_tick; 3568 cf::cede_to_tick;
3421 } 3569 }
3422 } 3570 }
3423 3571
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3573
3426 1 3574 1
3427} 3575}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3576
3449register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3451 3579
3452 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3619sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3494} 3622}
3495 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3496sub reload_resources { 3644sub reload_resources {
3497 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3498 3646
3647 reload_exp_table;
3648 reload_materials;
3499 reload_facedata; 3649 reload_facedata;
3650 reload_sound;
3500 reload_archetypes; 3651 reload_archetypes;
3501 reload_regions; 3652 reload_regions;
3502 reload_treasures; 3653 reload_treasures;
3503 3654
3504 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3505} 3656}
3506 3657
3507sub reload_config { 3658sub reload_config {
3508 warn "reloading config file...\n"; 3659 trace "reloading config file...\n";
3509 3660
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3661 my $config = load_file "$CONFDIR/config";
3511 or return; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3512 3664
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3666
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3669
3521 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3672 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3673 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3674 };
3526 warn $@ if $@; 3675 warn $@ if $@;
3527 } 3676 }
3528
3529 warn "finished reloading resource files\n";
3530} 3677}
3531 3678
3532sub pidfile() { 3679sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3680 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3681 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3694 seek $fh, 0, 0;
3548 print $fh $$; 3695 print $fh $$;
3549} 3696}
3550 3697
3551sub main_loop { 3698sub main_loop {
3552 warn "EV::loop starting\n"; 3699 trace "EV::loop starting\n";
3553 if (1) { 3700 if (1) {
3554 EV::loop; 3701 EV::loop;
3555 } 3702 }
3556 warn "EV::loop returned\n"; 3703 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3704 goto &main_loop unless $REALLY_UNLOOP;
3558} 3705}
3559 3706
3560sub main { 3707sub main {
3561 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3562 3709
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3714
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3716
… …
3577 }; 3724 };
3578 3725
3579 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3580 3727
3581 cf::sync_job { 3728 cf::sync_job {
3582 cf::init_experience; 3729 cf::incloader::init ();
3730
3583 cf::init_anim; 3731 cf::init_anim;
3584 cf::init_attackmess; 3732 cf::init_attackmess;
3585 cf::init_dynamic; 3733 cf::init_dynamic;
3586 3734
3587 cf::load_settings; 3735 cf::load_settings;
3588 cf::load_materials;
3589 3736
3590 reload_resources; 3737 reload_resources;
3591 reload_config; 3738 reload_config;
3592 db_init; 3739 db_init;
3593 3740
… …
3605 3752
3606 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3754 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3756
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3611 }; 3758 };
3612 3759
3613 cf::object::thawer::errors_are_fatal 0; 3760 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3761 info "parse errors in files are no longer fatal from this point on.\n";
3615 3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3616 main_loop; 3767 goto &main_loop;
3617} 3768}
3618 3769
3619############################################################################# 3770#############################################################################
3620# initialisation and cleanup 3771# initialisation and cleanup
3621 3772
… …
3660 or return; 3811 or return;
3661 3812
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3814 and return;
3664 3815
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3817
3667 1 3818 1
3668} 3819}
3669 3820
3670our $uuid_lock; 3821our $uuid_lock;
… …
3682 or return; 3833 or return;
3683 3834
3684 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3685 3836
3686 unless ($value) { 3837 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3839 return;
3689 } 3840 }
3690 3841
3691 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3843 $uuid_skip = 0;
… …
3702 or return; 3853 or return;
3703 3854
3704 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3705 and return; 3856 and return;
3706 3857
3707 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3708 3859
3709 1 3860 1
3710 3861
3711} 3862}
3712 3863
… …
3718} 3869}
3719 3870
3720sub emergency_save() { 3871sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3722 3873
3723 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3724 3880
3725 cf::sync_job { 3881 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3882 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3883
3731 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3890 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3892 $pl->save;
3740 } 3893 }
3741 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3742 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3743 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3901 $map->valid or next;
3747 $map->save; 3902 $map->save;
3748 } 3903 }
3749 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3750 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3754 3911
3755 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3913 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3934 };
3759 3935
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3766} 3937}
3767 3938
3768sub post_cleanup { 3939sub post_cleanup {
3769 my ($make_core) = @_; 3940 my ($make_core) = @_;
3770 3941
3942 IO::AIO::flush;
3943
3771 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3945 if $make_core;
3773 3946
3774 my $fh = pidfile; 3947 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3776} 3949}
… …
3800 } 3973 }
3801} 3974}
3802 3975
3803sub do_reload_perl() { 3976sub do_reload_perl() {
3804 # can/must only be called in main 3977 # can/must only be called in main
3805 if (in_main) { 3978 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3807 return; 3980 return;
3808 } 3981 }
3809 3982
3810 return if $RELOAD++; 3983 return if $RELOAD++;
3811 3984
3812 my $t1 = AE::time; 3985 my $t1 = AE::time;
3813 3986
3814 while ($RELOAD) { 3987 while ($RELOAD) {
3815 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3816 3990
3817 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3818 3992
3819 cf::sync_job { 3993 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3994 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3995
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3998 %EXT_CORO = ();
3837 3999
3838 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3839 %COMMAND = (); 4001 %COMMAND = ();
3840 4002
3841 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 4004 %EXTCMD = ();
3843 %EXTICMD = (); 4005 %EXTICMD = ();
3844 4006
3845 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3848 4010
3849 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3850 eval { 4012 eval {
3851 $cb->($pkg); 4013 $cb->($pkg);
3852 1 4014 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3854 } 4016 }
3855 4017
3856 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3857 clear_package $pkg; 4019 clear_package $pkg;
3858 } 4020 }
3859 4021
3860 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 4025
3864 warn "... unloading $k"; 4026 trace "... unloading $k";
3865 delete $INC{$k}; 4027 delete $INC{$k};
3866 4028
3867 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3869 4031
… …
3872 } 4034 }
3873 4035
3874 clear_package $k; 4036 clear_package $k;
3875 } 4037 }
3876 4038
3877 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 4040 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 4042
3881 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 4046
3885 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3886 # and global variables created in xs 4048 # and global variables created in xs
3887 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3888 4050
3889 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3890 4052
3891 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3892 require cf; 4054 require cf;
3893 cf::_connect_to_perl_1; 4055 cf::_connect_to_perl_1;
3894 4056
3895 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4058 cf::reload_config;
3897 4059
3898 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4061 cf::load_extensions;
3900 4062
3901 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3908 } 4070 }
3909 4071
3910 warn "running post_init jobs"; 4072 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4073
3913 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3914 4075
3915 1 4076 1
3916 } or do { 4077 } or do {
3917 warn $@; 4078 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4080 };
3920 4081
3921 warn "reloaded";
3922 --$RELOAD; 4082 --$RELOAD;
3923 } 4083 }
3924 4084
3925 $t1 = AE::time - $t1; 4085 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3927}; 4087};
3928 4088
3929our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3930 4090
3931sub reload_perl() { 4091sub reload_perl() {
… …
3952 reload_perl; 4112 reload_perl;
3953 }; 4113 };
3954 } 4114 }
3955}; 4115};
3956 4116
3957unshift @INC, $LIBDIR; 4117#############################################################################
3958 4118
3959my $bug_warning = 0; 4119my $bug_warning = 0;
3960 4120
3961our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN;
3963
3964sub wait_for_tick { 4121sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4123
3967 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3968 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait;
3970} 4125}
3971 4126
3972sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974 4129
3975 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4132 $signal->wait;
3978} 4133}
… …
3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3984 return; 4139 return;
3985 } 4140 }
3986 4141
3987 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
3988 4143
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990 4145
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4148 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4150 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3997 }; 4152 };
3998 } 4153 }
3999 4154
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4156 $sig->send;
4002 } 4157 }
4003 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4004 $sig->send;
4005 }
4006 4159
4007 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009 4162
4010 if (0) { 4163 if (0) {
4011 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
4015 } 4168 }
4016 } 4169 }
4017} 4170}
4018 4171
4019{ 4172{
4020 # configure BDB 4173 # configure BDB
4021 4174
4022 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
4023 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
4024 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
4025 4178
4026 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
4027 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4064 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
4067} 4220}
4068 4221
4069my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
4070 4224
4071sub _log_backtrace { 4225sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
4073 4227
4074 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
4075 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4236 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
4080 async { 4238 async {
4081 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
4082 4240
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4261 --$_log_backtrace;
4104 }; 4262 };
4105 } else { 4263 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4266 }
4109} 4267}
4110 4268
4111# load additional modules 4269# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines