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.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 112
113our $OUTPUT_RATE_MIN = 3000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 114our $OUTPUT_RATE_MAX = 1000000;
115 115
116our $MAX_LINKS = 32; # how many chained exits to follow 116our $MAX_LINKS = 32; # how many chained exits to follow
… …
252 252
253=back 253=back
254 254
255=cut 255=cut
256 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
257$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 264 my $msg = join "", @_;
259 265
260 $msg .= "\n" 266 $msg .= "\n"
261 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
262 268
263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264 270
265 LOG llevError, $msg; 271 LOG llevWarn, $msg;
266}; 272};
267 273
268$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
270 276
271 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
272 278
273 if (in_main) {#d# 279 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 281 return;#d#
276 }#d# 282 }#d#
277 283
278 # kill coroutine otherwise 284 # kill coroutine otherwise
279 Coro::terminate 285 Coro::terminate
… …
512=cut 518=cut
513 519
514sub sync_job(&) { 520sub sync_job(&) {
515 my ($job) = @_; 521 my ($job) = @_;
516 522
517 if ($Coro::current == $Coro::main) { 523 if (in_main) {
518 my $time = AE::time; 524 my $time = AE::time;
519 525
520 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
522 528
523 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
524 530
525 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
526 532
527 my $busy = 1; 533 my $busy = 1;
528 my @res; 534 my @res;
529 535
530 (async { 536 (async {
531 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 538 @res = eval { $job->() };
533 warn $@ if $@; 539 error $@ if $@;
534 undef $busy; 540 undef $busy;
535 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
536 542
537 while ($busy) { 543 while ($busy) {
538 if (Coro::nready) { 544 if (Coro::nready) {
… …
651within each server. 657within each server.
652 658
653=cut 659=cut
654 660
655sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
656 my ($name) = @_; 665 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
658 667
659 eval { 668 eval {
660 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
670} 679}
671 680
672our $DB; 681our $DB;
673 682
674sub db_init { 683sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
677 };
678} 685}
679 686
680sub db_get($$) { 687sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
682 689
683 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
684 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
685 694
686 $! ? () 695 $! ? ()
687 : $data 696 : $data
688 }
689} 697}
690 698
691sub db_put($$$) { 699sub db_put($$$) {
692 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
749 757
750 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 759 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
753 761
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 763
756 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
759 767
… …
769 777
770=cut 778=cut
771 779
772sub datalog($@) { 780sub datalog($@) {
773 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 783}
776 784
777=back 785=back
778 786
779=cut 787=cut
… …
974 982
975 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 985
978 } elsif (ref $type) { 986 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
980 988
981 } else { 989 } else {
982 shift @arg; 990 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
984 } 992 }
985 } 993 }
986} 994}
987 995
988sub _object_attach { 996sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
999 } 1007 }
1000 1008
1001 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
1002 } else { 1010 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1012 }
1005 1013
1006 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1007} 1015}
1008 1016
… …
1067 1075
1068 for (@$callbacks) { 1076 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1070 1078
1071 if ($@) { 1079 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1081 override;
1075 } 1082 }
1076 1083
1077 return 1 if $override; 1084 return 1 if $override;
1078 } 1085 }
… …
1157 for (@$attach) { 1164 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1160 } 1167 }
1161 } else { 1168 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1170 }
1164 } 1171 }
1165} 1172}
1166 1173
1167cf::attachable->attach ( 1174cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1195 1202
1196 sync_job { 1203 sync_job {
1197 if (length $$rdata) { 1204 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1207 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1208 if $VERBOSE_IO;
1202 1209
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1229 1236
1230 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1239 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1234 } 1241 }
1235 } else { 1242 } else {
1236 aio_unlink $filename; 1243 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1238 } 1245 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1270 $av = $st->{objs};
1264 } 1271 }
1265 1272
1266 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1275 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1276 if $VERBOSE_IO;
1270 1277
1271 ($data, $av) 1278 ($data, $av)
1272} 1279}
1273 1280
… …
1366 1373
1367 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1375 if $reply;
1369 1376
1370 } else { 1377 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1379 }
1373 1380
1374 cf::override; 1381 cf::override;
1375 }, 1382 },
1376); 1383);
… …
1387 1394
1388 $grp 1395 $grp
1389} 1396}
1390 1397
1391sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1392 cf::sync_job { 1401 cf::sync_job {
1393 my %todo; 1402 my %todo;
1394 1403
1395 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1405 next unless -r $path;
… …
1414 1423
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1426
1418 $ext{source} = 1427 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1421 . $source 1430 . $source
1422 . "\n};\n1"; 1431 . "\n};\n1";
1423 1432
1424 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1446 next ext
1438 unless exists $done{$_}; 1447 unless exists $done{$_};
1439 } 1448 }
1440 1449
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1451
1443 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1444 1453
1445 if (length $@) { 1454 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1447 1457
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1450 1460
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1463 } else {
1454 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1456 $progress = 1; 1466 $progress = 1;
1457 1467
1458 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1469 unless $active;
1460 } 1470 }
1461 } 1471 }
1462 1472
1463 unless ($progress) { 1473 unless ($progress) {
… …
1839 1849
1840sub register { 1850sub register {
1841 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1852 my $pkg = caller;
1843 1853
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1855
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1857}
1849 1858
… …
2183} 2192}
2184 2193
2185sub find_sync { 2194sub find_sync {
2186 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2187 2196
2188 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2189} 2201}
2190 2202
2191sub do_load_sync { 2203sub do_load_sync {
2192 my ($map) = @_; 2204 my ($map) = @_;
2193 2205
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2196 2208
2197 cf::sync_job { $map->load }; 2209 $map->load;
2198} 2210}
2199 2211
2200our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2202 2214
… …
2314 2326
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2328
2317 return if $self->players; 2329 return if $self->players;
2318 2330
2319 warn "resetting map ", $self->path, "\n"; 2331 cf::trace "resetting map ", $self->path, "\n";
2320 2332
2321 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2322 2334
2323 # need to save uniques path 2335 # need to save uniques path
2324 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
… …
2689 2701
2690sub cf::object::player::goto { 2702sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2704
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2709 }
2698 2710
2699 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2863
2852 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2865 $self->leave_link;
2854 } 2866 }
2855 })->prio (1); 2867 })->prio (1);
2856} 2868}
2857 2869
… …
3170 3182
3171 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3184 if $reply;
3173 3185
3174 } else { 3186 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3188 }
3177 3189
3178 cf::override; 3190 cf::override;
3179 }, 3191 },
3180); 3192);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3265) { 3277) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3280 for @funs;
3270} 3281}
3271 3282
… …
3310 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3323 }
3313 3324
3314 if ($@) { 3325 if ($@) {
3315 warn "$@"; 3326 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3318 } 3329 }
3319 3330
3320 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3321} 3332}
3322 3333
… …
3347=cut 3358=cut
3348 3359
3349############################################################################# 3360#############################################################################
3350# the server's init and main functions 3361# the server's init and main functions
3351 3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3405
3352sub load_facedata($) { 3406sub load_facedata($) {
3353 my ($path) = @_; 3407 my ($path) = @_;
3354 3408
3355 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3356 # for this (global event?) 3410 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3412
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3414
3361 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3362 3416
3363 my $facedata; 3417 my $facedata;
3364 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3365 or die "$path: $!"; 3419 or die "$path: $!";
3366 3420
… …
3400 3454
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3458 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3460 }
3407 3461
3408 cf::cede_to_tick; 3462 cf::cede_to_tick;
3409 } 3463 }
3410 } 3464 }
… …
3428 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429 3483
3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3432 } else { 3486 } else {
3433 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3434 } 3488 }
3435 3489
3436 cf::cede_to_tick; 3490 cf::cede_to_tick;
3437 } 3491 }
3438 } 3492 }
3439 3493
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441 3495
3442 1 3496 1
3443} 3497}
3444
3445cf::global->attach (on_resource_update => sub {
3446 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450 my $sound = $soundconf->{compat}[$_]
3451 or next;
3452
3453 my $face = cf::face::find "sound/$sound->[1]";
3454 cf::sound::set $sound->[0] => $face;
3455 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456 }
3457
3458 while (my ($k, $v) = each %{$soundconf->{event}}) {
3459 my $face = cf::face::find "sound/$v";
3460 cf::sound::set $k => $face;
3461 }
3462 }
3463});
3464 3498
3465register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3466 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3467 3501
3468 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3507sub reload_treasures { 3541sub reload_treasures {
3508 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3509 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3510} 3544}
3511 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3512sub reload_resources { 3569sub reload_resources {
3513 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3514 3571
3515 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3516 reload_archetypes; 3574 reload_archetypes;
3517 reload_regions; 3575 reload_regions;
3518 reload_treasures; 3576 reload_treasures;
3519 3577
3520 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3521} 3579}
3522 3580
3523sub reload_config { 3581sub reload_config {
3524 warn "reloading config file...\n"; 3582 trace "reloading config file...\n";
3525 3583
3526 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3527 or return; 3585 or return;
3528 3586
3529 local $/; 3587 local $/;
… …
3540 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3541 }; 3599 };
3542 warn $@ if $@; 3600 warn $@ if $@;
3543 } 3601 }
3544 3602
3545 warn "finished reloading resource files\n"; 3603 trace "finished reloading resource files\n";
3546} 3604}
3547 3605
3548sub pidfile() { 3606sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3563 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3564 print $fh $$; 3622 print $fh $$;
3565} 3623}
3566 3624
3567sub main_loop { 3625sub main_loop {
3568 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3569 if (1) { 3627 if (1) {
3570 EV::loop; 3628 EV::loop;
3571 } 3629 }
3572 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3574} 3632}
3575 3633
3576sub main { 3634sub main {
3577 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3578 3636
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583 3641
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585 3643
… …
3593 }; 3651 };
3594 3652
3595 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3596 3654
3597 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3598 cf::init_experience; 3658 cf::init_experience;
3599 cf::init_anim; 3659 cf::init_anim;
3600 cf::init_attackmess; 3660 cf::init_attackmess;
3601 cf::init_dynamic; 3661 cf::init_dynamic;
3602 3662
… …
3625 3685
3626 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3627 }; 3687 };
3628 3688
3629 cf::object::thawer::errors_are_fatal 0; 3689 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n"; 3690 info "parse errors in files are no longer fatal from this point on.\n";
3631 3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3632 main_loop; 3697 goto &main_loop;
3633} 3698}
3634 3699
3635############################################################################# 3700#############################################################################
3636# initialisation and cleanup 3701# initialisation and cleanup
3637 3702
… …
3676 or return; 3741 or return;
3677 3742
3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679 and return; 3744 and return;
3680 3745
3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682 3747
3683 1 3748 1
3684} 3749}
3685 3750
3686our $uuid_lock; 3751our $uuid_lock;
… …
3698 or return; 3763 or return;
3699 3764
3700 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3701 3766
3702 unless ($value) { 3767 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3704 return; 3769 return;
3705 } 3770 }
3706 3771
3707 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0; 3773 $uuid_skip = 0;
… …
3718 or return; 3783 or return;
3719 3784
3720 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3721 and return; 3786 and return;
3722 3787
3723 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3724 3789
3725 1 3790 1
3726 3791
3727} 3792}
3728 3793
… …
3734} 3799}
3735 3800
3736sub emergency_save() { 3801sub emergency_save() {
3737 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3738 3803
3739 warn "emergency_perl_save: enter\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3740 3810
3741 cf::sync_job { 3811 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746 3813
3747 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3748 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3749 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3750 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3751 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3752 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3753 $pl->valid or next; 3820 $pl->valid or next;
3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755 $pl->save; 3822 $pl->save;
3756 } 3823 }
3757 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3758 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3759 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3760 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3761 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3762 $map->valid or next; 3831 $map->valid or next;
3763 $map->save; 3832 $map->save;
3764 } 3833 }
3765 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3766 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3767 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3768 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3769 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3770 3841
3771 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1; 3843 write_uuid_sync 1;
3773 warn "emergency_perl_save: end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3774 }; 3864 };
3775 3865
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3781 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3782} 3867}
3783 3868
3784sub post_cleanup { 3869sub post_cleanup {
3785 my ($make_core) = @_; 3870 my ($make_core) = @_;
3786 3871
3872 IO::AIO::flush;
3873
3787 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3788 if $make_core; 3875 if $make_core;
3789 3876
3790 my $fh = pidfile; 3877 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3792} 3879}
… …
3817} 3904}
3818 3905
3819sub do_reload_perl() { 3906sub do_reload_perl() {
3820 # can/must only be called in main 3907 # can/must only be called in main
3821 if (in_main) { 3908 if (in_main) {
3822 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3823 return; 3910 return;
3824 } 3911 }
3825 3912
3826 return if $RELOAD++; 3913 return if $RELOAD++;
3827 3914
3828 my $t1 = AE::time; 3915 my $t1 = AE::time;
3829 3916
3830 while ($RELOAD) { 3917 while ($RELOAD) {
3831 warn "reloading..."; 3918 info "reloading...";
3832 3919
3833 warn "entering sync_job"; 3920 trace "entering sync_job";
3834 3921
3835 cf::sync_job { 3922 cf::sync_job {
3836 cf::write_runtime_sync; # external watchdog should not bark
3837 cf::emergency_save; 3923 cf::emergency_save;
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 3924
3840 warn "syncing database to disk";
3841 BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843 # if anything goes wrong in here, we should simply crash as we already saved
3844
3845 warn "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 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3851 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3852 %EXT_CORO = (); 3927 %EXT_CORO = ();
3853 3928
3854 warn "removing commands"; 3929 trace "removing commands";
3855 %COMMAND = (); 3930 %COMMAND = ();
3856 3931
3857 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3858 %EXTCMD = (); 3933 %EXTCMD = ();
3859 %EXTICMD = (); 3934 %EXTICMD = ();
3860 3935
3861 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3862 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3863 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3864 3939
3865 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3866 eval { 3941 eval {
3867 $cb->($pkg); 3942 $cb->($pkg);
3868 1 3943 1
3869 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3870 } 3945 }
3871 3946
3872 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3873 clear_package $pkg; 3948 clear_package $pkg;
3874 } 3949 }
3875 3950
3876 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879 3954
3880 warn "... unloading $k"; 3955 trace "... unloading $k";
3881 delete $INC{$k}; 3956 delete $INC{$k};
3882 3957
3883 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3885 3960
… …
3888 } 3963 }
3889 3964
3890 clear_package $k; 3965 clear_package $k;
3891 } 3966 }
3892 3967
3893 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3894 clear_package "safe::$_" 3969 clear_package "safe::$_"
3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3896 3971
3897 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3898 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900 3975
3901 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3902 # and global variables created in xs 3977 # and global variables created in xs
3903 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3904 3979
3905 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3906 3981
3907 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3908 require cf; 3983 require cf;
3909 cf::_connect_to_perl_1; 3984 cf::_connect_to_perl_1;
3910 3985
3911 warn "loading config and database again"; 3986 trace "loading config and database again";
3912 cf::reload_config; 3987 cf::reload_config;
3913 3988
3914 warn "loading extensions"; 3989 trace "loading extensions";
3915 cf::load_extensions; 3990 cf::load_extensions;
3916 3991
3917 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3918 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3919 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3920 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3921 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3922 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3923 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3924 } 3999 }
3925 4000
3926 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3928 4003
3929 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3930 4005
3931 1 4006 1
3932 } or do { 4007 } or do {
3933 warn $@; 4008 error $@;
3934 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3935 }; 4010 };
3936 4011
3937 warn "reloaded"; 4012 info "reloaded";
3938 --$RELOAD; 4013 --$RELOAD;
3939 } 4014 }
3940 4015
3941 $t1 = AE::time - $t1; 4016 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3943}; 4018};
3944 4019
3945our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3946 4021
3947sub reload_perl() { 4022sub reload_perl() {
… …
3968 reload_perl; 4043 reload_perl;
3969 }; 4044 };
3970 } 4045 }
3971}; 4046};
3972 4047
3973unshift @INC, $LIBDIR; 4048#############################################################################
3974 4049
3975my $bug_warning = 0; 4050my $bug_warning = 0;
3976 4051
3977our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3978our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
… …
4007 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4009 Coro::async_pool { 4084 Coro::async_pool {
4010 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
4011 write_runtime_sync 4086 write_runtime_sync
4012 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
4013 }; 4088 };
4014 } 4089 }
4015 4090
4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017 $sig->send; 4092 $sig->send;
… …
4025 4100
4026 if (0) { 4101 if (0) {
4027 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
4028 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
4031 } 4106 }
4032 } 4107 }
4033} 4108}
4034 4109
4035{ 4110{

Diff Legend

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