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

Diff Legend

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