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.525 by root, Wed Apr 21 03:34:26 2010 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 2010 UTC

… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
249 252
250=back 253=back
251 254
252=cut 255=cut
253 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
254$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 264 my $msg = join "", @_;
256 265
257 $msg .= "\n" 266 $msg .= "\n"
258 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
259 268
260 $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;
261 270
262 LOG llevError, $msg; 271 LOG llevWarn, $msg;
263}; 272};
264 273
265$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
267 276
268 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
269 278
270 if (in_main) {#d# 279 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 281 return;#d#
273 }#d# 282 }#d#
274 283
275 # kill coroutine otherwise 284 # kill coroutine otherwise
276 Coro::terminate 285 Coro::terminate
… …
509=cut 518=cut
510 519
511sub sync_job(&) { 520sub sync_job(&) {
512 my ($job) = @_; 521 my ($job) = @_;
513 522
514 if ($Coro::current == $Coro::main) { 523 if (in_main) {
515 my $time = AE::time; 524 my $time = AE::time;
516 525
517 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
519 528
520 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
521 530
522 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
523 532
524 my $busy = 1; 533 my $busy = 1;
525 my @res; 534 my @res;
526 535
527 (async { 536 (async {
528 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 538 @res = eval { $job->() };
530 warn $@ if $@; 539 error $@ if $@;
531 undef $busy; 540 undef $busy;
532 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
533 542
534 while ($busy) { 543 while ($busy) {
535 if (Coro::nready) { 544 if (Coro::nready) {
… …
648within each server. 657within each server.
649 658
650=cut 659=cut
651 660
652sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
653 my ($name) = @_; 665 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
655 667
656 eval { 668 eval {
657 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
667} 679}
668 680
669our $DB; 681our $DB;
670 682
671sub db_init { 683sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
674 };
675} 685}
676 686
677sub db_get($$) { 687sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
679 689
680 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
681 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
682 694
683 $! ? () 695 $! ? ()
684 : $data 696 : $data
685 }
686} 697}
687 698
688sub db_put($$$) { 699sub db_put($$$) {
689 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 757
747 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 759 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
750 761
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 763
753 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
756 767
… …
766 777
767=cut 778=cut
768 779
769sub datalog($@) { 780sub datalog($@) {
770 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 783}
773 784
774=back 785=back
775 786
776=cut 787=cut
… …
971 982
972 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 985
975 } elsif (ref $type) { 986 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
977 988
978 } else { 989 } else {
979 shift @arg; 990 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
981 } 992 }
982 } 993 }
983} 994}
984 995
985sub _object_attach { 996sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
996 } 1007 }
997 1008
998 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
999 } else { 1010 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1012 }
1002 1013
1003 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1004} 1015}
1005 1016
… …
1064 1075
1065 for (@$callbacks) { 1076 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1067 1078
1068 if ($@) { 1079 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1081 override;
1072 } 1082 }
1073 1083
1074 return 1 if $override; 1084 return 1 if $override;
1075 } 1085 }
… …
1154 for (@$attach) { 1164 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1157 } 1167 }
1158 } else { 1168 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1170 }
1161 } 1171 }
1162} 1172}
1163 1173
1164cf::attachable->attach ( 1174cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1192 1202
1193 sync_job { 1203 sync_job {
1194 if (length $$rdata) { 1204 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1198 1209
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1225 1236
1226 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1239 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1230 } 1241 }
1231 } else { 1242 } else {
1232 aio_unlink $filename; 1243 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1234 } 1245 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1270 $av = $st->{objs};
1260 } 1271 }
1261 1272
1262 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1265 1277
1266 ($data, $av) 1278 ($data, $av)
1267} 1279}
1268 1280
1269=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1361 1373
1362 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1375 if $reply;
1364 1376
1365 } else { 1377 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1379 }
1368 1380
1369 cf::override; 1381 cf::override;
1370 }, 1382 },
1371); 1383);
… …
1382 1394
1383 $grp 1395 $grp
1384} 1396}
1385 1397
1386sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1387 cf::sync_job { 1401 cf::sync_job {
1388 my %todo; 1402 my %todo;
1389 1403
1390 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1405 next unless -r $path;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1446 next ext
1433 unless exists $done{$_}; 1447 unless exists $done{$_};
1434 } 1448 }
1435 1449
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1451
1438 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1439 1453
1440 if (length $@) { 1454 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1442 1456
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1445 1459
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1462 } else {
1449 $done{$k} = delete $todo{$k}; 1463 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1464 push @EXTS, $v->{pkg};
1451 $progress = 1; 1465 $progress = 1;
1452 1466
1453 warn "$v->{base}: extension inactive.\n" 1467 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1468 unless $active;
1455 } 1469 }
1456 } 1470 }
1457 1471
1458 unless ($progress) { 1472 unless ($progress) {
… …
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1645
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1647 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1638 1651
1639 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
2162 or next; 2175 or next;
2163 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2164 or next; 2177 or next;
2165 $neigh->load; 2178 $neigh->load;
2166 2179
2180 # now find the diagonal neighbours
2167 push @neigh, 2181 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2184 }
2171 2185
… …
2178} 2192}
2179 2193
2180sub find_sync { 2194sub find_sync {
2181 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2182 2196
2183 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
2184} 2201}
2185 2202
2186sub do_load_sync { 2203sub do_load_sync {
2187 my ($map) = @_; 2204 my ($map) = @_;
2188 2205
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2191 2208
2192 cf::sync_job { $map->load }; 2209 $map->load;
2193} 2210}
2194 2211
2195our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2197 2214
… …
2309 2326
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2328
2312 return if $self->players; 2329 return if $self->players;
2313 2330
2314 warn "resetting map ", $self->path, "\n"; 2331 cf::trace "resetting map ", $self->path, "\n";
2315 2332
2316 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2317 2334
2318 # need to save uniques path 2335 # need to save uniques path
2319 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
… …
2583 2600
2584Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2585 2602
2586The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2589map. 2606map.
2590 2607
2591Will never block. 2608Will never block.
2592 2609
2593=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2615 my ($self) = @_; 2632 my ($self) = @_;
2616 2633
2617 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2618 2635
2636 ++$self->{_link_recursion};
2637
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2639
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2623 2642
… …
2654 $map->load_neighbours; 2673 $map->load_neighbours;
2655 2674
2656 return unless $self->contr->active; 2675 return unless $self->contr->active;
2657 2676
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2660 2679 # entering was successful
2680 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive 2682 $self->activate_recursive;
2663 unless exists $self->{_link_pos}; # maybe we re in-flight again 2683 }
2664}
2665 2684
2685}
2686
2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667 2688
2668Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2669her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2670that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2671the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2678 2699
2679our $GOTOGEN; 2700our $GOTOGEN;
2680 2701
2681sub cf::object::player::goto { 2702sub cf::object::player::goto {
2682 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2683 2710
2684 # 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
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2713
2687 $self->enter_link; 2714 $self->enter_link;
… …
2711 my $map = eval { 2738 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2713 2740
2714 if ($map) { 2741 if ($map) {
2715 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2744 } else {
2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719 } 2746 }
2720 2747
2721 $map 2748 $map
… …
2729 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2732 } 2759 }
2733 2760
2734 $done->() if $done; 2761 $done->($self) if $done;
2735 })->prio (1); 2762 })->prio (1);
2736} 2763}
2737 2764
2738=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2739 2766
… …
2832 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "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. "
2834 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2836 2863
2837 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 2865 $self->leave_link;
2839 } 2866 }
2840 })->prio (1); 2867 })->prio (1);
2841} 2868}
2842 2869
… …
3155 3182
3156 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3157 if $reply; 3184 if $reply;
3158 3185
3159 } else { 3186 } else {
3160 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";
3161 } 3188 }
3162 3189
3163 cf::override; 3190 cf::override;
3164 }, 3191 },
3165); 3192);
… …
3295 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3324 }
3298 3325
3299 if ($@) { 3326 if ($@) {
3300 warn "$@"; 3327 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3303 } 3330 }
3304 3331
3305 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3306} 3333}
3307 3334
… …
3341 # for this (global event?) 3368 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3343 3370
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3372
3346 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3347 3374
3348 my $facedata; 3375 my $facedata;
3349 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3350 or die "$path: $!"; 3377 or die "$path: $!";
3351 3378
… …
3385 3412
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3416 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3418 }
3392 3419
3393 cf::cede_to_tick; 3420 cf::cede_to_tick;
3394 } 3421 }
3395 } 3422 }
… …
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3441
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3417 } else { 3444 } else {
3418 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3419 } 3446 }
3420 3447
3421 cf::cede_to_tick; 3448 cf::cede_to_tick;
3422 } 3449 }
3423 } 3450 }
3424 3451
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3453
3427 1 3454 1
3428} 3455}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3456
3450register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3452 3459
3453 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3492sub reload_treasures { 3499sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3495} 3502}
3496 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3497sub reload_resources { 3527sub reload_resources {
3498 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3499 3529
3500 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3501 reload_archetypes; 3532 reload_archetypes;
3502 reload_regions; 3533 reload_regions;
3503 reload_treasures; 3534 reload_treasures;
3504 3535
3505 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3506} 3537}
3507 3538
3508sub reload_config { 3539sub reload_config {
3509 warn "reloading config file...\n"; 3540 trace "reloading config file...\n";
3510 3541
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3512 or return; 3543 or return;
3513 3544
3514 local $/; 3545 local $/;
3515 *CFG = YAML::XS::Load scalar <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3516 3547
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3549
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3552
3522 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
… …
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3557 };
3527 warn $@ if $@; 3558 warn $@ if $@;
3528 } 3559 }
3529 3560
3530 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3531} 3562}
3532 3563
3533sub pidfile() { 3564sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
… …
3548 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3549 print $fh $$; 3580 print $fh $$;
3550} 3581}
3551 3582
3552sub main_loop { 3583sub main_loop {
3553 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3554 if (1) { 3585 if (1) {
3555 EV::loop; 3586 EV::loop;
3556 } 3587 }
3557 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3559} 3590}
3560 3591
3561sub main { 3592sub main {
3562 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
… …
3610 3641
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3612 }; 3643 };
3613 3644
3614 cf::object::thawer::errors_are_fatal 0; 3645 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3646 info "parse errors in files are no longer fatal from this point on.\n";
3616 3647
3617 main_loop; 3648 main_loop;
3618} 3649}
3619 3650
3620############################################################################# 3651#############################################################################
… …
3661 or return; 3692 or return;
3662 3693
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3695 and return;
3665 3696
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3698
3668 1 3699 1
3669} 3700}
3670 3701
3671our $uuid_lock; 3702our $uuid_lock;
… …
3683 or return; 3714 or return;
3684 3715
3685 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3686 3717
3687 unless ($value) { 3718 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3689 return; 3720 return;
3690 } 3721 }
3691 3722
3692 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 3724 $uuid_skip = 0;
… …
3703 or return; 3734 or return;
3704 3735
3705 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3706 and return; 3737 and return;
3707 3738
3708 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3709 3740
3710 1 3741 1
3711 3742
3712} 3743}
3713 3744
… …
3719} 3750}
3720 3751
3721sub emergency_save() { 3752sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3723 3754
3724 warn "emergency_perl_save: enter\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3725 3761
3726 cf::sync_job { 3762 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731
3732 # use a peculiar iteration method to avoid tripping on perl 3763 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 3764 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 3765 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 3766 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 3767 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 3768 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 3769 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3770 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 3771 $pl->save;
3741 } 3772 }
3742 warn "emergency_perl_save: end player save\n"; 3773 info "emergency_perl_save: end player save\n";
3743 3774
3744 warn "emergency_perl_save: begin map save\n"; 3775 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 3776 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 3777 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 3778 $map->valid or next;
3748 $map->save; 3779 $map->save;
3749 } 3780 }
3750 warn "emergency_perl_save: end map save\n"; 3781 info "emergency_perl_save: end map save\n";
3751 3782
3752 warn "emergency_perl_save: begin database checkpoint\n"; 3783 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 3784 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 3785 info "emergency_perl_save: end database checkpoint\n";
3755 3786
3756 warn "emergency_perl_save: begin write uuid\n"; 3787 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 3788 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 3789 info "emergency_perl_save: end write uuid\n";
3759 }; 3790 };
3760 3791
3761 warn "emergency_perl_save: starting sync()\n"; 3792 info "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub { 3793 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n"; 3794 info "emergency_perl_save: finished sync()\n";
3764 }; 3795 };
3765 3796
3766 warn "emergency_perl_save: leave\n"; 3797 info "emergency_perl_save: leave\n";
3767} 3798}
3768 3799
3769sub post_cleanup { 3800sub post_cleanup {
3770 my ($make_core) = @_; 3801 my ($make_core) = @_;
3771 3802
3772 warn Carp::longmess "post_cleanup backtrace" 3803 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 3804 if $make_core;
3774 3805
3775 my $fh = pidfile; 3806 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 3807 unlink $PIDFILE if <$fh> == $$;
3777} 3808}
… …
3802} 3833}
3803 3834
3804sub do_reload_perl() { 3835sub do_reload_perl() {
3805 # can/must only be called in main 3836 # can/must only be called in main
3806 if (in_main) { 3837 if (in_main) {
3807 warn "can only reload from main coroutine"; 3838 error "can only reload from main coroutine";
3808 return; 3839 return;
3809 } 3840 }
3810 3841
3811 return if $RELOAD++; 3842 return if $RELOAD++;
3812 3843
3813 my $t1 = AE::time; 3844 my $t1 = AE::time;
3814 3845
3815 while ($RELOAD) { 3846 while ($RELOAD) {
3816 warn "reloading..."; 3847 info "reloading...";
3817 3848
3818 warn "entering sync_job"; 3849 trace "entering sync_job";
3819 3850
3820 cf::sync_job { 3851 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark 3852 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 3853 cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark 3854 cf::write_runtime_sync; # external watchdog should not bark
3824 3855
3825 warn "syncing database to disk"; 3856 trace "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV; 3857 BDB::db_env_txn_checkpoint $DB_ENV;
3827 3858
3828 # if anything goes wrong in here, we should simply crash as we already saved 3859 # if anything goes wrong in here, we should simply crash as we already saved
3829 3860
3830 warn "flushing outstanding aio requests"; 3861 trace "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) { 3862 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3863 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 } 3864 }
3834 3865
3835 warn "cancelling all extension coros"; 3866 trace "cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 3867 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 3868 %EXT_CORO = ();
3838 3869
3839 warn "removing commands"; 3870 trace "removing commands";
3840 %COMMAND = (); 3871 %COMMAND = ();
3841 3872
3842 warn "removing ext/exti commands"; 3873 trace "removing ext/exti commands";
3843 %EXTCMD = (); 3874 %EXTCMD = ();
3844 %EXTICMD = (); 3875 %EXTICMD = ();
3845 3876
3846 warn "unloading/nuking all extensions"; 3877 trace "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 3878 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 3879 trace "... unloading $pkg";
3849 3880
3850 if (my $cb = $pkg->can ("unload")) { 3881 if (my $cb = $pkg->can ("unload")) {
3851 eval { 3882 eval {
3852 $cb->($pkg); 3883 $cb->($pkg);
3853 1 3884 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 3885 } or error "$pkg unloaded, but with errors: $@";
3855 } 3886 }
3856 3887
3857 warn "... clearing $pkg"; 3888 trace "... clearing $pkg";
3858 clear_package $pkg; 3889 clear_package $pkg;
3859 } 3890 }
3860 3891
3861 warn "unloading all perl modules loaded from $LIBDIR"; 3892 trace "unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 3893 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3894 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 3895
3865 warn "... unloading $k"; 3896 trace "... unloading $k";
3866 delete $INC{$k}; 3897 delete $INC{$k};
3867 3898
3868 $k =~ s/\.pm$//; 3899 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 3900 $k =~ s/\//::/g;
3870 3901
… …
3873 } 3904 }
3874 3905
3875 clear_package $k; 3906 clear_package $k;
3876 } 3907 }
3877 3908
3878 warn "getting rid of safe::, as good as possible"; 3909 trace "getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 3910 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3911 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 3912
3882 warn "unloading cf.pm \"a bit\""; 3913 trace "unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 3914 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3915 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 3916
3886 # don't, removes xs symbols, too, 3917 # don't, removes xs symbols, too,
3887 # and global variables created in xs 3918 # and global variables created in xs
3888 #clear_package __PACKAGE__; 3919 #clear_package __PACKAGE__;
3889 3920
3890 warn "unload completed, starting to reload now"; 3921 info "unload completed, starting to reload now";
3891 3922
3892 warn "reloading cf.pm"; 3923 trace "reloading cf.pm";
3893 require cf; 3924 require cf;
3894 cf::_connect_to_perl_1; 3925 cf::_connect_to_perl_1;
3895 3926
3896 warn "loading config and database again"; 3927 trace "loading config and database again";
3897 cf::reload_config; 3928 cf::reload_config;
3898 3929
3899 warn "loading extensions"; 3930 trace "loading extensions";
3900 cf::load_extensions; 3931 cf::load_extensions;
3901 3932
3902 if ($REATTACH_ON_RELOAD) { 3933 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 3934 trace "reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 3935 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 3936 trace "reattaching attachments to maps";
3906 reattach $_ for values %MAP; 3937 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 3938 trace "reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 3939 reattach $_ for values %PLAYER;
3909 } 3940 }
3910 3941
3911 warn "running post_init jobs"; 3942 trace "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT; 3943 (pop @POST_INIT)->(1) while @POST_INIT;
3913 3944
3914 warn "leaving sync_job"; 3945 trace "leaving sync_job";
3915 3946
3916 1 3947 1
3917 } or do { 3948 } or do {
3918 warn $@; 3949 error $@;
3919 cf::cleanup "error while reloading, exiting."; 3950 cf::cleanup "error while reloading, exiting.";
3920 }; 3951 };
3921 3952
3922 warn "reloaded"; 3953 info "reloaded";
3923 --$RELOAD; 3954 --$RELOAD;
3924 } 3955 }
3925 3956
3926 $t1 = AE::time - $t1; 3957 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 3958 info "reload completed in ${t1}s\n";
3928}; 3959};
3929 3960
3930our $RELOAD_WATCHER; # used only during reload 3961our $RELOAD_WATCHER; # used only during reload
3931 3962
3932sub reload_perl() { 3963sub reload_perl() {
… …
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4023 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4024 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4025 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4026 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4027 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4028 or error "ERROR: unable to write runtime file: $!";
3998 }; 4029 };
3999 } 4030 }
4000 4031
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4032 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4033 $sig->send;
… …
4010 4041
4011 if (0) { 4042 if (0) {
4012 if ($NEXT_TICK) { 4043 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4044 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4045 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4046 debug "jitter $JITTER\n";#d#
4016 } 4047 }
4017 } 4048 }
4018} 4049}
4019 4050
4020{ 4051{

Diff Legend

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