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.514 by root, Mon Apr 12 17:13:36 2010 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 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
… …
1357 1476
1358 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1478 if $reply;
1360 1479
1361 } else { 1480 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1482 }
1364 1483
1365 cf::override; 1484 cf::override;
1366 }, 1485 },
1367); 1486);
… …
1378 1497
1379 $grp 1498 $grp
1380} 1499}
1381 1500
1382sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1383 cf::sync_job { 1504 cf::sync_job {
1384 my %todo; 1505 my %todo;
1385 1506
1386 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1508 next unless -r $path;
… …
1405 1526
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1529
1409 $ext{source} = 1530 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1412 . $source 1533 . $source
1413 . "\n};\n1"; 1534 . "\n};\n1";
1414 1535
1415 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1549 next ext
1429 unless exists $done{$_}; 1550 unless exists $done{$_};
1430 } 1551 }
1431 1552
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1554
1434 my $active = eval $v->{source}; 1555 my $active = eval $v->{source};
1435 1556
1436 if (length $@) { 1557 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1558 error "$v->{path}: $@\n";
1438 1559
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1561 if exists $v->{meta}{mandatory};
1562
1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1441 } else { 1565 } else {
1442 $done{$k} = delete $todo{$k}; 1566 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1567 push @EXTS, $v->{pkg};
1444 $progress = 1; 1568 $progress = 1;
1445 1569
1446 warn "$v->{base}: extension inactive.\n" 1570 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1571 unless $active;
1448 } 1572 }
1449 } 1573 }
1450 1574
1451 unless ($progress) { 1575 unless ($progress) {
… …
1453 1577
1454 while (my ($k, $v) = each %todo) { 1578 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory}; 1580 if exists $v->{meta}{mandatory};
1457 } 1581 }
1582
1583 last;
1458 } 1584 }
1459 } 1585 }
1460 }; 1586 };
1461} 1587}
1462 1588
… …
1620 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1621 1747
1622 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1624 1750
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1752 $pl->deactivate;
1753
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1630 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1631 1759
1632 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
… …
1688 \@logins 1816 \@logins
1689} 1817}
1690 1818
1691=item $player->maps 1819=item $player->maps
1692 1820
1821=item cf::player::maps $login
1822
1693Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1694player. May block. 1824player. May block.
1695 1825
1696=cut 1826=cut
1697 1827
… …
1759=cut 1889=cut
1760 1890
1761sub find_by_path($) { 1891sub find_by_path($) {
1762 my ($path) = @_; 1892 my ($path) = @_;
1763 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1764 my ($match, $specificity); 1896 my ($match, $specificity);
1765 1897
1766 for my $region (list) { 1898 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1768 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
… …
1796sub generate_random_map { 1928sub generate_random_map {
1797 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1798 1930
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800 1932
1801 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 1934}
1816 1935
1817=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1818 1937
1819Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
… …
1824 1943
1825sub register { 1944sub register {
1826 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1946 my $pkg = caller;
1828 1947
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1949
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1951}
1834 1952
1835# also paths starting with '/' 1953# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1955
1838sub thawer_merge { 1956sub thawer_merge {
1839 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1840 1958
1841 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
… …
1846} 1964}
1847 1965
1848sub normalise { 1966sub normalise {
1849 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1850 1968
1851 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1852 1970
1853 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1854 1972
1855 # map plan: 1973 # map plan:
1856 # 1974 #
… …
1871 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 1990 $path = "$base/$path";
1873 } 1991 }
1874 1992
1875 for ($path) { 1993 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1879 } 1996 }
1880 1997
1881 $path 1998 $path
… …
1895 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1896 return $self; 2013 return $self;
1897 } 2014 }
1898 } 2015 }
1899 2016
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 2018 ()
1902} 2019}
1903 2020
2021# may re-bless or do other evil things
1904sub init { 2022sub init {
1905 my ($self) = @_; 2023 my ($self) = @_;
1906 2024
1907 $self 2025 $self
1908} 2026}
… …
1973 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1974 2092
1975 1 2093 1
1976} 2094}
1977 2095
2096# used to laod the header of an original map
1978sub load_header_orig { 2097sub load_header_orig {
1979 my ($self) = @_; 2098 my ($self) = @_;
1980 2099
1981 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1982} 2101}
1983 2102
2103# used to laod the header of an instantiated map
1984sub load_header_temp { 2104sub load_header_temp {
1985 my ($self) = @_; 2105 my ($self) = @_;
1986 2106
1987 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1988} 2108}
1989 2109
2110# called after loading the header from an instantiated map
1990sub prepare_temp { 2111sub prepare_temp {
1991 my ($self) = @_; 2112 my ($self) = @_;
1992 2113
1993 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1995 # safety 2116 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2119}
1999 2120
2121# called after loading the header from an original map
2000sub prepare_orig { 2122sub prepare_orig {
2001 my ($self) = @_; 2123 my ($self) = @_;
2002 2124
2003 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
… …
2028 2150
2029sub find; 2151sub find;
2030sub find { 2152sub find {
2031 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2032 2154
2155 cf::cede_to_tick;
2156
2033 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2034 2158
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2161
2038 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
… …
2069 2193
2070 { 2194 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2072 2196
2073 return unless $self->valid; 2197 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2199
2078 $self->alloc; 2200 $self->alloc;
2079 2201
2080 $self->pre_load; 2202 $self->pre_load;
2081 cf::cede_to_tick; 2203 cf::cede_to_tick;
2082 2204
2205 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2207 $f->skip_block;
2085 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2086 or return; 2209 or return;
2087 2210
2088 $self->post_load_original 2211 $self->post_load_original
2089 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2090 2213
2091 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2215 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2218 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2098 } 2222 }
2099 } 2223 }
2100 }
2101 2224
2102 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2103 2232
2104 cf::cede_to_tick; 2233 cf::cede_to_tick;
2105 # now do the right thing for maps 2234 # now do the right thing for maps
2106 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
… …
2111 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2241 $self->decay_objects;
2113 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2114 $self->update_buttons; 2243 $self->update_buttons;
2115 cf::cede_to_tick; 2244 cf::cede_to_tick;
2116 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2117 } 2246 }
2118 2247
2119 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2250 }
2124 2251
2125 $self->post_load; 2252 $self->post_load;
2253
2254 1
2126} 2255}
2127 2256
2128# customize the map for a given player, i.e. 2257# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2258# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2259# maps to change the path to ~playername/mappath
… …
2138# if $self->per_party; 2267# if $self->per_party;
2139 2268
2140 $self 2269 $self
2141} 2270}
2142 2271
2143# find and load all maps in the 3x3 area around a map
2144sub load_neighbours {
2145 my ($map) = @_;
2146
2147 my @neigh; # diagonal neighbours
2148
2149 for (0 .. 3) {
2150 my $neigh = $map->tile_path ($_)
2151 or next;
2152 $neigh = find $neigh, $map
2153 or next;
2154 $neigh->load;
2155
2156 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 }
2160
2161 for (grep defined $_->[0], @neigh) {
2162 my ($path, $origin) = @$_;
2163 my $neigh = find $path, $origin
2164 or next;
2165 $neigh->load;
2166 }
2167}
2168
2169sub find_sync { 2272sub find_sync {
2170 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2171 2274
2172 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2173} 2280}
2174 2281
2175sub do_load_sync { 2282sub do_load_sync {
2176 my ($map) = @_; 2283 my ($map) = @_;
2177 2284
2285 # it's a bug to call this from the main context
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2180 2288
2181 cf::sync_job { $map->load }; 2289 $map->load;
2182} 2290}
2183 2291
2184our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2186 2294
2187sub find_async { 2295sub find_async {
2188 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2189 2297
2190 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2191 2299
2192 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2194 } 2302 }
2195 2303
2196 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2197 2305
2198 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
… …
2212 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2213 2321
2214 () 2322 ()
2215} 2323}
2216 2324
2325# common code, used by both ->save and ->swapout
2217sub save { 2326sub _save {
2218 my ($self) = @_; 2327 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2328
2222 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2223 2330
2224 return unless $self->dirty; 2331 return unless $self->dirty;
2225 2332
… …
2245 } else { 2352 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2354 }
2248} 2355}
2249 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2250sub swap_out { 2365sub swap_out {
2251 my ($self) = @_; 2366 my ($self) = @_;
2252 2367
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2258 return if $self->players; 2372 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2260 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2261 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2262 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2263 2424
2264 $self->deactivate; 2425 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2427 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2428
2312 $self->unlink_save; 2429 $self->unlink_save;
2313 $self->destroy; 2430 $self->destroy;
2314} 2431}
2315 2432
… …
2323 2440
2324 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2325 2442
2326 $self->unlink_save; 2443 $self->unlink_save;
2327 2444
2328 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2450
… …
2563 2680
2564Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2565 2682
2566The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2567for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2569map. 2686map.
2570 2687
2571Will never block. 2688Will never block.
2572 2689
2573=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2595 my ($self) = @_; 2712 my ($self) = @_;
2596 2713
2597 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2598 2715
2716 ++$self->{_link_recursion};
2717
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2719
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2603 2722
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2724}
2606 2725
2607sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2609 2728
… …
2629 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2630 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2631 if $x <= 0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2632 2751
2633 $map->load; 2752 $map->load;
2634 $map->load_neighbours;
2635 2753
2636 return unless $self->contr->active; 2754 return unless $self->contr->active;
2637 2755
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2640 2758 # entering was successful
2759 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2760 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2761 $self->activate_recursive;
2643} 2762 }
2644 2763
2764}
2765
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2767
2647Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2650the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
… …
2657 2778
2658our $GOTOGEN; 2779our $GOTOGEN;
2659 2780
2660sub cf::object::player::goto { 2781sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2662 2789
2663 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2792
2666 $self->enter_link; 2793 $self->enter_link;
… …
2686 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2687 } 2814 }
2688 } 2815 }
2689 2816
2690 my $map = eval { 2817 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692 2819
2693 if ($map) { 2820 if ($map) {
2694 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2823 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2825 }
2699 2826
2700 $map 2827 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2711 } 2838 }
2712 2839
2713 $done->() if $done; 2840 $done->($self) if $done;
2714 })->prio (1); 2841 })->prio (1);
2715} 2842}
2716 2843
2717=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2718 2845
… …
2786 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2787 2914
2788 unless (eval { 2915 unless (eval {
2789 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2790 2917
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2800 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2802 2944
2803 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2804 2946
2805 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2957
2816 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2959 $self->leave_link;
2818 } 2960 }
2819 })->prio (1); 2961 })->prio (1);
2820} 2962}
2821 2963
… …
3134 3276
3135 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3278 if $reply;
3137 3279
3138 } else { 3280 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3282 }
3141 3283
3142 cf::override; 3284 cf::override;
3143 }, 3285 },
3144); 3286);
… …
3225 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3229) { 3371) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3374 for @funs;
3234} 3375}
3235 3376
… …
3274 local @cf::_safe_eval_args = values %vars; 3415 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3416 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3417 }
3277 3418
3278 if ($@) { 3419 if ($@) {
3279 warn "$@"; 3420 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3282 } 3423 }
3283 3424
3284 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3285} 3426}
3286 3427
… …
3320 # for this (global event?) 3461 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3463
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3465
3325 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3326 3467
3327 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3328 0 < aio_load $path, $facedata
3329 or die "$path: $!";
3330
3331 $facedata = Coro::Storable::thaw $facedata;
3332 3469
3333 $facedata->{version} == 2 3470 $facedata->{version} == 2
3334 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3335 3472
3336 # patch in the exptable 3473 # patch in the exptable
… …
3350 3487
3351 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3352 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3355 3493
3356 cf::cede_to_tick; 3494 cf::cede_to_tick;
3357 } 3495 }
3358 3496
3359 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
… …
3364 3502
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3506 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3508 }
3371 3509
3372 cf::cede_to_tick; 3510 cf::cede_to_tick;
3373 } 3511 }
3374 } 3512 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3531
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3396 } else { 3534 } else {
3397 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3398 } 3536 }
3399 3537
3400 cf::cede_to_tick; 3538 cf::cede_to_tick;
3401 } 3539 }
3402 } 3540 }
3403 3541
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3543
3406 1 3544 1
3407} 3545}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3546
3429register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3431 3549
3432 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3589sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3474} 3592}
3475 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3476sub reload_resources { 3614sub reload_resources {
3477 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3478 3616
3617 reload_exp_table;
3618 reload_materials;
3479 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3480 reload_archetypes; 3621 reload_archetypes;
3481 reload_regions; 3622 reload_regions;
3482 reload_treasures; 3623 reload_treasures;
3483 3624
3484 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3485} 3626}
3486 3627
3487sub reload_config { 3628sub reload_config {
3488 warn "reloading config file...\n"; 3629 trace "reloading config file...\n";
3489 3630
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3631 my $config = load_file "$CONFDIR/config";
3491 or return; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3492 3634
3493 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>;
3495
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3636
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3639
3501 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
… …
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3642 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3643 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3644 };
3506 warn $@ if $@; 3645 warn $@ if $@;
3507 } 3646 }
3508
3509 warn "finished reloading resource files\n";
3510} 3647}
3511 3648
3512sub pidfile() { 3649sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3651 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3528 print $fh $$; 3665 print $fh $$;
3529} 3666}
3530 3667
3531sub main_loop { 3668sub main_loop {
3532 warn "EV::loop starting\n"; 3669 trace "EV::loop starting\n";
3533 if (1) { 3670 if (1) {
3534 EV::loop; 3671 EV::loop;
3535 } 3672 }
3536 warn "EV::loop returned\n"; 3673 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3674 goto &main_loop unless $REALLY_UNLOOP;
3538} 3675}
3539 3676
3540sub main { 3677sub main {
3541 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3542 3679
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552 3684
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3554 3686
3555 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3556 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
… …
3562 }; 3694 };
3563 3695
3564 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3565 3697
3566 cf::sync_job { 3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3567 cf::load_settings; 3705 cf::load_settings;
3568 cf::load_materials;
3569 3706
3570 reload_resources; 3707 reload_resources;
3571 reload_config; 3708 reload_config;
3572 db_init; 3709 db_init;
3573 3710
… …
3585 3722
3586 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3724 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3726
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3591 }; 3728 };
3592 3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3593 main_loop; 3738 goto &main_loop;
3594} 3739}
3595 3740
3596############################################################################# 3741#############################################################################
3597# initialisation and cleanup 3742# initialisation and cleanup
3598 3743
… …
3637 or return; 3782 or return;
3638 3783
3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3640 and return; 3785 and return;
3641 3786
3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3643 3788
3644 1 3789 1
3645} 3790}
3646 3791
3647our $uuid_lock; 3792our $uuid_lock;
… …
3659 or return; 3804 or return;
3660 3805
3661 my $value = uuid_seq uuid_cur; 3806 my $value = uuid_seq uuid_cur;
3662 3807
3663 unless ($value) { 3808 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n"; 3809 info "cowardly refusing to write zero uuid value!\n";
3665 return; 3810 return;
3666 } 3811 }
3667 3812
3668 my $value = uuid_str $value + $uuid_skip; 3813 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0; 3814 $uuid_skip = 0;
… …
3679 or return; 3824 or return;
3680 3825
3681 aio_rename "$uuid~", $uuid 3826 aio_rename "$uuid~", $uuid
3682 and return; 3827 and return;
3683 3828
3684 warn "uuid file written ($value).\n"; 3829 trace "uuid file written ($value).\n";
3685 3830
3686 1 3831 1
3687 3832
3688} 3833}
3689 3834
… …
3695} 3840}
3696 3841
3697sub emergency_save() { 3842sub emergency_save() {
3698 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3699 3844
3700 warn "emergency_perl_save: enter\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3701 3851
3702 cf::sync_job { 3852 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so 3853 cf::write_runtime_sync; # external watchdog should not bark
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707 3854
3708 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3709 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3710 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3711 warn "emergency_perl_save: begin player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3712 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3713 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3714 $pl->valid or next; 3861 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3716 $pl->save; 3863 $pl->save;
3717 } 3864 }
3718 warn "emergency_perl_save: end player save\n"; 3865 info "emergency_perl_save: end player save\n";
3719 3866
3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3720 warn "emergency_perl_save: begin map save\n"; 3869 info "emergency_perl_save: begin map save\n";
3721 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3722 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3723 $map->valid or next; 3872 $map->valid or next;
3724 $map->save; 3873 $map->save;
3725 } 3874 }
3726 warn "emergency_perl_save: end map save\n"; 3875 info "emergency_perl_save: end map save\n";
3727 3876
3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3728 warn "emergency_perl_save: begin database checkpoint\n"; 3879 info "emergency_perl_save: begin database checkpoint\n";
3729 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3730 warn "emergency_perl_save: end database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3731 3882
3732 warn "emergency_perl_save: begin write uuid\n"; 3883 info "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1; 3884 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n"; 3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3735 }; 3905 };
3736 3906
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3742 warn "emergency_perl_save: leave\n"; 3907 info "emergency_perl_save: leave\n";
3743} 3908}
3744 3909
3745sub post_cleanup { 3910sub post_cleanup {
3746 my ($make_core) = @_; 3911 my ($make_core) = @_;
3747 3912
3913 IO::AIO::flush;
3914
3748 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3749 if $make_core; 3916 if $make_core;
3750 3917
3751 my $fh = pidfile; 3918 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$; 3919 unlink $PIDFILE if <$fh> == $$;
3753} 3920}
… …
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) { 3941 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"}; 3942 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 } 3944 }
3778 warn "cleared package $pkg\n";#d#
3779} 3945}
3780 3946
3781sub do_reload_perl() { 3947sub do_reload_perl() {
3782 # can/must only be called in main 3948 # can/must only be called in main
3783 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3784 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3785 return; 3951 return;
3786 } 3952 }
3787 3953
3788 return if $RELOAD++; 3954 return if $RELOAD++;
3789 3955
3790 my $t1 = AE::time; 3956 my $t1 = AE::time;
3791 3957
3792 while ($RELOAD) { 3958 while ($RELOAD) {
3793 warn "reloading..."; 3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3794 3961
3795 warn "entering sync_job"; 3962 trace "perl_reload: entering sync_job";
3796 3963
3797 cf::sync_job { 3964 cf::sync_job {
3798 cf::write_runtime_sync; # external watchdog should not bark
3799 cf::emergency_save; 3965 #cf::emergency_save;
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 3966
3802 warn "syncing database to disk";
3803 BDB::db_env_txn_checkpoint $DB_ENV;
3804
3805 # if anything goes wrong in here, we should simply crash as we already saved
3806
3807 warn "flushing outstanding aio requests";
3808 while (IO::AIO::nreqs || BDB::nreqs) {
3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3810 }
3811
3812 warn "cancelling all extension coros"; 3967 trace "perl_reload: cancelling all extension coros";
3813 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3814 %EXT_CORO = (); 3969 %EXT_CORO = ();
3815 3970
3816 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3817 %COMMAND = (); 3972 %COMMAND = ();
3818 3973
3819 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3820 %EXTCMD = (); 3975 %EXTCMD = ();
3821 %EXTICMD = (); 3976 %EXTICMD = ();
3822 3977
3823 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3824 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3825 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3826 3981
3827 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3828 eval { 3983 eval {
3829 $cb->($pkg); 3984 $cb->($pkg);
3830 1 3985 1
3831 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3832 } 3987 }
3833 3988
3834 warn "... clearing $pkg"; 3989 trace "... clearing $pkg";
3835 clear_package $pkg; 3990 clear_package $pkg;
3836 } 3991 }
3837 3992
3838 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841 3996
3842 warn "... unloading $k"; 3997 trace "... unloading $k";
3843 delete $INC{$k}; 3998 delete $INC{$k};
3844 3999
3845 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3847 4002
… …
3850 } 4005 }
3851 4006
3852 clear_package $k; 4007 clear_package $k;
3853 } 4008 }
3854 4009
3855 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3856 clear_package "safe::$_" 4011 clear_package "safe::$_"
3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3858 4013
3859 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3860 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3862 4017
3863 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3864 # and global variables created in xs 4019 # and global variables created in xs
3865 #clear_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3866 4021
3867 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3868 4023
3869 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3870 require cf; 4025 require cf;
3871 cf::_connect_to_perl_1; 4026 cf::_connect_to_perl_1;
3872 4027
3873 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3874 cf::reload_config; 4029 cf::reload_config;
3875 4030
3876 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3877 cf::load_extensions; 4032 cf::load_extensions;
3878 4033
3879 if ($REATTACH_ON_RELOAD) { 4034 if ($REATTACH_ON_RELOAD) {
3880 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3881 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3882 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3883 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3884 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3885 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
3886 } 4041 }
3887 4042
3888 warn "running post_init jobs"; 4043 cf::_post_init 1;
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890 4044
3891 warn "leaving sync_job"; 4045 trace "perl_reload: leaving sync_job";
3892 4046
3893 1 4047 1
3894 } or do { 4048 } or do {
3895 warn $@; 4049 error $@;
3896 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
3897 }; 4051 };
3898 4052
3899 warn "reloaded";
3900 --$RELOAD; 4053 --$RELOAD;
3901 } 4054 }
3902 4055
3903 $t1 = AE::time - $t1; 4056 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n"; 4057 info "perl_reload: completed in ${t1}s\n";
3905}; 4058};
3906 4059
3907our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3908 4061
3909sub reload_perl() { 4062sub reload_perl() {
… …
3930 reload_perl; 4083 reload_perl;
3931 }; 4084 };
3932 } 4085 }
3933}; 4086};
3934 4087
3935unshift @INC, $LIBDIR; 4088#############################################################################
3936 4089
3937my $bug_warning = 0; 4090my $bug_warning = 0;
3938 4091
3939our @WAIT_FOR_TICK;
3940our @WAIT_FOR_TICK_BEGIN;
3941
3942sub wait_for_tick { 4092sub wait_for_tick() {
3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3944 4094
3945 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3946 push @WAIT_FOR_TICK, $signal;
3947 $signal->wait;
3948} 4096}
3949 4097
3950sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3952 4100
3953 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3954 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3955 $signal->wait; 4103 $signal->wait;
3956} 4104}
… …
3960 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3961 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3962 return; 4110 return;
3963 } 4111 }
3964 4112
3965 cf::server_tick; # one server iteration 4113 cf::one_tick; # one server iteration
3966 4114
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3968 4116
3969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3971 Coro::async_pool { 4119 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3973 write_runtime_sync 4121 write_runtime_sync
3974 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3975 }; 4123 };
3976 } 4124 }
3977 4125
3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3979 $sig->send; 4127 $sig->send;
3980 } 4128 }
3981 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3982 $sig->send;
3983 }
3984 4130
3985 $LOAD = ($NOW - $TICK_START) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3987 4133
3988 if (0) { 4134 if (0) {
3989 if ($NEXT_TICK) { 4135 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK; 4136 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d# 4138 debug "jitter $JITTER\n";#d#
3993 } 4139 }
3994 } 4140 }
3995} 4141}
3996 4142
3997{ 4143{
… …
4042 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
4043 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
4044 undef $AnyEvent::AIO::WATCHER; 4190 undef $AnyEvent::AIO::WATCHER;
4045} 4191}
4046 4192
4047my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
4048 4195
4049sub _log_backtrace { 4196sub _log_backtrace {
4050 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
4051 4198
4052 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
4053 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4054 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
4055 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
4056 ++$_log_backtrace; 4207 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg; 4208 my $perl_bt = Carp::longmess $msg;
4058 async { 4209 async {
4059 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
4060 4211
… …
4080 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
4081 --$_log_backtrace; 4232 --$_log_backtrace;
4082 }; 4233 };
4083 } else { 4234 } else {
4084 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
4085 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4086 } 4237 }
4087} 4238}
4088 4239
4089# load additional modules 4240# load additional modules
4090require "cf/$_.pm" for @EXTRA_MODULES; 4241require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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