ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 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 = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 127our $DB_ENV;
125 128
126our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
… …
165 168
166our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
167 170
168sub cf::map::normalise; 171sub cf::map::normalise;
169 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
170############################################################################# 177#############################################################################
171 178
172%REFLECT = (); 179%REFLECT = ();
173for (@REFLECT) { 180for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
226from wherever your confdir points to. 233from wherever your confdir points to.
227 234
228=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
229 236
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
233 245
234=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
235 247
236This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 257
246=back 258=back
247 259
248=cut 260=cut
249 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
250$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 269 my $msg = join "", @_;
252 270
253 $msg .= "\n" 271 $msg .= "\n"
254 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
255 273
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 275
258 LOG llevError, $msg; 276 LOG llevWarn, $msg;
259}; 277};
260 278
261$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
263 281
264 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
265 283
266 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 286 return;#d#
269 }#d# 287 }#d#
270 288
271 # kill coroutine otherwise 289 # kill coroutine otherwise
272 Coro::terminate 290 Coro::terminate
… …
339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340 358
341sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
343 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
344=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
345 375
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
348 378
349The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 380is a reload or not.
351 381
352=cut 382=cut
353 383
354sub post_init(&) { 384sub post_init(&) {
355 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
356} 403}
357 404
358=item cf::lock_wait $string 405=item cf::lock_wait $string
359 406
360Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
505=cut 552=cut
506 553
507sub sync_job(&) { 554sub sync_job(&) {
508 my ($job) = @_; 555 my ($job) = @_;
509 556
510 if ($Coro::current == $Coro::main) { 557 if (in_main) {
511 my $time = AE::time; 558 my $time = AE::time;
512 559
513 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
515 562
516 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
517 564
518 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
519 566
520 my $busy = 1; 567 my $busy = 1;
521 my @res; 568 my @res;
522 569
523 (async { 570 (async {
524 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 572 @res = eval { $job->() };
526 warn $@ if $@; 573 error $@ if $@;
527 undef $busy; 574 undef $busy;
528 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
529 576
530 while ($busy) { 577 while ($busy) {
531 if (Coro::nready) { 578 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
566 613
567 $coro 614 $coro
568} 615}
569 616
570=item fork_call { }, $args 617=item fork_call { }, @args
571 618
572Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 622never block itself or use any form of event handling.
576 623
577=cut 624=cut
578 625
626sub post_fork {
627 reset_signals;
628}
629
579sub fork_call(&@) { 630sub fork_call(&@) {
580 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
581 632
582 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
585 636
586 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
587 reset_signals; 638 cf::post_fork;
588 &$cb 639 &$cb
589 }, @args; 640 } @args;
590 641
591 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
592} 643}
593 644
594sub objinfo { 645sub objinfo {
… …
644within each server. 695within each server.
645 696
646=cut 697=cut
647 698
648sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
649 my ($name) = @_; 703 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
651 705
652 eval { 706 eval {
653 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
663} 717}
664 718
665our $DB; 719our $DB;
666 720
667sub db_init { 721sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
670 };
671} 723}
672 724
673sub db_get($$) { 725sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
675 727
676 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
677 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
678 732
679 $! ? () 733 $! ? ()
680 : $data 734 : $data
681 }
682} 735}
683 736
684sub db_put($$$) { 737sub db_put($$$) {
685 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 795
743 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 797 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
746 799
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 801
749 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
752 805
… …
762 815
763=cut 816=cut
764 817
765sub datalog($@) { 818sub datalog($@) {
766 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 821}
769 822
770=back 823=back
771 824
772=cut 825=cut
… …
967 1020
968 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1023
971 } elsif (ref $type) { 1024 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
973 1026
974 } else { 1027 } else {
975 shift @arg; 1028 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
977 } 1030 }
978 } 1031 }
979} 1032}
980 1033
981sub _object_attach { 1034sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
992 } 1045 }
993 1046
994 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
995 } else { 1048 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1050 }
998 1051
999 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
1000} 1053}
1001 1054
… …
1060 1113
1061 for (@$callbacks) { 1114 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1063 1116
1064 if ($@) { 1117 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1119 override;
1068 } 1120 }
1069 1121
1070 return 1 if $override; 1122 return 1 if $override;
1071 } 1123 }
… …
1150 for (@$attach) { 1202 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1153 } 1205 }
1154 } else { 1206 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1208 }
1157 } 1209 }
1158} 1210}
1159 1211
1160cf::attachable->attach ( 1212cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1188 1240
1189 sync_job { 1241 sync_job {
1190 if (length $$rdata) { 1242 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1194 1247
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1221 1274
1222 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1277 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1226 } 1279 }
1227 } else { 1280 } else {
1228 aio_unlink $filename; 1281 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1230 } 1283 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1308 $av = $st->{objs};
1256 } 1309 }
1257 1310
1258 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1261 1315
1262 ($data, $av) 1316 ($data, $av)
1263} 1317}
1264 1318
1265=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1357 1411
1358 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1413 if $reply;
1360 1414
1361 } else { 1415 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1417 }
1364 1418
1365 cf::override; 1419 cf::override;
1366 }, 1420 },
1367); 1421);
… …
1378 1432
1379 $grp 1433 $grp
1380} 1434}
1381 1435
1382sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1383 cf::sync_job { 1439 cf::sync_job {
1384 my %todo; 1440 my %todo;
1385 1441
1386 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1443 next unless -r $path;
… …
1405 1461
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1464
1409 $ext{source} = 1465 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1412 . $source 1468 . $source
1413 . "\n};\n1"; 1469 . "\n};\n1";
1414 1470
1415 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1484 next ext
1429 unless exists $done{$_}; 1485 unless exists $done{$_};
1430 } 1486 }
1431 1487
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1489
1434 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1435 1491
1436 if (length $@) { 1492 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1438 1494
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1441 1497
1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1444 } else { 1500 } else {
1445 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1447 $progress = 1; 1503 $progress = 1;
1448 1504
1449 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1450 unless $active; 1506 unless $active;
1451 } 1507 }
1452 } 1508 }
1453 1509
1454 unless ($progress) { 1510 unless ($progress) {
… …
1623 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1624 1680
1625 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1627 1683
1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1629 $pl->deactivate; 1685 $pl->deactivate;
1686
1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1631 $pl->ob->check_score;
1632 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1633 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1634 1692
1635 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1636 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1637 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1691 \@logins 1749 \@logins
1692} 1750}
1693 1751
1694=item $player->maps 1752=item $player->maps
1695 1753
1754=item cf::player::maps $login
1755
1696Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1697player. May block. 1757player. May block.
1698 1758
1699=cut 1759=cut
1700 1760
… …
1762=cut 1822=cut
1763 1823
1764sub find_by_path($) { 1824sub find_by_path($) {
1765 my ($path) = @_; 1825 my ($path) = @_;
1766 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1767 my ($match, $specificity); 1829 my ($match, $specificity);
1768 1830
1769 for my $region (list) { 1831 for my $region (list) {
1770 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1771 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1799sub generate_random_map { 1861sub generate_random_map {
1800 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1801 1863
1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1803 1865
1804 # mit "rum" bekleckern, nicht
1805 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1809 $rmp->{exit_on_final_map},
1810 $rmp->{xsize}, $rmp->{ysize},
1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1814 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1815 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1816 (cf::region::find $rmp->{region}), $rmp->{custom}
1817 )
1818} 1867}
1819 1868
1820=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1821 1870
1822Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1827 1876
1828sub register { 1877sub register {
1829 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1830 my $pkg = caller; 1879 my $pkg = caller;
1831 1880
1832 no strict;
1833 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1834 1882
1835 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1836} 1884}
1837 1885
1838# also paths starting with '/' 1886# also paths starting with '/'
1839$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1840 1888
1841sub thawer_merge { 1889sub thawer_merge {
1842 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1843 1891
1844 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1849} 1897}
1850 1898
1851sub normalise { 1899sub normalise {
1852 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1853 1901
1854 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1855 1903
1856 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1857 1905
1858 # map plan: 1906 # map plan:
1859 # 1907 #
… …
1874 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1875 $path = "$base/$path"; 1923 $path = "$base/$path";
1876 } 1924 }
1877 1925
1878 for ($path) { 1926 for ($path) {
1879 redo if s{//}{/};
1880 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1881 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1882 } 1929 }
1883 1930
1884 $path 1931 $path
… …
1898 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1899 return $self; 1946 return $self;
1900 } 1947 }
1901 } 1948 }
1902 1949
1903 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1904 () 1951 ()
1905} 1952}
1906 1953
1907sub init { 1954sub init {
1908 my ($self) = @_; 1955 my ($self) = @_;
… …
2030} 2077}
2031 2078
2032sub find; 2079sub find;
2033sub find { 2080sub find {
2034 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2035 2084
2036 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2037 2086
2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2124 2173
2125 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2126 } 2175 }
2127 2176
2128 $self->post_load; 2177 $self->post_load;
2178
2179 1
2129} 2180}
2130 2181
2131# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2154 or next; 2205 or next;
2155 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2156 or next; 2207 or next;
2157 $neigh->load; 2208 $neigh->load;
2158 2209
2210 # now find the diagonal neighbours
2159 push @neigh, 2211 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 } 2214 }
2163 2215
… …
2170} 2222}
2171 2223
2172sub find_sync { 2224sub find_sync {
2173 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2174 2226
2175 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2176} 2231}
2177 2232
2178sub do_load_sync { 2233sub do_load_sync {
2179 my ($map) = @_; 2234 my ($map) = @_;
2180 2235
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2183 2238
2184 cf::sync_job { $map->load }; 2239 $map->load;
2185} 2240}
2186 2241
2187our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2189 2244
… …
2301 2356
2302 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2303 2358
2304 return if $self->players; 2359 return if $self->players;
2305 2360
2306 warn "resetting map ", $self->path, "\n"; 2361 cf::trace "resetting map ", $self->path, "\n";
2307 2362
2308 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
2309 2364
2310 # need to save uniques path 2365 # need to save uniques path
2311 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
… …
2335 2390
2336 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2337 2392
2338 $self->unlink_save; 2393 $self->unlink_save;
2339 2394
2340 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2341 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2342 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2343 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2344 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2345 2400
… …
2575 2630
2576Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2577 2632
2578The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2579for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2581map. 2636map.
2582 2637
2583Will never block. 2638Will never block.
2584 2639
2585=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2606sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2607 my ($self) = @_; 2662 my ($self) = @_;
2608 2663
2609 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2610 2665
2666 ++$self->{_link_recursion};
2667
2611 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2612 2669
2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2614 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2615 2672
… …
2646 $map->load_neighbours; 2703 $map->load_neighbours;
2647 2704
2648 return unless $self->contr->active; 2705 return unless $self->contr->active;
2649 2706
2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2651 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2652 2709 # entering was successful
2710 delete $self->{_link_recursion};
2653 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive; 2712 $self->activate_recursive;
2655} 2713 }
2656 2714
2715}
2716
2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2658 2718
2659Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2660her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2661that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2662the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
… …
2669 2729
2670our $GOTOGEN; 2730our $GOTOGEN;
2671 2731
2672sub cf::object::player::goto { 2732sub cf::object::player::goto {
2673 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2674 2740
2675 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2676 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2677 2743
2678 $self->enter_link; 2744 $self->enter_link;
… …
2702 my $map = eval { 2768 my $map = eval {
2703 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2704 2770
2705 if ($map) { 2771 if ($map) {
2706 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2707 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2708 } else { 2774 } else {
2709 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2710 } 2776 }
2711 2777
2712 $map 2778 $map
… …
2720 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2721 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2722 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2723 } 2789 }
2724 2790
2725 $done->() if $done; 2791 $done->($self) if $done;
2726 })->prio (1); 2792 })->prio (1);
2727} 2793}
2728 2794
2729=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2730 2796
… …
2823 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2824 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2825 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2826 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2827 2893
2828 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2829 $self->leave_link; 2895 $self->leave_link;
2830 } 2896 }
2831 })->prio (1); 2897 })->prio (1);
2832} 2898}
2833 2899
… …
3146 3212
3147 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3148 if $reply; 3214 if $reply;
3149 3215
3150 } else { 3216 } else {
3151 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3152 } 3218 }
3153 3219
3154 cf::override; 3220 cf::override;
3155 }, 3221 },
3156); 3222);
… …
3237 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3238 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3239 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3240 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3241) { 3307) {
3242 no strict 'refs';
3243 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3245 for @funs; 3310 for @funs;
3246} 3311}
3247 3312
… …
3286 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3288 } 3353 }
3289 3354
3290 if ($@) { 3355 if ($@) {
3291 warn "$@"; 3356 warn "$@",
3292 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3293 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3294 } 3359 }
3295 3360
3296 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3297} 3362}
3298 3363
… …
3332 # for this (global event?) 3397 # for this (global event?)
3333 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3334 3399
3335 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3336 3401
3337 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3338 3403
3339 my $facedata;
3340 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3341 or die "$path: $!"; 3405 or die "$path: $!";
3342 3406
3343 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3344 3408
3345 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3362 3426
3363 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3364 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3367 3432
3368 cf::cede_to_tick; 3433 cf::cede_to_tick;
3369 } 3434 }
3370 3435
3371 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3376 3441
3377 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3378 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3380 } else { 3445 } else {
3381 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3382 } 3447 }
3383 3448
3384 cf::cede_to_tick; 3449 cf::cede_to_tick;
3385 } 3450 }
3386 } 3451 }
… …
3404 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3405 3470
3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3407 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3408 } else { 3473 } else {
3409 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3410 } 3475 }
3411 3476
3412 cf::cede_to_tick; 3477 cf::cede_to_tick;
3413 } 3478 }
3414 } 3479 }
3415 3480
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3417 3482
3418 1 3483 1
3419} 3484}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3440 3485
3441register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3442 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3443 3488
3444 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3483sub reload_treasures { 3528sub reload_treasures {
3484 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3485 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3486} 3531}
3487 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3488sub reload_resources { 3556sub reload_resources {
3489 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3490 3558
3559 reload_exp_table;
3560 reload_materials;
3491 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3492 reload_archetypes; 3563 reload_archetypes;
3493 reload_regions; 3564 reload_regions;
3494 reload_treasures; 3565 reload_treasures;
3495 3566
3496 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3497} 3568}
3498 3569
3499sub reload_config { 3570sub reload_config {
3500 warn "reloading config file...\n"; 3571 trace "reloading config file...\n";
3501 3572
3502 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3503 or return; 3574 or die "$CONFDIR/config: $!";
3504 3575
3505 local $/; 3576 utf8::decode $config;
3506 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3507 3578
3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3509 3580
3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3512 3583
3513 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
… …
3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3516 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3517 }; 3588 };
3518 warn $@ if $@; 3589 warn $@ if $@;
3519 } 3590 }
3520
3521 warn "finished reloading resource files\n";
3522} 3591}
3523 3592
3524sub pidfile() { 3593sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3539 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3540 print $fh $$; 3609 print $fh $$;
3541} 3610}
3542 3611
3543sub main_loop { 3612sub main_loop {
3544 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3545 if (1) { 3614 if (1) {
3546 EV::loop; 3615 EV::loop;
3547 } 3616 }
3548 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3550} 3619}
3551 3620
3552sub main { 3621sub main {
3553 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3554 3623
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559 3628
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561 3630
… …
3569 }; 3638 };
3570 3639
3571 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3572 3641
3573 cf::sync_job { 3642 cf::sync_job {
3574 cf::init_experience; 3643 cf::incloader::init ();
3644
3575 cf::init_anim; 3645 cf::init_anim;
3576 cf::init_attackmess; 3646 cf::init_attackmess;
3577 cf::init_dynamic; 3647 cf::init_dynamic;
3578 3648
3579 cf::load_settings; 3649 cf::load_settings;
3580 cf::load_materials;
3581 3650
3582 reload_resources; 3651 reload_resources;
3583 reload_config; 3652 reload_config;
3584 db_init; 3653 db_init;
3585 3654
… …
3597 3666
3598 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX (); 3668 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601 3670
3602 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3603 }; 3672 };
3604 3673
3605 cf::object::thawer::errors_are_fatal 0; 3674 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n"; 3675 info "parse errors in files are no longer fatal from this point on.\n";
3607 3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3608 main_loop; 3682 goto &main_loop;
3609} 3683}
3610 3684
3611############################################################################# 3685#############################################################################
3612# initialisation and cleanup 3686# initialisation and cleanup
3613 3687
… …
3652 or return; 3726 or return;
3653 3727
3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3655 and return; 3729 and return;
3656 3730
3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3658 3732
3659 1 3733 1
3660} 3734}
3661 3735
3662our $uuid_lock; 3736our $uuid_lock;
… …
3674 or return; 3748 or return;
3675 3749
3676 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3677 3751
3678 unless ($value) { 3752 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3680 return; 3754 return;
3681 } 3755 }
3682 3756
3683 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0; 3758 $uuid_skip = 0;
… …
3694 or return; 3768 or return;
3695 3769
3696 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3697 and return; 3771 and return;
3698 3772
3699 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3700 3774
3701 1 3775 1
3702 3776
3703} 3777}
3704 3778
… …
3710} 3784}
3711 3785
3712sub emergency_save() { 3786sub emergency_save() {
3713 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3714 3788
3715 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3716 3795
3717 cf::sync_job { 3796 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722 3798
3723 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3724 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3725 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3726 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3727 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3728 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3729 $pl->valid or next; 3805 $pl->valid or next;
3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3731 $pl->save; 3807 $pl->save;
3732 } 3808 }
3733 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3734 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3735 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3736 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3737 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3738 $map->valid or next; 3816 $map->valid or next;
3739 $map->save; 3817 $map->save;
3740 } 3818 }
3741 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3742 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3743 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3744 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3745 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3746 3826
3747 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1; 3828 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3750 }; 3849 };
3751 3850
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3757 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3758} 3852}
3759 3853
3760sub post_cleanup { 3854sub post_cleanup {
3761 my ($make_core) = @_; 3855 my ($make_core) = @_;
3762 3856
3857 IO::AIO::flush;
3858
3763 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3764 if $make_core; 3860 if $make_core;
3765 3861
3766 my $fh = pidfile; 3862 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3768} 3864}
… …
3792 } 3888 }
3793} 3889}
3794 3890
3795sub do_reload_perl() { 3891sub do_reload_perl() {
3796 # can/must only be called in main 3892 # can/must only be called in main
3797 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3798 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3799 return; 3895 return;
3800 } 3896 }
3801 3897
3802 return if $RELOAD++; 3898 return if $RELOAD++;
3803 3899
3804 my $t1 = AE::time; 3900 my $t1 = AE::time;
3805 3901
3806 while ($RELOAD) { 3902 while ($RELOAD) {
3807 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3808 3905
3809 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3810 3907
3811 cf::sync_job { 3908 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 cf::emergency_save; 3909 #cf::emergency_save;
3814 cf::write_runtime_sync; # external watchdog should not bark
3815 3910
3816 warn "syncing database to disk";
3817 BDB::db_env_txn_checkpoint $DB_ENV;
3818
3819 # if anything goes wrong in here, we should simply crash as we already saved
3820
3821 warn "flushing outstanding aio requests";
3822 while (IO::AIO::nreqs || BDB::nreqs) {
3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3824 }
3825
3826 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3827 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3828 %EXT_CORO = (); 3913 %EXT_CORO = ();
3829 3914
3830 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3831 %COMMAND = (); 3916 %COMMAND = ();
3832 3917
3833 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3834 %EXTCMD = (); 3919 %EXTCMD = ();
3835 %EXTICMD = (); 3920 %EXTICMD = ();
3836 3921
3837 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3838 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3839 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3840 3925
3841 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3842 eval { 3927 eval {
3843 $cb->($pkg); 3928 $cb->($pkg);
3844 1 3929 1
3845 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3846 } 3931 }
3847 3932
3848 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3849 clear_package $pkg; 3934 clear_package $pkg;
3850 } 3935 }
3851 3936
3852 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855 3940
3856 warn "... unloading $k"; 3941 trace "... unloading $k";
3857 delete $INC{$k}; 3942 delete $INC{$k};
3858 3943
3859 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3861 3946
… …
3864 } 3949 }
3865 3950
3866 clear_package $k; 3951 clear_package $k;
3867 } 3952 }
3868 3953
3869 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3870 clear_package "safe::$_" 3955 clear_package "safe::$_"
3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3872 3957
3873 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3874 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3876 3961
3877 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3878 # and global variables created in xs 3963 # and global variables created in xs
3879 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3880 3965
3881 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3882 3967
3883 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3884 require cf; 3969 require cf;
3885 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3886 3971
3887 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3888 cf::reload_config; 3973 cf::reload_config;
3889 3974
3890 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3891 cf::load_extensions; 3976 cf::load_extensions;
3892 3977
3893 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3894 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3895 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3896 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3897 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3898 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3899 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3900 } 3985 }
3901 3986
3902 warn "running post_init jobs"; 3987 cf::_post_init 1;
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904 3988
3905 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3906 3990
3907 1 3991 1
3908 } or do { 3992 } or do {
3909 warn $@; 3993 error $@;
3910 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3911 }; 3995 };
3912 3996
3913 warn "reloaded";
3914 --$RELOAD; 3997 --$RELOAD;
3915 } 3998 }
3916 3999
3917 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3919}; 4002};
3920 4003
3921our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3922 4005
3923sub reload_perl() { 4006sub reload_perl() {
… …
3944 reload_perl; 4027 reload_perl;
3945 }; 4028 };
3946 } 4029 }
3947}; 4030};
3948 4031
3949unshift @INC, $LIBDIR; 4032#############################################################################
3950 4033
3951my $bug_warning = 0; 4034my $bug_warning = 0;
3952 4035
3953our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3954our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3955 4038
3956sub wait_for_tick { 4039sub wait_for_tick() {
3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3958 4041
3959 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3960 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3961 $signal->wait; 4044 $signal->wait;
3962} 4045}
3963 4046
3964sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3966 4049
3967 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3969 $signal->wait; 4052 $signal->wait;
… …
3983 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3985 Coro::async_pool { 4068 Coro::async_pool {
3986 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3987 write_runtime_sync 4070 write_runtime_sync
3988 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3989 }; 4072 };
3990 } 4073 }
3991 4074
3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3993 $sig->send; 4076 $sig->send;
… …
4001 4084
4002 if (0) { 4085 if (0) {
4003 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
4007 } 4090 }
4008 } 4091 }
4009} 4092}
4010 4093
4011{ 4094{
… …
4056 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4057 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4058 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4059} 4142}
4060 4143
4061my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4062 4146
4063sub _log_backtrace { 4147sub _log_backtrace {
4064 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4065 4149
4066 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4067 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4068 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4069 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4070 ++$_log_backtrace; 4158 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4072 async { 4160 async {
4073 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4074 4162
… …
4094 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4095 --$_log_backtrace; 4183 --$_log_backtrace;
4096 }; 4184 };
4097 } else { 4185 } else {
4098 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4099 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4100 } 4188 }
4101} 4189}
4102 4190
4103# load additional modules 4191# load additional modules
4104require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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