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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

… …
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;
… …
230from wherever your confdir points to. 235from wherever your confdir points to.
231 236
232=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
233 238
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
235returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
237 247
238=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
239 249
240This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
249 259
250=back 260=back
251 261
252=cut 262=cut
253 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
254$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 271 my $msg = join "", @_;
256 272
257 $msg .= "\n" 273 $msg .= "\n"
258 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
259 275
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 277
262 LOG llevError, $msg; 278 LOG llevWarn, $msg;
263}; 279};
264 280
265$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
267 283
268 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
269 285
270 if (in_main) {#d# 286 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 288 return;#d#
273 }#d# 289 }#d#
274 290
275 # kill coroutine otherwise 291 # kill coroutine otherwise
276 Coro::terminate 292 Coro::terminate
… …
298} 314}
299 315
300$EV::DIED = sub { 316$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
302}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
303 324
304############################################################################# 325#############################################################################
305 326
306=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
307 328
… …
328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329 $d 350 $d
330 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
331} 352}
332 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
333=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
334 369
335Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
336 371
337=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 379
345sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
347 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
348=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
349 415
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
352 418
353The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 420is a reload or not.
355 421
356=cut 422=cut
357 423
358sub post_init(&) { 424sub post_init(&) {
359 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
360} 443}
361 444
362=item cf::lock_wait $string 445=item cf::lock_wait $string
363 446
364Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
418} 501}
419 502
420=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
421 504
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
423This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
424of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
425 512
426The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
427used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
428 515
429Useful for short background jobs. 516Useful for short background jobs.
… …
509=cut 596=cut
510 597
511sub sync_job(&) { 598sub sync_job(&) {
512 my ($job) = @_; 599 my ($job) = @_;
513 600
514 if ($Coro::current == $Coro::main) { 601 if (in_main) {
515 my $time = AE::time; 602 my $time = AE::time;
516 603
517 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
519 606
520 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
521 608
522 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
523 610
524 my $busy = 1; 611 my $busy = 1;
525 my @res; 612 my @res;
526 613
527 (async { 614 (async {
528 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 616 @res = eval { $job->() };
530 warn $@ if $@; 617 error $@ if $@;
531 undef $busy; 618 undef $busy;
532 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
533 620
534 while ($busy) { 621 while ($busy) {
535 if (Coro::nready) { 622 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
570 657
571 $coro 658 $coro
572} 659}
573 660
574=item fork_call { }, $args 661=item fork_call { }, @args
575 662
576Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 666never block itself or use any form of event handling.
580 667
581=cut 668=cut
582 669
670sub post_fork {
671 reset_signals;
672}
673
583sub fork_call(&@) { 674sub fork_call(&@) {
584 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
585 676
586 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
589 680
590 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
591 reset_signals; 682 cf::post_fork;
592 &$cb 683 &$cb
593 }, @args; 684 } @args;
594 685
595 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
596} 687}
597 688
598sub objinfo { 689sub objinfo {
… …
648within each server. 739within each server.
649 740
650=cut 741=cut
651 742
652sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
653 my ($name) = @_; 747 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
655 749
656 eval { 750 eval {
657 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
667} 761}
668 762
669our $DB; 763our $DB;
670 764
671sub db_init { 765sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
674 };
675} 767}
676 768
677sub db_get($$) { 769sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
679 771
680 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
681 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
682 776
683 $! ? () 777 $! ? ()
684 : $data 778 : $data
685 }
686} 779}
687 780
688sub db_put($$$) { 781sub db_put($$$) {
689 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 811
719 my @data; 812 my @data;
720 my $md5; 813 my $md5;
721 814
722 for (0 .. $#$src) { 815 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 817 }
726 818
727 # if processing is expensive, check 819 # if processing is expensive, check
728 # checksum first 820 # checksum first
729 if (1) { 821 if (1) {
… …
746 838
747 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 840 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
750 842
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 844
753 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
756 848
… …
766 858
767=cut 859=cut
768 860
769sub datalog($@) { 861sub datalog($@) {
770 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 864}
773 865
774=back 866=back
775 867
776=cut 868=cut
… …
971 1063
972 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1066
975 } elsif (ref $type) { 1067 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
977 1069
978 } else { 1070 } else {
979 shift @arg; 1071 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
981 } 1073 }
982 } 1074 }
983} 1075}
984 1076
985sub _object_attach { 1077sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
996 } 1088 }
997 1089
998 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
999 } else { 1091 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1093 }
1002 1094
1003 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
1004} 1096}
1005 1097
… …
1064 1156
1065 for (@$callbacks) { 1157 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1067 1159
1068 if ($@) { 1160 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1162 override;
1072 } 1163 }
1073 1164
1074 return 1 if $override; 1165 return 1 if $override;
1075 } 1166 }
… …
1154 for (@$attach) { 1245 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1157 } 1248 }
1158 } else { 1249 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1251 }
1161 } 1252 }
1162} 1253}
1163 1254
1164cf::attachable->attach ( 1255cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1192 1283
1193 sync_job { 1284 sync_job {
1194 if (length $$rdata) { 1285 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1198 1290
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1225 1317
1226 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1320 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1230 } 1322 }
1231 } else { 1323 } else {
1232 aio_unlink $filename; 1324 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1234 } 1326 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1351 $av = $st->{objs};
1260 } 1352 }
1261 1353
1262 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1265 1358
1266 ($data, $av) 1359 ($data, $av)
1267} 1360}
1268 1361
1269=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1361 1454
1362 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1456 if $reply;
1364 1457
1365 } else { 1458 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1460 }
1368 1461
1369 cf::override; 1462 cf::override;
1370 }, 1463 },
1371); 1464);
… …
1382 1475
1383 $grp 1476 $grp
1384} 1477}
1385 1478
1386sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1387 cf::sync_job { 1482 cf::sync_job {
1388 my %todo; 1483 my %todo;
1389 1484
1390 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1486 next unless -r $path;
… …
1409 1504
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1507
1413 $ext{source} = 1508 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1416 . $source 1511 . $source
1417 . "\n};\n1"; 1512 . "\n};\n1";
1418 1513
1419 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1527 next ext
1433 unless exists $done{$_}; 1528 unless exists $done{$_};
1434 } 1529 }
1435 1530
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1532
1438 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1439 1534
1440 if (length $@) { 1535 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1442 1537
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1445 1540
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1543 } else {
1449 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1451 $progress = 1; 1546 $progress = 1;
1452 1547
1453 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1549 unless $active;
1455 } 1550 }
1456 } 1551 }
1457 1552
1458 unless ($progress) { 1553 unless ($progress) {
… …
1627 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1628 1723
1629 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1726
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1728 $pl->deactivate;
1729
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1637 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1638 1735
1639 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1807sub generate_random_map { 1904sub generate_random_map {
1808 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1809 1906
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 1908
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 1910}
1827 1911
1828=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1829 1913
1830Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1835 1919
1836sub register { 1920sub register {
1837 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1922 my $pkg = caller;
1839 1923
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1925
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1927}
1845 1928
1846# also paths starting with '/' 1929# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1931
1849sub thawer_merge { 1932sub thawer_merge {
1850 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1851 1934
1852 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1857} 1940}
1858 1941
1859sub normalise { 1942sub normalise {
1860 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1861 1944
1862 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1863 1946
1864 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1865 1948
1866 # map plan: 1949 # map plan:
1867 # 1950 #
… …
1882 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 1966 $path = "$base/$path";
1884 } 1967 }
1885 1968
1886 for ($path) { 1969 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1890 } 1972 }
1891 1973
1892 $path 1974 $path
… …
1906 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1907 return $self; 1989 return $self;
1908 } 1990 }
1909 } 1991 }
1910 1992
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1994 ()
1913} 1995}
1914 1996
1915sub init { 1997sub init {
1916 my ($self) = @_; 1998 my ($self) = @_;
… …
2038} 2120}
2039 2121
2040sub find; 2122sub find;
2041sub find { 2123sub find {
2042 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
2043 2127
2044 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
2045 2129
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2132 2216
2133 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2218 }
2135 2219
2136 $self->post_load; 2220 $self->post_load;
2221
2222 1
2137} 2223}
2138 2224
2139# customize the map for a given player, i.e. 2225# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2226# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2227# maps to change the path to ~playername/mappath
… …
2162 or next; 2248 or next;
2163 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2164 or next; 2250 or next;
2165 $neigh->load; 2251 $neigh->load;
2166 2252
2253 # now find the diagonal neighbours
2167 push @neigh, 2254 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2257 }
2171 2258
… …
2178} 2265}
2179 2266
2180sub find_sync { 2267sub find_sync {
2181 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2182 2269
2183 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2184} 2274}
2185 2275
2186sub do_load_sync { 2276sub do_load_sync {
2187 my ($map) = @_; 2277 my ($map) = @_;
2188 2278
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2191 2281
2192 cf::sync_job { $map->load }; 2282 $map->load;
2193} 2283}
2194 2284
2195our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2197 2287
… …
2309 2399
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2401
2312 return if $self->players; 2402 return if $self->players;
2313 2403
2314 warn "resetting map ", $self->path, "\n"; 2404 cf::trace "resetting map ", $self->path, "\n";
2315 2405
2316 $self->in_memory (cf::MAP_SWAPPED); 2406 $self->in_memory (cf::MAP_SWAPPED);
2317 2407
2318 # need to save uniques path 2408 # need to save uniques path
2319 unless ($self->{deny_save}) { 2409 unless ($self->{deny_save}) {
… …
2343 2433
2344 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2345 2435
2346 $self->unlink_save; 2436 $self->unlink_save;
2347 2437
2348 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2443
… …
2583 2673
2584Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2585 2675
2586The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2589map. 2679map.
2590 2680
2591Will never block. 2681Will never block.
2592 2682
2593=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2615 my ($self) = @_; 2705 my ($self) = @_;
2616 2706
2617 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2618 2708
2709 ++$self->{_link_recursion};
2710
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2712
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2623 2715
… …
2654 $map->load_neighbours; 2746 $map->load_neighbours;
2655 2747
2656 return unless $self->contr->active; 2748 return unless $self->contr->active;
2657 2749
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2660 2752 # entering was successful
2753 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2754 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2755 $self->activate_recursive;
2663} 2756 }
2664 2757
2758}
2759
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2761
2667Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
… …
2677 2772
2678our $GOTOGEN; 2773our $GOTOGEN;
2679 2774
2680sub cf::object::player::goto { 2775sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2682 2783
2683 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2786
2686 $self->enter_link; 2787 $self->enter_link;
… …
2710 my $map = eval { 2811 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2712 2813
2713 if ($map) { 2814 if ($map) {
2714 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2817 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2819 }
2719 2820
2720 $map 2821 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2731 } 2832 }
2732 2833
2733 $done->() if $done; 2834 $done->($self) if $done;
2734 })->prio (1); 2835 })->prio (1);
2735} 2836}
2736 2837
2737=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2738 2839
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2936
2836 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2938 $self->leave_link;
2838 } 2939 }
2839 })->prio (1); 2940 })->prio (1);
2840} 2941}
2841 2942
… …
3154 3255
3155 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3257 if $reply;
3157 3258
3158 } else { 3259 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3261 }
3161 3262
3162 cf::override; 3263 cf::override;
3163 }, 3264 },
3164); 3265);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3249) { 3350) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3353 for @funs;
3254} 3354}
3255 3355
… …
3294 local @cf::_safe_eval_args = values %vars; 3394 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3395 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3396 }
3297 3397
3298 if ($@) { 3398 if ($@) {
3299 warn "$@"; 3399 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3302 } 3402 }
3303 3403
3304 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3305} 3405}
3306 3406
… …
3340 # for this (global event?) 3440 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3442
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3444
3345 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3346 3446
3347 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3448
3353 $facedata->{version} == 2 3449 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3355 3451
3356 # patch in the exptable 3452 # patch in the exptable
… …
3370 3466
3371 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3375 3472
3376 cf::cede_to_tick; 3473 cf::cede_to_tick;
3377 } 3474 }
3378 3475
3379 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3384 3481
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3485 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3487 }
3391 3488
3392 cf::cede_to_tick; 3489 cf::cede_to_tick;
3393 } 3490 }
3394 } 3491 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3510
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3416 } else { 3513 } else {
3417 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3418 } 3515 }
3419 3516
3420 cf::cede_to_tick; 3517 cf::cede_to_tick;
3421 } 3518 }
3422 } 3519 }
3423 3520
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3522
3426 1 3523 1
3427} 3524}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3525
3449register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3451 3528
3452 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3568sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3494} 3571}
3495 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3496sub reload_resources { 3593sub reload_resources {
3497 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3498 3595
3596 reload_exp_table;
3597 reload_materials;
3499 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3500 reload_archetypes; 3600 reload_archetypes;
3501 reload_regions; 3601 reload_regions;
3502 reload_treasures; 3602 reload_treasures;
3503 3603
3504 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3505} 3605}
3506 3606
3507sub reload_config { 3607sub reload_config {
3508 warn "reloading config file...\n"; 3608 trace "reloading config file...\n";
3509 3609
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3610 my $config = load_file "$CONFDIR/config";
3511 or return; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3512 3613
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3615
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3618
3521 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3621 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3622 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3623 };
3526 warn $@ if $@; 3624 warn $@ if $@;
3527 } 3625 }
3528
3529 warn "finished reloading resource files\n";
3530} 3626}
3531 3627
3532sub pidfile() { 3628sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3630 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3548 print $fh $$; 3644 print $fh $$;
3549} 3645}
3550 3646
3551sub main_loop { 3647sub main_loop {
3552 warn "EV::loop starting\n"; 3648 trace "EV::loop starting\n";
3553 if (1) { 3649 if (1) {
3554 EV::loop; 3650 EV::loop;
3555 } 3651 }
3556 warn "EV::loop returned\n"; 3652 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3653 goto &main_loop unless $REALLY_UNLOOP;
3558} 3654}
3559 3655
3560sub main { 3656sub main {
3561 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3562 3658
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3663
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3665
… …
3577 }; 3673 };
3578 3674
3579 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3580 3676
3581 cf::sync_job { 3677 cf::sync_job {
3582 cf::init_experience; 3678 cf::incloader::init ();
3679
3583 cf::init_anim; 3680 cf::init_anim;
3584 cf::init_attackmess; 3681 cf::init_attackmess;
3585 cf::init_dynamic; 3682 cf::init_dynamic;
3586 3683
3587 cf::load_settings; 3684 cf::load_settings;
3588 cf::load_materials;
3589 3685
3590 reload_resources; 3686 reload_resources;
3591 reload_config; 3687 reload_config;
3592 db_init; 3688 db_init;
3593 3689
… …
3605 3701
3606 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3703 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3705
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3611 }; 3707 };
3612 3708
3613 cf::object::thawer::errors_are_fatal 0; 3709 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3710 info "parse errors in files are no longer fatal from this point on.\n";
3615 3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3616 main_loop; 3717 goto &main_loop;
3617} 3718}
3618 3719
3619############################################################################# 3720#############################################################################
3620# initialisation and cleanup 3721# initialisation and cleanup
3621 3722
… …
3660 or return; 3761 or return;
3661 3762
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3764 and return;
3664 3765
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3767
3667 1 3768 1
3668} 3769}
3669 3770
3670our $uuid_lock; 3771our $uuid_lock;
… …
3682 or return; 3783 or return;
3683 3784
3684 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3685 3786
3686 unless ($value) { 3787 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3789 return;
3689 } 3790 }
3690 3791
3691 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3793 $uuid_skip = 0;
… …
3702 or return; 3803 or return;
3703 3804
3704 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3705 and return; 3806 and return;
3706 3807
3707 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3708 3809
3709 1 3810 1
3710 3811
3711} 3812}
3712 3813
… …
3718} 3819}
3719 3820
3720sub emergency_save() { 3821sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3722 3823
3723 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3724 3830
3725 cf::sync_job { 3831 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3833
3731 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3840 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3842 $pl->save;
3740 } 3843 }
3741 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3742 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3743 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3851 $map->valid or next;
3747 $map->save; 3852 $map->save;
3748 } 3853 }
3749 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3750 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3754 3861
3755 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3863 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3884 };
3759 3885
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3766} 3887}
3767 3888
3768sub post_cleanup { 3889sub post_cleanup {
3769 my ($make_core) = @_; 3890 my ($make_core) = @_;
3770 3891
3892 IO::AIO::flush;
3893
3771 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3895 if $make_core;
3773 3896
3774 my $fh = pidfile; 3897 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3776} 3899}
… …
3800 } 3923 }
3801} 3924}
3802 3925
3803sub do_reload_perl() { 3926sub do_reload_perl() {
3804 # can/must only be called in main 3927 # can/must only be called in main
3805 if (in_main) { 3928 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3807 return; 3930 return;
3808 } 3931 }
3809 3932
3810 return if $RELOAD++; 3933 return if $RELOAD++;
3811 3934
3812 my $t1 = AE::time; 3935 my $t1 = AE::time;
3813 3936
3814 while ($RELOAD) { 3937 while ($RELOAD) {
3815 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3816 3940
3817 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3818 3942
3819 cf::sync_job { 3943 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3944 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3945
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3948 %EXT_CORO = ();
3837 3949
3838 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3839 %COMMAND = (); 3951 %COMMAND = ();
3840 3952
3841 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 3954 %EXTCMD = ();
3843 %EXTICMD = (); 3955 %EXTICMD = ();
3844 3956
3845 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3848 3960
3849 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3962 eval {
3851 $cb->($pkg); 3963 $cb->($pkg);
3852 1 3964 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3854 } 3966 }
3855 3967
3856 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3857 clear_package $pkg; 3969 clear_package $pkg;
3858 } 3970 }
3859 3971
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3975
3864 warn "... unloading $k"; 3976 trace "... unloading $k";
3865 delete $INC{$k}; 3977 delete $INC{$k};
3866 3978
3867 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3869 3981
… …
3872 } 3984 }
3873 3985
3874 clear_package $k; 3986 clear_package $k;
3875 } 3987 }
3876 3988
3877 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3990 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 3992
3881 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3996
3885 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3998 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3888 4000
3889 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3890 4002
3891 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3892 require cf; 4004 require cf;
3893 cf::_connect_to_perl_1; 4005 cf::_connect_to_perl_1;
3894 4006
3895 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4008 cf::reload_config;
3897 4009
3898 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4011 cf::load_extensions;
3900 4012
3901 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3908 } 4020 }
3909 4021
3910 warn "running post_init jobs"; 4022 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4023
3913 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3914 4025
3915 1 4026 1
3916 } or do { 4027 } or do {
3917 warn $@; 4028 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4030 };
3920 4031
3921 warn "reloaded";
3922 --$RELOAD; 4032 --$RELOAD;
3923 } 4033 }
3924 4034
3925 $t1 = AE::time - $t1; 4035 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3927}; 4037};
3928 4038
3929our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3930 4040
3931sub reload_perl() { 4041sub reload_perl() {
… …
3952 reload_perl; 4062 reload_perl;
3953 }; 4063 };
3954 } 4064 }
3955}; 4065};
3956 4066
3957unshift @INC, $LIBDIR; 4067#############################################################################
3958 4068
3959my $bug_warning = 0; 4069my $bug_warning = 0;
3960 4070
3961our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3963 4073
3964sub wait_for_tick { 4074sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3966 4076
3967 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait; 4079 $signal->wait;
3970} 4080}
3971 4081
3972sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3974 4084
3975 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4087 $signal->wait;
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4103 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4105 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3997 }; 4107 };
3998 } 4108 }
3999 4109
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4111 $sig->send;
… …
4009 4119
4010 if (0) { 4120 if (0) {
4011 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
4015 } 4125 }
4016 } 4126 }
4017} 4127}
4018 4128
4019{ 4129{
… …
4064 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
4067} 4177}
4068 4178
4069my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
4070 4181
4071sub _log_backtrace { 4182sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
4073 4184
4074 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
4075 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4193 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
4080 async { 4195 async {
4081 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
4082 4197
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4218 --$_log_backtrace;
4104 }; 4219 };
4105 } else { 4220 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4223 }
4109} 4224}
4110 4225
4111# load additional modules 4226# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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