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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 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
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These 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
228returns 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
229per 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();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<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
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 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
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $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;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
336our $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
337 358
338sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
342 375
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
345 378
346The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 380is a reload or not.
348 381
349=cut 382=cut
350 383
351sub post_init(&) { 384sub post_init(&) {
352 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 }
353} 403}
354 404
355=item cf::lock_wait $string 405=item cf::lock_wait $string
356 406
357Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
396} 446}
397 447
398=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
399 449
400Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 451get spread over time.
402 452
403=cut 453=cut
404 454
405sub periodic($$) { 455sub periodic($$) {
406 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
502=cut 552=cut
503 553
504sub sync_job(&) { 554sub sync_job(&) {
505 my ($job) = @_; 555 my ($job) = @_;
506 556
507 if ($Coro::current == $Coro::main) { 557 if (in_main) {
508 my $time = AE::time; 558 my $time = AE::time;
509 559
510 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
512 562
513 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
514 564
515 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
516 566
517 my $busy = 1; 567 my $busy = 1;
518 my @res; 568 my @res;
519 569
520 (async { 570 (async {
521 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 572 @res = eval { $job->() };
523 warn $@ if $@; 573 error $@ if $@;
524 undef $busy; 574 undef $busy;
525 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
526 576
527 while ($busy) { 577 while ($busy) {
528 if (Coro::nready) { 578 if (Coro::nready) {
… …
562 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
563 613
564 $coro 614 $coro
565} 615}
566 616
567=item fork_call { }, $args 617=item fork_call { }, @args
568 618
569Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 622never block itself or use any form of event handling.
573 623
574=cut 624=cut
575 625
626sub post_fork {
627 reset_signals;
628}
629
576sub fork_call(&@) { 630sub fork_call(&@) {
577 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
578 632
579 # 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,
580 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
582 636
583 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
584 reset_signals; 638 cf::post_fork;
585 &$cb 639 &$cb
586 }, @args; 640 } @args;
587 641
588 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
589} 654}
590 655
591=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
592 657
593=cut 658=cut
… …
630within each server. 695within each server.
631 696
632=cut 697=cut
633 698
634sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
635 my ($name) = @_; 703 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
637 705
638 eval { 706 eval {
639 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
649} 717}
650 718
651our $DB; 719our $DB;
652 720
653sub db_init { 721sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
656 };
657} 723}
658 724
659sub db_get($$) { 725sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
661 727
662 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
663 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
664 732
665 $! ? () 733 $! ? ()
666 : $data 734 : $data
667 }
668} 735}
669 736
670sub db_put($$$) { 737sub db_put($$$) {
671 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 795
729 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 797 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
732 799
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 801
735 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
738 805
… …
748 815
749=cut 816=cut
750 817
751sub datalog($@) { 818sub datalog($@) {
752 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 821}
755 822
756=back 823=back
757 824
758=cut 825=cut
… …
953 1020
954 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1023
957 } elsif (ref $type) { 1024 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
959 1026
960 } else { 1027 } else {
961 shift @arg; 1028 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
963 } 1030 }
964 } 1031 }
965} 1032}
966 1033
967sub _object_attach { 1034sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
978 } 1045 }
979 1046
980 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
981 } else { 1048 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1050 }
984 1051
985 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
986} 1053}
987 1054
… …
1046 1113
1047 for (@$callbacks) { 1114 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1049 1116
1050 if ($@) { 1117 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1119 override;
1054 } 1120 }
1055 1121
1056 return 1 if $override; 1122 return 1 if $override;
1057 } 1123 }
… …
1136 for (@$attach) { 1202 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1139 } 1205 }
1140 } else { 1206 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1208 }
1143 } 1209 }
1144} 1210}
1145 1211
1146cf::attachable->attach ( 1212cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1174 1240
1175 sync_job { 1241 sync_job {
1176 if (length $$rdata) { 1242 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1180 1247
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1207 1274
1208 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1277 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1212 } 1279 }
1213 } else { 1280 } else {
1214 aio_unlink $filename; 1281 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1216 } 1283 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1308 $av = $st->{objs};
1242 } 1309 }
1243 1310
1244 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1247 1315
1248 ($data, $av) 1316 ($data, $av)
1249} 1317}
1250 1318
1251=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1343 1411
1344 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1413 if $reply;
1346 1414
1347 } else { 1415 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1417 }
1350 1418
1351 cf::override; 1419 cf::override;
1352 }, 1420 },
1353); 1421);
… …
1364 1432
1365 $grp 1433 $grp
1366} 1434}
1367 1435
1368sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1369 cf::sync_job { 1439 cf::sync_job {
1370 my %todo; 1440 my %todo;
1371 1441
1372 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1443 next unless -r $path;
… …
1391 1461
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1464
1395 $ext{source} = 1465 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1398 . $source 1468 . $source
1399 . "\n};\n1"; 1469 . "\n};\n1";
1400 1470
1401 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1484 next ext
1415 unless exists $done{$_}; 1485 unless exists $done{$_};
1416 } 1486 }
1417 1487
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1489
1420 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1421 1491
1422 if (length $@) { 1492 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1424 1494
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1497
1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1427 } else { 1500 } else {
1428 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1430 $progress = 1; 1503 $progress = 1;
1431 1504
1432 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1506 unless $active;
1434 } 1507 }
1435 } 1508 }
1436 1509
1437 unless ($progress) { 1510 unless ($progress) {
… …
1606 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1607 1680
1608 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1609 $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
1610 1683
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1685 $pl->deactivate;
1686
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1616 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1617 1692
1618 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1674 \@logins 1749 \@logins
1675} 1750}
1676 1751
1677=item $player->maps 1752=item $player->maps
1678 1753
1754=item cf::player::maps $login
1755
1679Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1680player. May block. 1757player. May block.
1681 1758
1682=cut 1759=cut
1683 1760
… …
1744 1821
1745=cut 1822=cut
1746 1823
1747sub find_by_path($) { 1824sub find_by_path($) {
1748 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1749 1828
1750 my ($match, $specificity); 1829 my ($match, $specificity);
1751 1830
1752 for my $region (list) { 1831 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
… …
1810 1889
1811sub register { 1890sub register {
1812 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1892 my $pkg = caller;
1814 1893
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1895
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1897}
1820 1898
1821# also paths starting with '/' 1899# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1901
1824sub thawer_merge { 1902sub thawer_merge {
1825 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1826 1904
1827 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1832} 1910}
1833 1911
1834sub normalise { 1912sub normalise {
1835 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1836 1914
1837 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1838 1916
1839 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1840 1918
1841 # map plan: 1919 # map plan:
1842 # 1920 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1936 $path = "$base/$path";
1859 } 1937 }
1860 1938
1861 for ($path) { 1939 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1865 } 1942 }
1866 1943
1867 $path 1944 $path
… …
1881 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1882 return $self; 1959 return $self;
1883 } 1960 }
1884 } 1961 }
1885 1962
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1964 ()
1888} 1965}
1889 1966
1890sub init { 1967sub init {
1891 my ($self) = @_; 1968 my ($self) = @_;
… …
2013} 2090}
2014 2091
2015sub find; 2092sub find;
2016sub find { 2093sub find {
2017 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
2018 2097
2019 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
2020 2099
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2107 2186
2108 $self->in_memory (cf::MAP_ACTIVE); 2187 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2188 }
2110 2189
2111 $self->post_load; 2190 $self->post_load;
2191
2192 1
2112} 2193}
2113 2194
2114# customize the map for a given player, i.e. 2195# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2196# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2197# maps to change the path to ~playername/mappath
… …
2137 or next; 2218 or next;
2138 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
2139 or next; 2220 or next;
2140 $neigh->load; 2221 $neigh->load;
2141 2222
2223 # now find the diagonal neighbours
2142 push @neigh, 2224 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2227 }
2146 2228
… …
2153} 2235}
2154 2236
2155sub find_sync { 2237sub find_sync {
2156 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
2157 2239
2158 cf::sync_job { find $path, $origin } 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main;
2242
2243 find $path, $origin
2159} 2244}
2160 2245
2161sub do_load_sync { 2246sub do_load_sync {
2162 my ($map) = @_; 2247 my ($map) = @_;
2163 2248
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2250 if $Coro::current == $Coro::main;
2166 2251
2167 cf::sync_job { $map->load }; 2252 $map->load;
2168} 2253}
2169 2254
2170our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
2172 2257
… …
2198 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
2199 2284
2200 () 2285 ()
2201} 2286}
2202 2287
2288# common code, used by both ->save and ->swapout
2203sub save { 2289sub _save {
2204 my ($self) = @_; 2290 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2291
2208 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
2209 2293
2210 return unless $self->dirty; 2294 return unless $self->dirty;
2211 2295
… …
2231 } else { 2315 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2316 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2317 }
2234} 2318}
2235 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
2236sub swap_out { 2328sub swap_out {
2237 my ($self) = @_; 2329 my ($self) = @_;
2238 2330
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2332
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2333 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2334 return if $self->{deny_save};
2335 return if $self->players;
2247 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
2346 $self->clear;
2347}
2348
2349sub reset_at {
2350 my ($self) = @_;
2351
2352 # TODO: safety, remove and allow resettable per-player maps
2353 return 1e99 if $self->{deny_reset};
2354
2355 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2356 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2357
2358 $time + $to
2359}
2360
2361sub should_reset {
2362 my ($self) = @_;
2363
2364 $self->reset_at <= $cf::RUNTIME
2365}
2366
2367sub reset {
2368 my ($self) = @_;
2369
2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
2371
2372 return if $self->players;
2373
2374 cf::trace "resetting map ", $self->path, "\n";
2375
2376 $self->in_memory (cf::MAP_SWAPPED);
2377
2378 # need to save uniques path
2379 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381
2382 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2383 if $uniq;
2384 }
2385
2386 delete $cf::MAP{$self->path};
2249 2387
2250 $self->deactivate; 2388 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2389 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2390 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2391
2298 $self->unlink_save; 2392 $self->unlink_save;
2299 $self->destroy; 2393 $self->destroy;
2300} 2394}
2301 2395
… …
2309 2403
2310 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2311 2405
2312 $self->unlink_save; 2406 $self->unlink_save;
2313 2407
2314 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2413
… …
2549 2643
2550Freezes the player and moves him/her to a special map (C<{link}>). 2644Freezes the player and moves him/her to a special map (C<{link}>).
2551 2645
2552The player should be reasonably safe there for short amounts of time (e.g. 2646The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2647for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2648though, as the player cannot control the character while it is on the link
2555map. 2649map.
2556 2650
2557Will never block. 2651Will never block.
2558 2652
2559=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2581 my ($self) = @_; 2675 my ($self) = @_;
2582 2676
2583 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2584 2678
2679 ++$self->{_link_recursion};
2680
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2682
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2589 2685
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2687}
2592 2688
2593sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2595 2691
… …
2620 $map->load_neighbours; 2716 $map->load_neighbours;
2621 2717
2622 return unless $self->contr->active; 2718 return unless $self->contr->active;
2623 2719
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2626 2722 # entering was successful
2723 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2724 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2725 $self->activate_recursive;
2629} 2726 }
2630 2727
2728}
2729
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2731
2633Moves the player to the given map-path and coordinates by first freezing 2732Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2734that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2735the new (success) or old (failed) map position. In either case, $done will
… …
2643 2742
2644our $GOTOGEN; 2743our $GOTOGEN;
2645 2744
2646sub cf::object::player::goto { 2745sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
2747
2748 if ($self->{_link_recursion} >= $MAX_LINKS) {
2749 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2750 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2751 ($path, $x, $y) = @$EMERGENCY_POSITION;
2752 }
2648 2753
2649 # do generation counting so two concurrent goto's will be executed in-order 2754 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2756
2652 $self->enter_link; 2757 $self->enter_link;
… …
2676 my $map = eval { 2781 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2782 my $map = defined $path ? cf::map::find $path : undef;
2678 2783
2679 if ($map) { 2784 if ($map) {
2680 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2787 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2788 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2789 }
2685 2790
2686 $map 2791 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2697 } 2802 }
2698 2803
2699 $done->() if $done; 2804 $done->($self) if $done;
2700 })->prio (1); 2805 })->prio (1);
2701} 2806}
2702 2807
2703=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2704 2809
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2903 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2906
2802 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2908 $self->leave_link;
2804 } 2909 }
2805 })->prio (1); 2910 })->prio (1);
2806} 2911}
2807 2912
… …
3120 3225
3121 $ns->ext_reply ($reply, @reply) 3226 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3227 if $reply;
3123 3228
3124 } else { 3229 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3230 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3231 }
3127 3232
3128 cf::override; 3233 cf::override;
3129 }, 3234 },
3130); 3235);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3316 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3318 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
3215) { 3320) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3323 for @funs;
3220} 3324}
3221 3325
… …
3260 local @cf::_safe_eval_args = values %vars; 3364 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3365 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3366 }
3263 3367
3264 if ($@) { 3368 if ($@) {
3265 warn "$@"; 3369 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
3268 } 3372 }
3269 3373
3270 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
3271} 3375}
3272 3376
… …
3306 # for this (global event?) 3410 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3412
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3414
3311 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3312 3416
3313 my $facedata;
3314 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
3315 or die "$path: $!"; 3418 or die "$path: $!";
3316 3419
3317 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
3318 3421
3319 $facedata->{version} == 2 3422 $facedata->{version} == 2
… …
3350 3453
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3457 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3459 }
3357 3460
3358 cf::cede_to_tick; 3461 cf::cede_to_tick;
3359 } 3462 }
3360 } 3463 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3482
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3382 } else { 3485 } else {
3383 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3384 } 3487 }
3385 3488
3386 cf::cede_to_tick; 3489 cf::cede_to_tick;
3387 } 3490 }
3388 } 3491 }
3389 3492
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3494
3392 1 3495 1
3393} 3496}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3497
3415register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3417 3500
3418 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3540sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3460} 3543}
3461 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3462sub reload_resources { 3568sub reload_resources {
3463 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3464 3570
3571 reload_exp_table;
3572 reload_materials;
3465 reload_facedata; 3573 reload_facedata;
3574 reload_sound;
3466 reload_archetypes; 3575 reload_archetypes;
3467 reload_regions; 3576 reload_regions;
3468 reload_treasures; 3577 reload_treasures;
3469 3578
3470 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
3471} 3580}
3472 3581
3473sub reload_config { 3582sub reload_config {
3474 warn "reloading config file...\n"; 3583 trace "reloading config file...\n";
3475 3584
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3585 0 < aio_load "$CONFDIR/config", my $config
3477 or return; 3586 or die "$CONFDIR/config: $!";
3478 3587
3479 local $/; 3588 utf8::decode $config;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3589 *CFG = yaml_load $config;
3481 3590
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3592
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3595
3487 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3598 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3599 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3600 };
3492 warn $@ if $@; 3601 warn $@ if $@;
3493 } 3602 }
3494
3495 warn "finished reloading resource files\n";
3496} 3603}
3497 3604
3498sub pidfile() { 3605sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3514 print $fh $$; 3621 print $fh $$;
3515} 3622}
3516 3623
3517sub main_loop { 3624sub main_loop {
3518 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3519 if (1) { 3626 if (1) {
3520 EV::loop; 3627 EV::loop;
3521 } 3628 }
3522 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3524} 3631}
3525 3632
3526sub main { 3633sub main {
3527 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3528 3635
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3640
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3642
3541 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
… …
3548 }; 3650 };
3549 3651
3550 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3551 3653
3552 cf::sync_job { 3654 cf::sync_job {
3655 cf::incloader::init ();
3656
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3553 cf::load_settings; 3661 cf::load_settings;
3554 cf::load_materials;
3555 3662
3556 reload_resources; 3663 reload_resources;
3557 reload_config; 3664 reload_config;
3558 db_init; 3665 db_init;
3559 3666
… …
3571 3678
3572 # no (long-running) fork's whatsoever before this point(!) 3679 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3680 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3681 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3682
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3683 cf::_post_init 0;
3577 }; 3684 };
3578 3685
3686 cf::object::thawer::errors_are_fatal 0;
3687 info "parse errors in files are no longer fatal from this point on.\n";
3688
3689 my $free_main; $free_main = EV::idle sub {
3690 undef $free_main;
3691 undef &main; # free gobs of memory :)
3692 };
3693
3579 main_loop; 3694 goto &main_loop;
3580} 3695}
3581 3696
3582############################################################################# 3697#############################################################################
3583# initialisation and cleanup 3698# initialisation and cleanup
3584 3699
… …
3623 or return; 3738 or return;
3624 3739
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3741 and return;
3627 3742
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3744
3630 1 3745 1
3631} 3746}
3632 3747
3633our $uuid_lock; 3748our $uuid_lock;
… …
3645 or return; 3760 or return;
3646 3761
3647 my $value = uuid_seq uuid_cur; 3762 my $value = uuid_seq uuid_cur;
3648 3763
3649 unless ($value) { 3764 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3765 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3766 return;
3652 } 3767 }
3653 3768
3654 my $value = uuid_str $value + $uuid_skip; 3769 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3770 $uuid_skip = 0;
… …
3665 or return; 3780 or return;
3666 3781
3667 aio_rename "$uuid~", $uuid 3782 aio_rename "$uuid~", $uuid
3668 and return; 3783 and return;
3669 3784
3670 warn "uuid file written ($value).\n"; 3785 trace "uuid file written ($value).\n";
3671 3786
3672 1 3787 1
3673 3788
3674} 3789}
3675 3790
… …
3681} 3796}
3682 3797
3683sub emergency_save() { 3798sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
3685 3800
3686 warn "emergency_perl_save: enter\n"; 3801 info "emergency_perl_save: enter\n";
3802
3803 # this is a trade-off: we want to be very quick here, so
3804 # save all maps without fsync, and later call a global sync
3805 # (which in turn might be very very slow)
3806 local $USE_FSYNC = 0;
3687 3807
3688 cf::sync_job { 3808 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3809 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3810
3694 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3814 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3817 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3819 $pl->save;
3703 } 3820 }
3704 warn "emergency_perl_save: end player save\n"; 3821 info "emergency_perl_save: end player save\n";
3705 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3706 warn "emergency_perl_save: begin map save\n"; 3825 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3828 $map->valid or next;
3710 $map->save; 3829 $map->save;
3711 } 3830 }
3712 warn "emergency_perl_save: end map save\n"; 3831 info "emergency_perl_save: end map save\n";
3713 3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3835 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3837 info "emergency_perl_save: end database checkpoint\n";
3717 3838
3718 warn "emergency_perl_save: begin write uuid\n"; 3839 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3840 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3841 info "emergency_perl_save: end write uuid\n";
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: syncing database to disk";
3846 BDB::db_env_txn_checkpoint $DB_ENV;
3847
3848 info "emergency_perl_save: starting sync\n";
3849 IO::AIO::aio_sync sub {
3850 info "emergency_perl_save: finished sync\n";
3851 };
3852
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3855 trace "emergency_perl_save: flushing outstanding aio requests";
3856 while (IO::AIO::nreqs || BDB::nreqs) {
3857 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3858 }
3859
3860 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3861 };
3722 3862
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3863 info "emergency_perl_save: leave\n";
3729} 3864}
3730 3865
3731sub post_cleanup { 3866sub post_cleanup {
3732 my ($make_core) = @_; 3867 my ($make_core) = @_;
3733 3868
3869 IO::AIO::flush;
3870
3734 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3872 if $make_core;
3736 3873
3737 my $fh = pidfile; 3874 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3875 unlink $PIDFILE if <$fh> == $$;
3739} 3876}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3896 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3897 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3898 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3899# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3900 }
3764 warn "cleared package $pkg\n";#d#
3765} 3901}
3766 3902
3767sub do_reload_perl() { 3903sub do_reload_perl() {
3768 # can/must only be called in main 3904 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
3771 return; 3907 return;
3772 } 3908 }
3773 3909
3774 return if $RELOAD++; 3910 return if $RELOAD++;
3775 3911
3776 my $t1 = AE::time; 3912 my $t1 = AE::time;
3777 3913
3778 while ($RELOAD) { 3914 while ($RELOAD) {
3779 warn "reloading..."; 3915 cf::get_slot 0.1, -1, "reload_perl";
3916 info "perl_reload: reloading...";
3780 3917
3781 warn "entering sync_job"; 3918 trace "perl_reload: entering sync_job";
3782 3919
3783 cf::sync_job { 3920 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3921 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3922
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3923 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3925 %EXT_CORO = ();
3801 3926
3802 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3803 %COMMAND = (); 3928 %COMMAND = ();
3804 3929
3805 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 3931 %EXTCMD = ();
3807 %EXTICMD = (); 3932 %EXTICMD = ();
3808 3933
3809 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3812 3937
3813 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3939 eval {
3815 $cb->($pkg); 3940 $cb->($pkg);
3816 1 3941 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3818 } 3943 }
3819 3944
3820 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3821 clear_package $pkg; 3946 clear_package $pkg;
3822 } 3947 }
3823 3948
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3952
3828 warn "... unloading $k"; 3953 trace "... unloading $k";
3829 delete $INC{$k}; 3954 delete $INC{$k};
3830 3955
3831 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3833 3958
… …
3836 } 3961 }
3837 3962
3838 clear_package $k; 3963 clear_package $k;
3839 } 3964 }
3840 3965
3841 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3967 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3969
3845 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3973
3849 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3975 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3852 3977
3853 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3854 3979
3855 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3856 require cf; 3981 require cf;
3857 cf::_connect_to_perl_1; 3982 cf::_connect_to_perl_1;
3858 3983
3859 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 3985 cf::reload_config;
3861 3986
3862 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 3988 cf::load_extensions;
3864 3989
3865 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3872 } 3997 }
3873 3998
3874 warn "running post_init jobs"; 3999 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4000
3877 warn "leaving sync_job"; 4001 trace "perl_reload: leaving sync_job";
3878 4002
3879 1 4003 1
3880 } or do { 4004 } or do {
3881 warn $@; 4005 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4007 };
3884 4008
3885 warn "reloaded";
3886 --$RELOAD; 4009 --$RELOAD;
3887 } 4010 }
3888 4011
3889 $t1 = AE::time - $t1; 4012 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4013 info "perl_reload: completed in ${t1}s\n";
3891}; 4014};
3892 4015
3893our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3894 4017
3895sub reload_perl() { 4018sub reload_perl() {
… …
3916 reload_perl; 4039 reload_perl;
3917 }; 4040 };
3918 } 4041 }
3919}; 4042};
3920 4043
3921unshift @INC, $LIBDIR; 4044#############################################################################
3922 4045
3923my $bug_warning = 0; 4046my $bug_warning = 0;
3924 4047
3925our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3927 4050
3928sub wait_for_tick { 4051sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4053
3931 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4056 $signal->wait;
3934} 4057}
3935 4058
3936sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4061
3939 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4064 $signal->wait;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4080 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4081 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4082 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4083 or error "ERROR: unable to write runtime file: $!";
3961 }; 4084 };
3962 } 4085 }
3963 4086
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4088 $sig->send;
… …
3973 4096
3974 if (0) { 4097 if (0) {
3975 if ($NEXT_TICK) { 4098 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4099 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4101 debug "jitter $JITTER\n";#d#
3979 } 4102 }
3980 } 4103 }
3981} 4104}
3982 4105
3983{ 4106{
… …
4028 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4153 undef $AnyEvent::AIO::WATCHER;
4031} 4154}
4032 4155
4033my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
4034 4158
4035sub _log_backtrace { 4159sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
4037 4161
4038 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
4039 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4170 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4171 my $perl_bt = Carp::longmess $msg;
4044 async { 4172 async {
4045 $Coro::current->{desc} = "abt $msg"; 4173 $Coro::current->{desc} = "abt $msg";
4046 4174
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4195 --$_log_backtrace;
4068 }; 4196 };
4069 } else { 4197 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4200 }
4073} 4201}
4074 4202
4075# load additional modules 4203# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4204require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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