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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 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
… …
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 360
345sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
347 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
348=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
349 377
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
352 380
353The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 382is a reload or not.
355 383
356=cut 384=cut
357 385
358sub post_init(&) { 386sub post_init(&) {
359 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
360} 405}
361 406
362=item cf::lock_wait $string 407=item cf::lock_wait $string
363 408
364Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
509=cut 554=cut
510 555
511sub sync_job(&) { 556sub sync_job(&) {
512 my ($job) = @_; 557 my ($job) = @_;
513 558
514 if ($Coro::current == $Coro::main) { 559 if (in_main) {
515 my $time = AE::time; 560 my $time = AE::time;
516 561
517 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
519 564
520 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
521 566
522 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
523 568
524 my $busy = 1; 569 my $busy = 1;
525 my @res; 570 my @res;
526 571
527 (async { 572 (async {
528 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 574 @res = eval { $job->() };
530 warn $@ if $@; 575 error $@ if $@;
531 undef $busy; 576 undef $busy;
532 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
533 578
534 while ($busy) { 579 while ($busy) {
535 if (Coro::nready) { 580 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
570 615
571 $coro 616 $coro
572} 617}
573 618
574=item fork_call { }, $args 619=item fork_call { }, @args
575 620
576Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 624never block itself or use any form of event handling.
580 625
581=cut 626=cut
582 627
628sub post_fork {
629 reset_signals;
630}
631
583sub fork_call(&@) { 632sub fork_call(&@) {
584 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
585 634
586 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
589 638
590 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
591 reset_signals; 640 cf::post_fork;
592 &$cb 641 &$cb
593 }, @args; 642 } @args;
594 643
595 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
596} 645}
597 646
598sub objinfo { 647sub objinfo {
… …
648within each server. 697within each server.
649 698
650=cut 699=cut
651 700
652sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
653 my ($name) = @_; 705 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
655 707
656 eval { 708 eval {
657 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
667} 719}
668 720
669our $DB; 721our $DB;
670 722
671sub db_init { 723sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
674 };
675} 725}
676 726
677sub db_get($$) { 727sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
679 729
680 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
681 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
682 734
683 $! ? () 735 $! ? ()
684 : $data 736 : $data
685 }
686} 737}
687 738
688sub db_put($$$) { 739sub db_put($$$) {
689 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 797
747 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 799 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
750 801
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 803
753 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
756 807
… …
766 817
767=cut 818=cut
768 819
769sub datalog($@) { 820sub datalog($@) {
770 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 823}
773 824
774=back 825=back
775 826
776=cut 827=cut
… …
971 1022
972 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1025
975 } elsif (ref $type) { 1026 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
977 1028
978 } else { 1029 } else {
979 shift @arg; 1030 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
981 } 1032 }
982 } 1033 }
983} 1034}
984 1035
985sub _object_attach { 1036sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
996 } 1047 }
997 1048
998 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
999 } else { 1050 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1052 }
1002 1053
1003 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
1004} 1055}
1005 1056
… …
1064 1115
1065 for (@$callbacks) { 1116 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1067 1118
1068 if ($@) { 1119 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1121 override;
1072 } 1122 }
1073 1123
1074 return 1 if $override; 1124 return 1 if $override;
1075 } 1125 }
… …
1154 for (@$attach) { 1204 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1157 } 1207 }
1158 } else { 1208 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1210 }
1161 } 1211 }
1162} 1212}
1163 1213
1164cf::attachable->attach ( 1214cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1192 1242
1193 sync_job { 1243 sync_job {
1194 if (length $$rdata) { 1244 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1198 1249
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1253 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1225 1276
1226 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1279 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1230 } 1281 }
1231 } else { 1282 } else {
1232 aio_unlink $filename; 1283 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1234 } 1285 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1310 $av = $st->{objs};
1260 } 1311 }
1261 1312
1262 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1265 1317
1266 ($data, $av) 1318 ($data, $av)
1267} 1319}
1268 1320
1269=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
… …
1361 1413
1362 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1415 if $reply;
1364 1416
1365 } else { 1417 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1419 }
1368 1420
1369 cf::override; 1421 cf::override;
1370 }, 1422 },
1371); 1423);
… …
1382 1434
1383 $grp 1435 $grp
1384} 1436}
1385 1437
1386sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1387 cf::sync_job { 1441 cf::sync_job {
1388 my %todo; 1442 my %todo;
1389 1443
1390 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1445 next unless -r $path;
… …
1409 1463
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1466
1413 $ext{source} = 1467 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1416 . $source 1470 . $source
1417 . "\n};\n1"; 1471 . "\n};\n1";
1418 1472
1419 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1486 next ext
1433 unless exists $done{$_}; 1487 unless exists $done{$_};
1434 } 1488 }
1435 1489
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1491
1438 my $active = eval $v->{source}; 1492 my $active = eval $v->{source};
1439 1493
1440 if (length $@) { 1494 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1495 error "$v->{path}: $@\n";
1442 1496
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1498 if exists $v->{meta}{mandatory};
1445 1499
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1502 } else {
1449 $done{$k} = delete $todo{$k}; 1503 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1504 push @EXTS, $v->{pkg};
1451 $progress = 1; 1505 $progress = 1;
1452 1506
1453 warn "$v->{base}: extension inactive.\n" 1507 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1508 unless $active;
1455 } 1509 }
1456 } 1510 }
1457 1511
1458 unless ($progress) { 1512 unless ($progress) {
… …
1627 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1628 1682
1629 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1685
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1687 $pl->deactivate;
1688
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1637 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1638 1694
1639 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1695 \@logins 1751 \@logins
1696} 1752}
1697 1753
1698=item $player->maps 1754=item $player->maps
1699 1755
1756=item cf::player::maps $login
1757
1700Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1701player. May block. 1759player. May block.
1702 1760
1703=cut 1761=cut
1704 1762
… …
1766=cut 1824=cut
1767 1825
1768sub find_by_path($) { 1826sub find_by_path($) {
1769 my ($path) = @_; 1827 my ($path) = @_;
1770 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1771 my ($match, $specificity); 1831 my ($match, $specificity);
1772 1832
1773 for my $region (list) { 1833 for my $region (list) {
1774 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1775 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
… …
1803sub generate_random_map { 1863sub generate_random_map {
1804 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1805 1865
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807 1867
1808 # mit "rum" bekleckern, nicht
1809 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1813 $rmp->{exit_on_final_map},
1814 $rmp->{xsize}, $rmp->{ysize},
1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1818 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1819 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1820 (cf::region::find $rmp->{region}), $rmp->{custom}
1821 )
1822} 1869}
1823 1870
1824=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1825 1872
1826Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1831 1878
1832sub register { 1879sub register {
1833 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1834 my $pkg = caller; 1881 my $pkg = caller;
1835 1882
1836 no strict;
1837 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1838 1884
1839 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840} 1886}
1841 1887
1842# also paths starting with '/' 1888# also paths starting with '/'
1843$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844 1890
1845sub thawer_merge { 1891sub thawer_merge {
1846 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1847 1893
1848 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
… …
1853} 1899}
1854 1900
1855sub normalise { 1901sub normalise {
1856 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1857 1903
1858 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1859 1905
1860 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1861 1907
1862 # map plan: 1908 # map plan:
1863 # 1909 #
… …
1878 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1879 $path = "$base/$path"; 1925 $path = "$base/$path";
1880 } 1926 }
1881 1927
1882 for ($path) { 1928 for ($path) {
1883 redo if s{//}{/};
1884 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1885 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1886 } 1931 }
1887 1932
1888 $path 1933 $path
… …
1902 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1903 return $self; 1948 return $self;
1904 } 1949 }
1905 } 1950 }
1906 1951
1907 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1908 () 1953 ()
1909} 1954}
1910 1955
1911sub init { 1956sub init {
1912 my ($self) = @_; 1957 my ($self) = @_;
… …
2034} 2079}
2035 2080
2036sub find; 2081sub find;
2037sub find { 2082sub find {
2038 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
2039 2086
2040 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2041 2088
2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2043 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2128 2175
2129 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2177 }
2131 2178
2132 $self->post_load; 2179 $self->post_load;
2180
2181 1
2133} 2182}
2134 2183
2135# customize the map for a given player, i.e. 2184# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player 2185# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath 2186# maps to change the path to ~playername/mappath
… …
2158 or next; 2207 or next;
2159 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2160 or next; 2209 or next;
2161 $neigh->load; 2210 $neigh->load;
2162 2211
2212 # now find the diagonal neighbours
2163 push @neigh, 2213 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2216 }
2167 2217
… …
2174} 2224}
2175 2225
2176sub find_sync { 2226sub find_sync {
2177 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2178 2228
2179 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2180} 2233}
2181 2234
2182sub do_load_sync { 2235sub do_load_sync {
2183 my ($map) = @_; 2236 my ($map) = @_;
2184 2237
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2187 2240
2188 cf::sync_job { $map->load }; 2241 $map->load;
2189} 2242}
2190 2243
2191our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2193 2246
… …
2305 2358
2306 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2307 2360
2308 return if $self->players; 2361 return if $self->players;
2309 2362
2310 warn "resetting map ", $self->path, "\n"; 2363 cf::trace "resetting map ", $self->path, "\n";
2311 2364
2312 $self->in_memory (cf::MAP_SWAPPED); 2365 $self->in_memory (cf::MAP_SWAPPED);
2313 2366
2314 # need to save uniques path 2367 # need to save uniques path
2315 unless ($self->{deny_save}) { 2368 unless ($self->{deny_save}) {
… …
2339 2392
2340 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2341 2394
2342 $self->unlink_save; 2395 $self->unlink_save;
2343 2396
2344 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2345 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2346 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2347 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2348 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349 2402
… …
2579 2632
2580Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2581 2634
2582The player should be reasonably safe there for short amounts of time (e.g. 2635The player should be reasonably safe there for short amounts of time (e.g.
2583for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link 2637though, as the player cannot control the character while it is on the link
2585map. 2638map.
2586 2639
2587Will never block. 2640Will never block.
2588 2641
2589=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
… …
2610sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2611 my ($self) = @_; 2664 my ($self) = @_;
2612 2665
2613 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2614 2667
2668 ++$self->{_link_recursion};
2669
2615 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2616 2671
2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2619 2674
… …
2650 $map->load_neighbours; 2705 $map->load_neighbours;
2651 2706
2652 return unless $self->contr->active; 2707 return unless $self->contr->active;
2653 2708
2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2656 2711 # entering was successful
2712 delete $self->{_link_recursion};
2657 # only activate afterwards, to support waiting in hooks 2713 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive; 2714 $self->activate_recursive;
2659} 2715 }
2660 2716
2717}
2718
2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2662 2720
2663Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2664her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2665that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2666the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
… …
2673 2731
2674our $GOTOGEN; 2732our $GOTOGEN;
2675 2733
2676sub cf::object::player::goto { 2734sub cf::object::player::goto {
2677 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2678 2742
2679 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2680 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681 2745
2682 $self->enter_link; 2746 $self->enter_link;
… …
2706 my $map = eval { 2770 my $map = eval {
2707 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2708 2772
2709 if ($map) { 2773 if ($map) {
2710 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2711 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2712 } else { 2776 } else {
2713 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2714 } 2778 }
2715 2779
2716 $map 2780 $map
… …
2724 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2725 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2726 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2727 } 2791 }
2728 2792
2729 $done->() if $done; 2793 $done->($self) if $done;
2730 })->prio (1); 2794 })->prio (1);
2731} 2795}
2732 2796
2733=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2734 2798
… …
2827 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2828 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2829 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2830 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2831 2895
2832 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2833 $self->leave_link; 2897 $self->leave_link;
2834 } 2898 }
2835 })->prio (1); 2899 })->prio (1);
2836} 2900}
2837 2901
… …
3150 3214
3151 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3152 if $reply; 3216 if $reply;
3153 3217
3154 } else { 3218 } else {
3155 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3156 } 3220 }
3157 3221
3158 cf::override; 3222 cf::override;
3159 }, 3223 },
3160); 3224);
… …
3241 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3242 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3243 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3244 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3245) { 3309) {
3246 no strict 'refs';
3247 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249 for @funs; 3312 for @funs;
3250} 3313}
3251 3314
… …
3290 local @cf::_safe_eval_args = values %vars; 3353 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval; 3354 @res = wantarray ? eval eval : scalar eval $eval;
3292 } 3355 }
3293 3356
3294 if ($@) { 3357 if ($@) {
3295 warn "$@"; 3358 warn "$@",
3296 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3297 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3298 } 3361 }
3299 3362
3300 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3301} 3364}
3302 3365
… …
3336 # for this (global event?) 3399 # for this (global event?)
3337 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3338 3401
3339 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340 3403
3341 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3342 3405
3343 my $facedata;
3344 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3345 or die "$path: $!"; 3407 or die "$path: $!";
3346 3408
3347 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3348 3410
3349 $facedata->{version} == 2 3411 $facedata->{version} == 2
… …
3366 3428
3367 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3368 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3371 3434
3372 cf::cede_to_tick; 3435 cf::cede_to_tick;
3373 } 3436 }
3374 3437
3375 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3380 3443
3381 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3382 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384 } else { 3447 } else {
3385 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3386 } 3449 }
3387 3450
3388 cf::cede_to_tick; 3451 cf::cede_to_tick;
3389 } 3452 }
3390 } 3453 }
… …
3408 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409 3472
3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3412 } else { 3475 } else {
3413 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3414 } 3477 }
3415 3478
3416 cf::cede_to_tick; 3479 cf::cede_to_tick;
3417 } 3480 }
3418 } 3481 }
3419 3482
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421 3484
3422 1 3485 1
3423} 3486}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
3444 3487
3445register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3446 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3447 3490
3448 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
… …
3487sub reload_treasures { 3530sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3490} 3533}
3491 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3492sub reload_resources { 3558sub reload_resources {
3493 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3494 3560
3561 reload_exp_table;
3562 reload_materials;
3495 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3496 reload_archetypes; 3565 reload_archetypes;
3497 reload_regions; 3566 reload_regions;
3498 reload_treasures; 3567 reload_treasures;
3499 3568
3500 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3501} 3570}
3502 3571
3503sub reload_config { 3572sub reload_config {
3504 warn "reloading config file...\n"; 3573 trace "reloading config file...\n";
3505 3574
3506 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3507 or return; 3576 or die "$CONFDIR/config: $!";
3508 3577
3509 local $/; 3578 utf8::decode $config;
3510 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3511 3580
3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513 3582
3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516 3585
3517 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
… …
3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3520 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3521 }; 3590 };
3522 warn $@ if $@; 3591 warn $@ if $@;
3523 } 3592 }
3524
3525 warn "finished reloading resource files\n";
3526} 3593}
3527 3594
3528sub pidfile() { 3595sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3543 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3544 print $fh $$; 3611 print $fh $$;
3545} 3612}
3546 3613
3547sub main_loop { 3614sub main_loop {
3548 warn "EV::loop starting\n"; 3615 trace "EV::loop starting\n";
3549 if (1) { 3616 if (1) {
3550 EV::loop; 3617 EV::loop;
3551 } 3618 }
3552 warn "EV::loop returned\n"; 3619 trace "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP; 3620 goto &main_loop unless $REALLY_UNLOOP;
3554} 3621}
3555 3622
3556sub main { 3623sub main {
3557 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3558 3625
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563 3630
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565 3632
… …
3573 }; 3640 };
3574 3641
3575 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3576 3643
3577 cf::sync_job { 3644 cf::sync_job {
3578 cf::init_experience; 3645 cf::incloader::init ();
3646
3579 cf::init_anim; 3647 cf::init_anim;
3580 cf::init_attackmess; 3648 cf::init_attackmess;
3581 cf::init_dynamic; 3649 cf::init_dynamic;
3582 3650
3583 cf::load_settings; 3651 cf::load_settings;
3584 cf::load_materials;
3585 3652
3586 reload_resources; 3653 reload_resources;
3587 reload_config; 3654 reload_config;
3588 db_init; 3655 db_init;
3589 3656
… …
3601 3668
3602 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX (); 3670 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605 3672
3606 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3607 }; 3674 };
3608 3675
3609 cf::object::thawer::errors_are_fatal 0; 3676 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n"; 3677 info "parse errors in files are no longer fatal from this point on.\n";
3611 3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3612 main_loop; 3684 goto &main_loop;
3613} 3685}
3614 3686
3615############################################################################# 3687#############################################################################
3616# initialisation and cleanup 3688# initialisation and cleanup
3617 3689
… …
3656 or return; 3728 or return;
3657 3729
3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659 and return; 3731 and return;
3660 3732
3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662 3734
3663 1 3735 1
3664} 3736}
3665 3737
3666our $uuid_lock; 3738our $uuid_lock;
… …
3678 or return; 3750 or return;
3679 3751
3680 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3681 3753
3682 unless ($value) { 3754 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3684 return; 3756 return;
3685 } 3757 }
3686 3758
3687 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0; 3760 $uuid_skip = 0;
… …
3698 or return; 3770 or return;
3699 3771
3700 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3701 and return; 3773 and return;
3702 3774
3703 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3704 3776
3705 1 3777 1
3706 3778
3707} 3779}
3708 3780
… …
3714} 3786}
3715 3787
3716sub emergency_save() { 3788sub emergency_save() {
3717 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3718 3790
3719 warn "emergency_perl_save: enter\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3720 3797
3721 cf::sync_job { 3798 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726 3800
3727 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3728 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3729 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3730 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3731 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3732 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3733 $pl->valid or next; 3807 $pl->valid or next;
3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735 $pl->save; 3809 $pl->save;
3736 } 3810 }
3737 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3738 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3739 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3740 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3741 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3742 $map->valid or next; 3818 $map->valid or next;
3743 $map->save; 3819 $map->save;
3744 } 3820 }
3745 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3746 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3747 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3748 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3749 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3750 3828
3751 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1; 3830 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3754 }; 3851 };
3755 3852
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3761 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3762} 3854}
3763 3855
3764sub post_cleanup { 3856sub post_cleanup {
3765 my ($make_core) = @_; 3857 my ($make_core) = @_;
3766 3858
3859 IO::AIO::flush;
3860
3767 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3768 if $make_core; 3862 if $make_core;
3769 3863
3770 my $fh = pidfile; 3864 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3772} 3866}
… …
3796 } 3890 }
3797} 3891}
3798 3892
3799sub do_reload_perl() { 3893sub do_reload_perl() {
3800 # can/must only be called in main 3894 # can/must only be called in main
3801 if (in_main) { 3895 unless (in_main) {
3802 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3803 return; 3897 return;
3804 } 3898 }
3805 3899
3806 return if $RELOAD++; 3900 return if $RELOAD++;
3807 3901
3808 my $t1 = AE::time; 3902 my $t1 = AE::time;
3809 3903
3810 while ($RELOAD) { 3904 while ($RELOAD) {
3811 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3812 3907
3813 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3814 3909
3815 cf::sync_job { 3910 cf::sync_job {
3816 cf::write_runtime_sync; # external watchdog should not bark
3817 cf::emergency_save; 3911 #cf::emergency_save;
3818 cf::write_runtime_sync; # external watchdog should not bark
3819 3912
3820 warn "syncing database to disk";
3821 BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823 # if anything goes wrong in here, we should simply crash as we already saved
3824
3825 warn "flushing outstanding aio requests";
3826 while (IO::AIO::nreqs || BDB::nreqs) {
3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828 }
3829
3830 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3831 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3832 %EXT_CORO = (); 3915 %EXT_CORO = ();
3833 3916
3834 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3835 %COMMAND = (); 3918 %COMMAND = ();
3836 3919
3837 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3838 %EXTCMD = (); 3921 %EXTCMD = ();
3839 %EXTICMD = (); 3922 %EXTICMD = ();
3840 3923
3841 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3842 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3843 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3844 3927
3845 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3846 eval { 3929 eval {
3847 $cb->($pkg); 3930 $cb->($pkg);
3848 1 3931 1
3849 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3850 } 3933 }
3851 3934
3852 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3853 clear_package $pkg; 3936 clear_package $pkg;
3854 } 3937 }
3855 3938
3856 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859 3942
3860 warn "... unloading $k"; 3943 trace "... unloading $k";
3861 delete $INC{$k}; 3944 delete $INC{$k};
3862 3945
3863 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3865 3948
… …
3868 } 3951 }
3869 3952
3870 clear_package $k; 3953 clear_package $k;
3871 } 3954 }
3872 3955
3873 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3874 clear_package "safe::$_" 3957 clear_package "safe::$_"
3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876 3959
3877 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3878 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880 3963
3881 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3882 # and global variables created in xs 3965 # and global variables created in xs
3883 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3884 3967
3885 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3886 3969
3887 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3888 require cf; 3971 require cf;
3889 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3890 3973
3891 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3892 cf::reload_config; 3975 cf::reload_config;
3893 3976
3894 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3895 cf::load_extensions; 3978 cf::load_extensions;
3896 3979
3897 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3898 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3899 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3900 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3901 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3902 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3903 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3904 } 3987 }
3905 3988
3906 warn "running post_init jobs"; 3989 cf::_post_init 1;
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908 3990
3909 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3910 3992
3911 1 3993 1
3912 } or do { 3994 } or do {
3913 warn $@; 3995 error $@;
3914 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3915 }; 3997 };
3916 3998
3917 warn "reloaded";
3918 --$RELOAD; 3999 --$RELOAD;
3919 } 4000 }
3920 4001
3921 $t1 = AE::time - $t1; 4002 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3923}; 4004};
3924 4005
3925our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3926 4007
3927sub reload_perl() { 4008sub reload_perl() {
… …
3948 reload_perl; 4029 reload_perl;
3949 }; 4030 };
3950 } 4031 }
3951}; 4032};
3952 4033
3953unshift @INC, $LIBDIR; 4034#############################################################################
3954 4035
3955my $bug_warning = 0; 4036my $bug_warning = 0;
3956 4037
3957our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3958our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3959 4040
3960sub wait_for_tick { 4041sub wait_for_tick() {
3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3962 4043
3963 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3964 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3965 $signal->wait; 4046 $signal->wait;
3966} 4047}
3967 4048
3968sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3970 4051
3971 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3972 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3973 $signal->wait; 4054 $signal->wait;
… …
3987 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989 Coro::async_pool { 4070 Coro::async_pool {
3990 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3991 write_runtime_sync 4072 write_runtime_sync
3992 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3993 }; 4074 };
3994 } 4075 }
3995 4076
3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997 $sig->send; 4078 $sig->send;
… …
4005 4086
4006 if (0) { 4087 if (0) {
4007 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
4008 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
4011 } 4092 }
4012 } 4093 }
4013} 4094}
4014 4095
4015{ 4096{
… …
4060 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
4061 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
4062 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
4063} 4144}
4064 4145
4065my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
4066 4148
4067sub _log_backtrace { 4149sub _log_backtrace {
4068 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
4069 4151
4070 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
4071 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4072 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
4073 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
4074 ++$_log_backtrace; 4160 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
4076 async { 4162 async {
4077 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
4078 4164
… …
4098 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
4099 --$_log_backtrace; 4185 --$_log_backtrace;
4100 }; 4186 };
4101 } else { 4187 } else {
4102 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
4103 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4104 } 4190 }
4105} 4191}
4106 4192
4107# load additional modules 4193# load additional modules
4108require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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