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.521 by root, Fri Apr 16 23:28:42 2010 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 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 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; 113our %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
… …
165 174
166our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
167 176
168sub cf::map::normalise; 177sub cf::map::normalise;
169 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
170############################################################################# 183#############################################################################
171 184
172%REFLECT = (); 185%REFLECT = ();
173for (@REFLECT) { 186for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
… …
184 197
185=over 4 198=over 4
186 199
187=item $cf::UPTIME 200=item $cf::UPTIME
188 201
189The 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.
190 218
191=item $cf::RUNTIME 219=item $cf::RUNTIME
192 220
193The 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
194every server tick. 222every server tick.
… …
200Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
201directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
203database environment. 231database environment.
204 232
205=item $cf::NOW
206
207The time of the last (current) server tick.
208
209=item $cf::TICK
210
211The interval between server ticks, in seconds.
212
213=item $cf::LOADAVG 233=item $cf::LOADAVG
214 234
215The 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
216(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
217objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
226from wherever your confdir points to. 246from wherever your confdir points to.
227 247
228=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
229 249
230These 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
231returns 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
232per 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();
233 270
234=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
235 272
236This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
237C<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
… …
245 282
246=back 283=back
247 284
248=cut 285=cut
249 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
250$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 294 my $msg = join "", @_;
252 295
253 $msg .= "\n" 296 $msg .= "\n"
254 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
255 298
256 $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;
257 300
258 LOG llevError, $msg; 301 LOG llevWarn, $msg;
259}; 302};
260 303
261$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
263 306
264 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
265 308
266 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 311 return;#d#
269 }#d# 312 }#d#
270 313
271 # kill coroutine otherwise 314 # kill coroutine otherwise
272 Coro::terminate 315 Coro::terminate
… …
294} 337}
295 338
296$EV::DIED = sub { 339$EV::DIED = sub {
297 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
298}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
299 347
300############################################################################# 348#############################################################################
301 349
302=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
303 351
… …
324 $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;
325 $d 373 $d
326 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
327} 375}
328 376
377=item $scalar = 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
329=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
330 392
331Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
332 394
333=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 402
341sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
343 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
344=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
345 438
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
348 441
349The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 443is a reload or not.
351 444
352=cut 445=cut
353 446
354sub post_init(&) { 447sub post_init(&) {
355 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
356} 466}
357 467
358=item cf::lock_wait $string 468=item cf::lock_wait $string
359 469
360Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
… …
413 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
414} 524}
415 525
416=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
417 527
418Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
419This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
420of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
421 535
422The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
423used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
424 538
425Useful for short background jobs. 539Useful for short background jobs.
… …
454 } 568 }
455 } 569 }
456 570
457 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
458 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
459 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
460 $signal->wait;
461 } else { 574 } else {
462 $busy = 0; 575 $busy = 0;
463 Coro::schedule; 576 Coro::schedule;
464 } 577 }
465 } 578 }
… …
505=cut 618=cut
506 619
507sub sync_job(&) { 620sub sync_job(&) {
508 my ($job) = @_; 621 my ($job) = @_;
509 622
510 if ($Coro::current == $Coro::main) { 623 if (in_main) {
511 my $time = AE::time; 624 my $time = AE::time;
512 625
513 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
515 628
516 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
517 630
518 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
519 632
520 my $busy = 1; 633 my $busy = 1;
521 my @res; 634 my @res;
522 635
523 (async { 636 (async {
524 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 638 @res = eval { $job->() };
526 warn $@ if $@; 639 error $@ if $@;
527 undef $busy; 640 undef $busy;
528 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
529 642
530 while ($busy) { 643 while ($busy) {
531 if (Coro::nready) { 644 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
566 679
567 $coro 680 $coro
568} 681}
569 682
570=item fork_call { }, $args 683=item fork_call { }, @args
571 684
572Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 688never block itself or use any form of event handling.
576 689
577=cut 690=cut
578 691
692sub post_fork {
693 reset_signals;
694}
695
579sub fork_call(&@) { 696sub fork_call(&@) {
580 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
581 698
582 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
585 702
586 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
587 reset_signals; 704 cf::post_fork;
588 &$cb 705 &$cb
589 }, @args; 706 } @args;
590 707
591 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
592} 709}
593 710
594sub objinfo { 711sub objinfo {
… …
644within each server. 761within each server.
645 762
646=cut 763=cut
647 764
648sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
649 my ($name) = @_; 769 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
651 771
652 eval { 772 eval {
653 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
… …
663} 783}
664 784
665our $DB; 785our $DB;
666 786
667sub db_init { 787sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
670 };
671} 789}
672 790
673sub db_get($$) { 791sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
675 793
676 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
677 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
678 798
679 $! ? () 799 $! ? ()
680 : $data 800 : $data
681 }
682} 801}
683 802
684sub db_put($$$) { 803sub db_put($$$) {
685 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
714 833
715 my @data; 834 my @data;
716 my $md5; 835 my $md5;
717 836
718 for (0 .. $#$src) { 837 for (0 .. $#$src) {
719 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
720 or Carp::croak "$src->[$_]: $!";
721 } 839 }
722 840
723 # if processing is expensive, check 841 # if processing is expensive, check
724 # checksum first 842 # checksum first
725 if (1) { 843 if (1) {
… …
742 860
743 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 862 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
746 864
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 866
749 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
752 870
… …
762 880
763=cut 881=cut
764 882
765sub datalog($@) { 883sub datalog($@) {
766 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 886}
769 887
770=back 888=back
771 889
772=cut 890=cut
… …
967 1085
968 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1088
971 } elsif (ref $type) { 1089 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
973 1091
974 } else { 1092 } else {
975 shift @arg; 1093 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
977 } 1095 }
978 } 1096 }
979} 1097}
980 1098
981sub _object_attach { 1099sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
992 } 1110 }
993 1111
994 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
995 } else { 1113 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1115 }
998 1116
999 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
1000} 1118}
1001 1119
… …
1060 1178
1061 for (@$callbacks) { 1179 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1063 1181
1064 if ($@) { 1182 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1184 override;
1068 } 1185 }
1069 1186
1070 return 1 if $override; 1187 return 1 if $override;
1071 } 1188 }
… …
1150 for (@$attach) { 1267 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1153 } 1270 }
1154 } else { 1271 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1273 }
1157 } 1274 }
1158} 1275}
1159 1276
1160cf::attachable->attach ( 1277cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1188 1305
1189 sync_job { 1306 sync_job {
1190 if (length $$rdata) { 1307 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1194 1312
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1221 1339
1222 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1342 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1226 } 1344 }
1227 } else { 1345 } else {
1228 aio_unlink $filename; 1346 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1230 } 1348 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1373 $av = $st->{objs};
1256 } 1374 }
1257 1375
1258 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1261 1380
1262 ($data, $av) 1381 ($data, $av)
1263} 1382}
1264 1383
1265=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
… …
1342 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1343 1462
1344 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345 1464
1346 if (ref $msg) { 1465 if (ref $msg) {
1347 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348 "ARRAY" eq ref $msg
1349 ? @$msg
1350 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351 1467
1352 my @reply; 1468 my @reply;
1353 1469
1354 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1355 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
… …
1357 1473
1358 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1475 if $reply;
1360 1476
1361 } else { 1477 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1479 }
1364 1480
1365 cf::override; 1481 cf::override;
1366 }, 1482 },
1367); 1483);
… …
1378 1494
1379 $grp 1495 $grp
1380} 1496}
1381 1497
1382sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1383 cf::sync_job { 1501 cf::sync_job {
1384 my %todo; 1502 my %todo;
1385 1503
1386 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1505 next unless -r $path;
… …
1405 1523
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1526
1409 $ext{source} = 1527 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1412 . $source 1530 . $source
1413 . "\n};\n1"; 1531 . "\n};\n1";
1414 1532
1415 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1546 next ext
1429 unless exists $done{$_}; 1547 unless exists $done{$_};
1430 } 1548 }
1431 1549
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1551
1434 my $active = eval $v->{source}; 1552 my $active = eval $v->{source};
1435 1553
1436 if (length $@) { 1554 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1555 error "$v->{path}: $@\n";
1438 1556
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1441 1559
1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1444 } else { 1562 } else {
1445 $done{$k} = delete $todo{$k}; 1563 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg}; 1564 push @EXTS, $v->{pkg};
1447 $progress = 1; 1565 $progress = 1;
1448 1566
1449 warn "$v->{base}: extension inactive.\n" 1567 info "$v->{base}: extension inactive.\n"
1450 unless $active; 1568 unless $active;
1451 } 1569 }
1452 } 1570 }
1453 1571
1454 unless ($progress) { 1572 unless ($progress) {
… …
1456 1574
1457 while (my ($k, $v) = each %todo) { 1575 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory}; 1577 if exists $v->{meta}{mandatory};
1460 } 1578 }
1579
1580 last;
1461 } 1581 }
1462 } 1582 }
1463 }; 1583 };
1464} 1584}
1465 1585
… …
1623 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1624 1744
1625 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1627 1747
1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1629 $pl->deactivate; 1749 $pl->deactivate;
1750
1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1631 $pl->ob->check_score;
1632 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1633 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1634 1756
1635 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1636 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1637 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
… …
1691 \@logins 1813 \@logins
1692} 1814}
1693 1815
1694=item $player->maps 1816=item $player->maps
1695 1817
1818=item cf::player::maps $login
1819
1696Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1697player. May block. 1821player. May block.
1698 1822
1699=cut 1823=cut
1700 1824
… …
1762=cut 1886=cut
1763 1887
1764sub find_by_path($) { 1888sub find_by_path($) {
1765 my ($path) = @_; 1889 my ($path) = @_;
1766 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1767 my ($match, $specificity); 1893 my ($match, $specificity);
1768 1894
1769 for my $region (list) { 1895 for my $region (list) {
1770 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1771 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
… …
1799sub generate_random_map { 1925sub generate_random_map {
1800 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1801 1927
1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1803 1929
1804 # mit "rum" bekleckern, nicht
1805 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1809 $rmp->{exit_on_final_map},
1810 $rmp->{xsize}, $rmp->{ysize},
1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1814 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1815 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1816 (cf::region::find $rmp->{region}), $rmp->{custom}
1817 )
1818} 1931}
1819 1932
1820=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1821 1934
1822Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
… …
1827 1940
1828sub register { 1941sub register {
1829 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1830 my $pkg = caller; 1943 my $pkg = caller;
1831 1944
1832 no strict;
1833 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1834 1946
1835 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1836} 1948}
1837 1949
1838# also paths starting with '/' 1950# also paths starting with '/'
1839$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1840 1952
1841sub thawer_merge { 1953sub thawer_merge {
1842 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1843 1955
1844 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
… …
1849} 1961}
1850 1962
1851sub normalise { 1963sub normalise {
1852 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1853 1965
1854 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1855 1967
1856 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1857 1969
1858 # map plan: 1970 # map plan:
1859 # 1971 #
… …
1874 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1875 $path = "$base/$path"; 1987 $path = "$base/$path";
1876 } 1988 }
1877 1989
1878 for ($path) { 1990 for ($path) {
1879 redo if s{//}{/};
1880 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1881 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1882 } 1993 }
1883 1994
1884 $path 1995 $path
… …
1898 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1899 return $self; 2010 return $self;
1900 } 2011 }
1901 } 2012 }
1902 2013
1903 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1904 () 2015 ()
1905} 2016}
1906 2017
2018# may re-bless or do other evil things
1907sub init { 2019sub init {
1908 my ($self) = @_; 2020 my ($self) = @_;
1909 2021
1910 $self 2022 $self
1911} 2023}
… …
1976 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1977 2089
1978 1 2090 1
1979} 2091}
1980 2092
2093# used to laod the header of an original map
1981sub load_header_orig { 2094sub load_header_orig {
1982 my ($self) = @_; 2095 my ($self) = @_;
1983 2096
1984 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1985} 2098}
1986 2099
2100# used to laod the header of an instantiated map
1987sub load_header_temp { 2101sub load_header_temp {
1988 my ($self) = @_; 2102 my ($self) = @_;
1989 2103
1990 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1991} 2105}
1992 2106
2107# called after loading the header from an instantiated map
1993sub prepare_temp { 2108sub prepare_temp {
1994 my ($self) = @_; 2109 my ($self) = @_;
1995 2110
1996 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1997 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1998 # safety 2113 # safety
1999 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
2000 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2001} 2116}
2002 2117
2118# called after loading the header from an original map
2003sub prepare_orig { 2119sub prepare_orig {
2004 my ($self) = @_; 2120 my ($self) = @_;
2005 2121
2006 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2007 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
… …
2031 2147
2032sub find; 2148sub find;
2033sub find { 2149sub find {
2034 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2035 2151
2152 cf::cede_to_tick;
2153
2036 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2037 2155
2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2040 2158
2041 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
… …
2072 2190
2073 { 2191 {
2074 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2075 2193
2076 return unless $self->valid; 2194 return unless $self->valid;
2077 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2078
2079 $self->in_memory (cf::MAP_LOADING);
2080 2196
2081 $self->alloc; 2197 $self->alloc;
2082 2198
2083 $self->pre_load; 2199 $self->pre_load;
2084 cf::cede_to_tick; 2200 cf::cede_to_tick;
2085 2201
2202 if (exists $self->{load_path}) {
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2204 $f->skip_block;
2088 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2089 or return; 2206 or return;
2090 2207
2091 $self->post_load_original 2208 $self->post_load_original
2092 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2093 2210
2094 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2212 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2098 $self->clear_unique_items; 2215 $self->clear_unique_items;
2099 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2101 } 2219 }
2102 } 2220 }
2103 }
2104 2221
2105 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2106 2229
2107 cf::cede_to_tick; 2230 cf::cede_to_tick;
2108 # now do the right thing for maps 2231 # now do the right thing for maps
2109 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2110 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
… …
2114 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2238 $self->decay_objects;
2116 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2117 $self->update_buttons; 2240 $self->update_buttons;
2118 cf::cede_to_tick; 2241 cf::cede_to_tick;
2119 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2120 } 2243 }
2121 2244
2122 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2123 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2124
2125 $self->in_memory (cf::MAP_ACTIVE);
2126 } 2247 }
2127 2248
2128 $self->post_load; 2249 $self->post_load;
2250
2251 1
2129} 2252}
2130 2253
2131# customize the map for a given player, i.e. 2254# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player 2255# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath 2256# maps to change the path to ~playername/mappath
… …
2141# if $self->per_party; 2264# if $self->per_party;
2142 2265
2143 $self 2266 $self
2144} 2267}
2145 2268
2146# find and load all maps in the 3x3 area around a map
2147sub load_neighbours {
2148 my ($map) = @_;
2149
2150 my @neigh; # diagonal neighbours
2151
2152 for (0 .. 3) {
2153 my $neigh = $map->tile_path ($_)
2154 or next;
2155 $neigh = find $neigh, $map
2156 or next;
2157 $neigh->load;
2158
2159 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 }
2163
2164 for (grep defined $_->[0], @neigh) {
2165 my ($path, $origin) = @$_;
2166 my $neigh = find $path, $origin
2167 or next;
2168 $neigh->load;
2169 }
2170}
2171
2172sub find_sync { 2269sub find_sync {
2173 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2174 2271
2175 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2176} 2277}
2177 2278
2178sub do_load_sync { 2279sub do_load_sync {
2179 my ($map) = @_; 2280 my ($map) = @_;
2180 2281
2282 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2183 2285
2184 cf::sync_job { $map->load }; 2286 $map->load;
2185} 2287}
2186 2288
2187our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2189 2291
2190sub find_async { 2292sub find_async {
2191 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2192 2294
2193 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2194 2296
2195 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2197 } 2299 }
2198 2300
2199 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2200 2302
2201 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
… …
2260sub swap_out { 2362sub swap_out {
2261 my ($self) = @_; 2363 my ($self) = @_;
2262 2364
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2366
2265 return if $self->in_memory != cf::MAP_ACTIVE; 2367 return if !$self->linkable;
2266 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2267 return if $self->players; 2369 return if $self->players;
2268 2370
2269 # first deactivate the map and "unlink" it from the core 2371 # first deactivate the map and "unlink" it from the core
2270 $self->deactivate; 2372 $self->deactivate;
2271 $_->clear_links_to ($self) for values %cf::MAP; 2373 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->state (cf::MAP_SWAPPED);
2273 2375
2274 # then atomically save 2376 # then atomically save
2275 $self->_save; 2377 $self->_save;
2276 2378
2277 # then free the map 2379 # then free the map
… …
2301 2403
2302 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2303 2405
2304 return if $self->players; 2406 return if $self->players;
2305 2407
2306 warn "resetting map ", $self->path, "\n"; 2408 cf::trace "resetting map ", $self->path, "\n";
2307 2409
2308 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2309 2411
2310 # need to save uniques path 2412 # need to save uniques path
2311 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2312 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2313 2415
… …
2335 2437
2336 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2337 2439
2338 $self->unlink_save; 2440 $self->unlink_save;
2339 2441
2340 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2341 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2342 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2343 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2344 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2345 2447
… …
2575 2677
2576Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2577 2679
2578The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2579for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2581map. 2683map.
2582 2684
2583Will never block. 2685Will never block.
2584 2686
2585=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
… …
2606sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2607 my ($self) = @_; 2709 my ($self) = @_;
2608 2710
2609 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2610 2712
2713 ++$self->{_link_recursion};
2714
2611 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2612 2716
2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2614 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2615 2719
… …
2641 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2642 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2643 if $x <= 0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2644 2748
2645 $map->load; 2749 $map->load;
2646 $map->load_neighbours;
2647 2750
2648 return unless $self->contr->active; 2751 return unless $self->contr->active;
2649 2752
2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2651 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2652 2755 # entering was successful
2756 delete $self->{_link_recursion};
2653 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive; 2758 $self->activate_recursive;
2655} 2759 }
2656 2760
2761}
2762
2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2658 2764
2659Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2660her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2661that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2662the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
… …
2669 2775
2670our $GOTOGEN; 2776our $GOTOGEN;
2671 2777
2672sub cf::object::player::goto { 2778sub cf::object::player::goto {
2673 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2674 2786
2675 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2676 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2677 2789
2678 $self->enter_link; 2790 $self->enter_link;
… …
2698 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2699 } 2811 }
2700 } 2812 }
2701 2813
2702 my $map = eval { 2814 my $map = eval {
2703 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2704 2816
2705 if ($map) { 2817 if ($map) {
2706 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2707 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2708 } else { 2820 } else {
2709 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2710 } 2822 }
2711 2823
2712 $map 2824 $map
… …
2720 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2721 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2722 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2723 } 2835 }
2724 2836
2725 $done->() if $done; 2837 $done->($self) if $done;
2726 })->prio (1); 2838 })->prio (1);
2727} 2839}
2728 2840
2729=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2730 2842
… …
2798 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2799 2911
2800 unless (eval { 2912 unless (eval {
2801 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2802 2914
2803 # random map handling
2804 {
2805 my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807 prepare_random_map $exit
2808 if $exit->slaying eq "/!";
2809 }
2810
2811 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2812 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2813 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2814 2941
2815 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2816 2943
2817 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2818 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
… …
2823 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2824 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2825 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2826 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2827 2954
2828 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2829 $self->leave_link; 2956 $self->leave_link;
2830 } 2957 }
2831 })->prio (1); 2958 })->prio (1);
2832} 2959}
2833 2960
… …
3060=cut 3187=cut
3061 3188
3062sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
3063 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
3064 3191
3065 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3067 } elsif ($self->extcmd == 1) {
3068 #TODO: version 1, remove
3069 unshift @msg, msgtype => "reply", msgid => $id;
3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3071 }
3072} 3195}
3073 3196
3074=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
3075 3198
3076Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
… …
3131 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3132 3255
3133 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3134 3257
3135 if (ref $msg) { 3258 if (ref $msg) {
3136 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3137 "ARRAY" eq ref $msg
3138 ? @$msg
3139 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3140 3260
3141 my @reply; 3261 my @reply;
3142 3262
3143 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3144 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
… …
3146 3266
3147 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3148 if $reply; 3268 if $reply;
3149 3269
3150 } else { 3270 } else {
3151 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3152 } 3272 }
3153 3273
3154 cf::override; 3274 cf::override;
3155 }, 3275 },
3156); 3276);
… …
3237 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3238 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3239 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3240 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3241) { 3361) {
3242 no strict 'refs';
3243 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3245 for @funs; 3364 for @funs;
3246} 3365}
3247 3366
… …
3286 local @cf::_safe_eval_args = values %vars; 3405 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval; 3406 @res = wantarray ? eval eval : scalar eval $eval;
3288 } 3407 }
3289 3408
3290 if ($@) { 3409 if ($@) {
3291 warn "$@"; 3410 warn "$@",
3292 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3293 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3294 } 3413 }
3295 3414
3296 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3297} 3416}
3298 3417
… …
3332 # for this (global event?) 3451 # for this (global event?)
3333 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3334 3453
3335 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3336 3455
3337 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3338 3457
3339 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3340 0 < aio_load $path, $facedata
3341 or die "$path: $!";
3342
3343 $facedata = Coro::Storable::thaw $facedata;
3344 3459
3345 $facedata->{version} == 2 3460 $facedata->{version} == 2
3346 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3347 3462
3348 # patch in the exptable 3463 # patch in the exptable
… …
3362 3477
3363 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3364 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3367 3483
3368 cf::cede_to_tick; 3484 cf::cede_to_tick;
3369 } 3485 }
3370 3486
3371 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
… …
3376 3492
3377 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3378 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3380 } else { 3496 } else {
3381 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3382 } 3498 }
3383 3499
3384 cf::cede_to_tick; 3500 cf::cede_to_tick;
3385 } 3501 }
3386 } 3502 }
… …
3404 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3405 3521
3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3407 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3408 } else { 3524 } else {
3409 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3410 } 3526 }
3411 3527
3412 cf::cede_to_tick; 3528 cf::cede_to_tick;
3413 } 3529 }
3414 } 3530 }
3415 3531
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3417 3533
3418 1 3534 1
3419} 3535}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3440 3536
3441register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3442 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3443 3539
3444 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
… …
3483sub reload_treasures { 3579sub reload_treasures {
3484 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3485 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3486} 3582}
3487 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3488sub reload_resources { 3604sub reload_resources {
3489 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3490 3606
3607 reload_exp_table;
3608 reload_materials;
3491 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3492 reload_archetypes; 3611 reload_archetypes;
3493 reload_regions; 3612 reload_regions;
3494 reload_treasures; 3613 reload_treasures;
3495 3614
3496 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3497} 3616}
3498 3617
3499sub reload_config { 3618sub reload_config {
3500 warn "reloading config file...\n"; 3619 trace "reloading config file...\n";
3501 3620
3502 open my $fh, "<:utf8", "$CONFDIR/config" 3621 my $config = load_file "$CONFDIR/config";
3503 or return; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3504 3624
3505 local $/;
3506 *CFG = YAML::XS::Load scalar <$fh>;
3507
3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3509 3626
3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3512 3629
3513 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
… …
3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3632 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3516 and die "WARNING: m(un)lockall failed: $!\n"; 3633 and die "WARNING: m(un)lockall failed: $!\n";
3517 }; 3634 };
3518 warn $@ if $@; 3635 warn $@ if $@;
3519 } 3636 }
3520
3521 warn "finished reloading resource files\n";
3522} 3637}
3523 3638
3524sub pidfile() { 3639sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!"; 3641 or die "$PIDFILE: $!";
… …
3539 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3540 print $fh $$; 3655 print $fh $$;
3541} 3656}
3542 3657
3543sub main_loop { 3658sub main_loop {
3544 warn "EV::loop starting\n"; 3659 trace "EV::loop starting\n";
3545 if (1) { 3660 if (1) {
3546 EV::loop; 3661 EV::loop;
3547 } 3662 }
3548 warn "EV::loop returned\n"; 3663 trace "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP; 3664 goto &main_loop unless $REALLY_UNLOOP;
3550} 3665}
3551 3666
3552sub main { 3667sub main {
3553 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3554 3669
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559 3674
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561 3676
… …
3569 }; 3684 };
3570 3685
3571 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3572 3687
3573 cf::sync_job { 3688 cf::sync_job {
3574 cf::init_experience; 3689 cf::incloader::init ();
3690
3575 cf::init_anim; 3691 cf::init_anim;
3576 cf::init_attackmess; 3692 cf::init_attackmess;
3577 cf::init_dynamic; 3693 cf::init_dynamic;
3578 3694
3579 cf::load_settings; 3695 cf::load_settings;
3580 cf::load_materials;
3581 3696
3582 reload_resources; 3697 reload_resources;
3583 reload_config; 3698 reload_config;
3584 db_init; 3699 db_init;
3585 3700
… …
3597 3712
3598 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX (); 3714 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601 3716
3602 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3603 }; 3718 };
3604 3719
3605 cf::object::thawer::errors_are_fatal 0; 3720 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n"; 3721 info "parse errors in files are no longer fatal from this point on.\n";
3607 3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3608 main_loop; 3727 goto &main_loop;
3609} 3728}
3610 3729
3611############################################################################# 3730#############################################################################
3612# initialisation and cleanup 3731# initialisation and cleanup
3613 3732
… …
3652 or return; 3771 or return;
3653 3772
3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3655 and return; 3774 and return;
3656 3775
3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3658 3777
3659 1 3778 1
3660} 3779}
3661 3780
3662our $uuid_lock; 3781our $uuid_lock;
… …
3674 or return; 3793 or return;
3675 3794
3676 my $value = uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3677 3796
3678 unless ($value) { 3797 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n"; 3798 info "cowardly refusing to write zero uuid value!\n";
3680 return; 3799 return;
3681 } 3800 }
3682 3801
3683 my $value = uuid_str $value + $uuid_skip; 3802 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0; 3803 $uuid_skip = 0;
… …
3694 or return; 3813 or return;
3695 3814
3696 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3697 and return; 3816 and return;
3698 3817
3699 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3700 3819
3701 1 3820 1
3702 3821
3703} 3822}
3704 3823
… …
3710} 3829}
3711 3830
3712sub emergency_save() { 3831sub emergency_save() {
3713 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3714 3833
3715 warn "emergency_perl_save: enter\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3716 3840
3717 cf::sync_job { 3841 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so 3842 cf::write_runtime_sync; # external watchdog should not bark
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722 3843
3723 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3724 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3725 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3726 warn "emergency_perl_save: begin player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3727 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3728 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3729 $pl->valid or next; 3850 $pl->valid or next;
3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3731 $pl->save; 3852 $pl->save;
3732 } 3853 }
3733 warn "emergency_perl_save: end player save\n"; 3854 info "emergency_perl_save: end player save\n";
3734 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3735 warn "emergency_perl_save: begin map save\n"; 3858 info "emergency_perl_save: begin map save\n";
3736 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3737 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3738 $map->valid or next; 3861 $map->valid or next;
3739 $map->save; 3862 $map->save;
3740 } 3863 }
3741 warn "emergency_perl_save: end map save\n"; 3864 info "emergency_perl_save: end map save\n";
3742 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3743 warn "emergency_perl_save: begin database checkpoint\n"; 3868 info "emergency_perl_save: begin database checkpoint\n";
3744 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3745 warn "emergency_perl_save: end database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3746 3871
3747 warn "emergency_perl_save: begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1; 3873 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3750 }; 3894 };
3751 3895
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3757 warn "emergency_perl_save: leave\n"; 3896 info "emergency_perl_save: leave\n";
3758} 3897}
3759 3898
3760sub post_cleanup { 3899sub post_cleanup {
3761 my ($make_core) = @_; 3900 my ($make_core) = @_;
3762 3901
3902 IO::AIO::flush;
3903
3763 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3764 if $make_core; 3905 if $make_core;
3765 3906
3766 my $fh = pidfile; 3907 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3768} 3909}
… …
3792 } 3933 }
3793} 3934}
3794 3935
3795sub do_reload_perl() { 3936sub do_reload_perl() {
3796 # can/must only be called in main 3937 # can/must only be called in main
3797 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3798 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3799 return; 3940 return;
3800 } 3941 }
3801 3942
3802 return if $RELOAD++; 3943 return if $RELOAD++;
3803 3944
3804 my $t1 = AE::time; 3945 my $t1 = AE::time;
3805 3946
3806 while ($RELOAD) { 3947 while ($RELOAD) {
3807 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3808 3950
3809 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3810 3952
3811 cf::sync_job { 3953 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 cf::emergency_save; 3954 #cf::emergency_save;
3814 cf::write_runtime_sync; # external watchdog should not bark
3815 3955
3816 warn "syncing database to disk";
3817 BDB::db_env_txn_checkpoint $DB_ENV;
3818
3819 # if anything goes wrong in here, we should simply crash as we already saved
3820
3821 warn "flushing outstanding aio requests";
3822 while (IO::AIO::nreqs || BDB::nreqs) {
3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3824 }
3825
3826 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3827 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3828 %EXT_CORO = (); 3958 %EXT_CORO = ();
3829 3959
3830 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3831 %COMMAND = (); 3961 %COMMAND = ();
3832 3962
3833 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3834 %EXTCMD = (); 3964 %EXTCMD = ();
3835 %EXTICMD = (); 3965 %EXTICMD = ();
3836 3966
3837 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3838 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3839 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3840 3970
3841 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3842 eval { 3972 eval {
3843 $cb->($pkg); 3973 $cb->($pkg);
3844 1 3974 1
3845 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3846 } 3976 }
3847 3977
3848 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3849 clear_package $pkg; 3979 clear_package $pkg;
3850 } 3980 }
3851 3981
3852 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855 3985
3856 warn "... unloading $k"; 3986 trace "... unloading $k";
3857 delete $INC{$k}; 3987 delete $INC{$k};
3858 3988
3859 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3861 3991
… …
3864 } 3994 }
3865 3995
3866 clear_package $k; 3996 clear_package $k;
3867 } 3997 }
3868 3998
3869 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3870 clear_package "safe::$_" 4000 clear_package "safe::$_"
3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3872 4002
3873 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3874 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3876 4006
3877 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3878 # and global variables created in xs 4008 # and global variables created in xs
3879 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3880 4010
3881 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3882 4012
3883 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3884 require cf; 4014 require cf;
3885 cf::_connect_to_perl_1; 4015 cf::_connect_to_perl_1;
3886 4016
3887 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3888 cf::reload_config; 4018 cf::reload_config;
3889 4019
3890 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3891 cf::load_extensions; 4021 cf::load_extensions;
3892 4022
3893 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3894 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3895 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3896 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3897 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3898 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3899 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3900 } 4030 }
3901 4031
3902 warn "running post_init jobs"; 4032 cf::_post_init 1;
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904 4033
3905 warn "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3906 4035
3907 1 4036 1
3908 } or do { 4037 } or do {
3909 warn $@; 4038 error $@;
3910 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3911 }; 4040 };
3912 4041
3913 warn "reloaded";
3914 --$RELOAD; 4042 --$RELOAD;
3915 } 4043 }
3916 4044
3917 $t1 = AE::time - $t1; 4045 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3919}; 4047};
3920 4048
3921our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3922 4050
3923sub reload_perl() { 4051sub reload_perl() {
… …
3944 reload_perl; 4072 reload_perl;
3945 }; 4073 };
3946 } 4074 }
3947}; 4075};
3948 4076
3949unshift @INC, $LIBDIR; 4077#############################################################################
3950 4078
3951my $bug_warning = 0; 4079my $bug_warning = 0;
3952 4080
3953our @WAIT_FOR_TICK;
3954our @WAIT_FOR_TICK_BEGIN;
3955
3956sub wait_for_tick { 4081sub wait_for_tick() {
3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3958 4083
3959 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3960 push @WAIT_FOR_TICK, $signal;
3961 $signal->wait;
3962} 4085}
3963 4086
3964sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4089
3967 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3969 $signal->wait; 4092 $signal->wait;
3970} 4093}
… …
3974 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3975 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3976 return; 4099 return;
3977 } 4100 }
3978 4101
3979 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
3980 4103
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3982 4105
3983 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3985 Coro::async_pool { 4108 Coro::async_pool {
3986 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3987 write_runtime_sync 4110 write_runtime_sync
3988 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3989 }; 4112 };
3990 } 4113 }
3991 4114
3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3993 $sig->send; 4116 $sig->send;
3994 } 4117 }
3995 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3996 $sig->send;
3997 }
3998 4119
3999 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
4000 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4001 4122
4002 if (0) { 4123 if (0) {
4003 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
4007 } 4128 }
4008 } 4129 }
4009} 4130}
4010 4131
4011{ 4132{
4012 # configure BDB 4133 # configure BDB
4013 4134
4014 BDB::min_parallel 16; 4135 BDB::min_parallel 16;
4015 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
4016 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
4017 4138
4018 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
4019 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4020 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4021 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4056 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
4057 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
4058 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
4059} 4180}
4060 4181
4061my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
4062 4184
4063sub _log_backtrace { 4185sub _log_backtrace {
4064 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
4065 4187
4066 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
4067 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4068 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
4069 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
4070 ++$_log_backtrace; 4196 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
4072 async { 4198 async {
4073 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
4074 4200
… …
4094 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
4095 --$_log_backtrace; 4221 --$_log_backtrace;
4096 }; 4222 };
4097 } else { 4223 } else {
4098 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
4099 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4100 } 4226 }
4101} 4227}
4102 4228
4103# load additional modules 4229# load additional modules
4104require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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