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.524 by root, Sun Apr 18 07:08:07 2010 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 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;
… …
1409 1423
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1426
1413 $ext{source} = 1427 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1416 . $source 1430 . $source
1417 . "\n};\n1"; 1431 . "\n};\n1";
1418 1432
1419 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
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";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1442 1457
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1445 1460
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1463 } else {
1449 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1451 $progress = 1; 1466 $progress = 1;
1452 1467
1453 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1469 unless $active;
1455 } 1470 }
1456 } 1471 }
1457 1472
1458 unless ($progress) { 1473 unless ($progress) {
… …
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1646
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1648 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1638 1652
1639 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
2162 or next; 2176 or next;
2163 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2164 or next; 2178 or next;
2165 $neigh->load; 2179 $neigh->load;
2166 2180
2181 # now find the diagonal neighbours
2167 push @neigh, 2182 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2185 }
2171 2186
… …
2178} 2193}
2179 2194
2180sub find_sync { 2195sub find_sync {
2181 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2182 2197
2183 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2184} 2202}
2185 2203
2186sub do_load_sync { 2204sub do_load_sync {
2187 my ($map) = @_; 2205 my ($map) = @_;
2188 2206
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2191 2209
2192 cf::sync_job { $map->load }; 2210 $map->load;
2193} 2211}
2194 2212
2195our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2197 2215
… …
2309 2327
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2329
2312 return if $self->players; 2330 return if $self->players;
2313 2331
2314 warn "resetting map ", $self->path, "\n"; 2332 cf::trace "resetting map ", $self->path, "\n";
2315 2333
2316 $self->in_memory (cf::MAP_SWAPPED); 2334 $self->in_memory (cf::MAP_SWAPPED);
2317 2335
2318 # need to save uniques path 2336 # need to save uniques path
2319 unless ($self->{deny_save}) { 2337 unless ($self->{deny_save}) {
… …
2583 2601
2584Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2585 2603
2586The player should be reasonably safe there for short amounts of time (e.g. 2604The 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, 2605for 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 2606though, as the player cannot control the character while it is on the link
2589map. 2607map.
2590 2608
2591Will never block. 2609Will never block.
2592 2610
2593=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2615 my ($self) = @_; 2633 my ($self) = @_;
2616 2634
2617 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2618 2636
2637 ++$self->{_link_recursion};
2638
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2640
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2623 2643
… …
2654 $map->load_neighbours; 2674 $map->load_neighbours;
2655 2675
2656 return unless $self->contr->active; 2676 return unless $self->contr->active;
2657 2677
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2660 2680 # entering was successful
2681 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2683 $self->activate_recursive;
2663} 2684 }
2664 2685
2686}
2687
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2689
2667Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2693the new (success) or old (failed) map position. In either case, $done will
… …
2677 2700
2678our $GOTOGEN; 2701our $GOTOGEN;
2679 2702
2680sub cf::object::player::goto { 2703sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2682 2711
2683 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2714
2686 $self->enter_link; 2715 $self->enter_link;
… …
2710 my $map = eval { 2739 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2712 2741
2713 if ($map) { 2742 if ($map) {
2714 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2745 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2747 }
2719 2748
2720 $map 2749 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2731 } 2760 }
2732 2761
2733 $done->() if $done; 2762 $done->($self) if $done;
2734 })->prio (1); 2763 })->prio (1);
2735} 2764}
2736 2765
2737=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2738 2767
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2864
2836 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2866 $self->leave_link;
2838 } 2867 }
2839 })->prio (1); 2868 })->prio (1);
2840} 2869}
2841 2870
… …
3154 3183
3155 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3185 if $reply;
3157 3186
3158 } else { 3187 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3189 }
3161 3190
3162 cf::override; 3191 cf::override;
3163 }, 3192 },
3164); 3193);
… …
3294 local @cf::_safe_eval_args = values %vars; 3323 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3324 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3325 }
3297 3326
3298 if ($@) { 3327 if ($@) {
3299 warn "$@"; 3328 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3329 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3330 "with arguments " . (join " ", %vars) . "\n";
3302 } 3331 }
3303 3332
3304 wantarray ? @res : $res[0] 3333 wantarray ? @res : $res[0]
3305} 3334}
3306 3335
… …
3340 # for this (global event?) 3369 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3370 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3371
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3372 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3373
3345 warn "loading facedata from $path\n"; 3374 trace "loading facedata from $path\n";
3346 3375
3347 my $facedata; 3376 my $facedata;
3348 0 < aio_load $path, $facedata 3377 0 < aio_load $path, $facedata
3349 or die "$path: $!"; 3378 or die "$path: $!";
3350 3379
… …
3384 3413
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3414 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3415 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3416 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3417 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3418 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3419 }
3391 3420
3392 cf::cede_to_tick; 3421 cf::cede_to_tick;
3393 } 3422 }
3394 } 3423 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3441 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3442
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3443 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3444 cf::face::set_type $idx, $info->{type};
3416 } else { 3445 } else {
3417 $RESOURCE{$name} = $info; 3446 $RESOURCE{$name} = $info; # unused
3418 } 3447 }
3419 3448
3420 cf::cede_to_tick; 3449 cf::cede_to_tick;
3421 } 3450 }
3422 } 3451 }
3423 3452
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3453 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3454
3426 1 3455 1
3427} 3456}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3457
3449register_exticmd fx_want => sub { 3458register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3459 my ($ns, $want) = @_;
3451 3460
3452 while (my ($k, $v) = each %$want) { 3461 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3500sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3501 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3502 or die "unable to load treasurelists\n";
3494} 3503}
3495 3504
3505sub reload_sound {
3506 trace "loading sound config from $DATADIR/sound\n";
3507
3508 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3509 or die "$DATADIR/sound $!";
3510
3511 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3512
3513 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3514 my $sound = $soundconf->{compat}[$_]
3515 or next;
3516
3517 my $face = cf::face::find "sound/$sound->[1]";
3518 cf::sound::set $sound->[0] => $face;
3519 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3520 }
3521
3522 while (my ($k, $v) = each %{$soundconf->{event}}) {
3523 my $face = cf::face::find "sound/$v";
3524 cf::sound::set $k => $face;
3525 }
3526}
3527
3496sub reload_resources { 3528sub reload_resources {
3497 warn "reloading resource files...\n"; 3529 trace "reloading resource files...\n";
3498 3530
3499 reload_facedata; 3531 reload_facedata;
3532 reload_sound;
3500 reload_archetypes; 3533 reload_archetypes;
3501 reload_regions; 3534 reload_regions;
3502 reload_treasures; 3535 reload_treasures;
3503 3536
3504 warn "finished reloading resource files\n"; 3537 trace "finished reloading resource files\n";
3505} 3538}
3506 3539
3507sub reload_config { 3540sub reload_config {
3508 warn "reloading config file...\n"; 3541 trace "reloading config file...\n";
3509 3542
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3543 open my $fh, "<:utf8", "$CONFDIR/config"
3511 or return; 3544 or return;
3512 3545
3513 local $/; 3546 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>; 3547 *CFG = YAML::XS::Load scalar <$fh>;
3515 3548
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3549 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3550
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3551 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3552 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3553
3521 if (exists $CFG{mlockall}) { 3554 if (exists $CFG{mlockall}) {
… …
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3557 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3558 };
3526 warn $@ if $@; 3559 warn $@ if $@;
3527 } 3560 }
3528 3561
3529 warn "finished reloading resource files\n"; 3562 trace "finished reloading resource files\n";
3530} 3563}
3531 3564
3532sub pidfile() { 3565sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3566 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3567 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3580 seek $fh, 0, 0;
3548 print $fh $$; 3581 print $fh $$;
3549} 3582}
3550 3583
3551sub main_loop { 3584sub main_loop {
3552 warn "EV::loop starting\n"; 3585 trace "EV::loop starting\n";
3553 if (1) { 3586 if (1) {
3554 EV::loop; 3587 EV::loop;
3555 } 3588 }
3556 warn "EV::loop returned\n"; 3589 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3590 goto &main_loop unless $REALLY_UNLOOP;
3558} 3591}
3559 3592
3560sub main { 3593sub main {
3561 cf::init_globals; # initialise logging 3594 cf::init_globals; # initialise logging
… …
3609 3642
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3643 (pop @POST_INIT)->(0) while @POST_INIT;
3611 }; 3644 };
3612 3645
3613 cf::object::thawer::errors_are_fatal 0; 3646 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3647 info "parse errors in files are no longer fatal from this point on.\n";
3615 3648
3616 main_loop; 3649 main_loop;
3617} 3650}
3618 3651
3619############################################################################# 3652#############################################################################
… …
3660 or return; 3693 or return;
3661 3694
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3695 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3696 and return;
3664 3697
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3698 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3699
3667 1 3700 1
3668} 3701}
3669 3702
3670our $uuid_lock; 3703our $uuid_lock;
… …
3682 or return; 3715 or return;
3683 3716
3684 my $value = uuid_seq uuid_cur; 3717 my $value = uuid_seq uuid_cur;
3685 3718
3686 unless ($value) { 3719 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3720 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3721 return;
3689 } 3722 }
3690 3723
3691 my $value = uuid_str $value + $uuid_skip; 3724 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3725 $uuid_skip = 0;
… …
3702 or return; 3735 or return;
3703 3736
3704 aio_rename "$uuid~", $uuid 3737 aio_rename "$uuid~", $uuid
3705 and return; 3738 and return;
3706 3739
3707 warn "uuid file written ($value).\n"; 3740 trace "uuid file written ($value).\n";
3708 3741
3709 1 3742 1
3710 3743
3711} 3744}
3712 3745
… …
3718} 3751}
3719 3752
3720sub emergency_save() { 3753sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3754 my $freeze_guard = cf::freeze_mainloop;
3722 3755
3723 warn "emergency_perl_save: enter\n"; 3756 info "emergency_perl_save: enter\n";
3757
3758 # this is a trade-off: we want to be very quick here, so
3759 # save all maps without fsync, and later call a global sync
3760 # (which in turn might be very very slow)
3761 local $USE_FSYNC = 0;
3724 3762
3725 cf::sync_job { 3763 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3764 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3765
3731 # use a peculiar iteration method to avoid tripping on perl 3766 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3767 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3768 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3769 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3770 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3771 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3772 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3773 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3774 $pl->save;
3740 } 3775 }
3741 warn "emergency_perl_save: end player save\n"; 3776 info "emergency_perl_save: end player save\n";
3742 3777
3778 cf::write_runtime_sync; # external watchdog should not bark
3779
3743 warn "emergency_perl_save: begin map save\n"; 3780 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3781 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3782 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3783 $map->valid or next;
3747 $map->save; 3784 $map->save;
3748 } 3785 }
3749 warn "emergency_perl_save: end map save\n"; 3786 info "emergency_perl_save: end map save\n";
3750 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3790 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3791 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3792 info "emergency_perl_save: end database checkpoint\n";
3754 3793
3755 warn "emergency_perl_save: begin write uuid\n"; 3794 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3795 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3796 info "emergency_perl_save: end write uuid\n";
3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 trace "emergency_perl_save: syncing database to disk";
3801 BDB::db_env_txn_checkpoint $DB_ENV;
3802
3803 info "emergency_perl_save: starting sync\n";
3804 IO::AIO::aio_sync sub {
3805 info "emergency_perl_save: finished sync\n";
3806 };
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3816 };
3759 3817
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3818 info "emergency_perl_save: leave\n";
3766} 3819}
3767 3820
3768sub post_cleanup { 3821sub post_cleanup {
3769 my ($make_core) = @_; 3822 my ($make_core) = @_;
3770 3823
3824 IO::AIO::flush;
3825
3771 warn Carp::longmess "post_cleanup backtrace" 3826 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3827 if $make_core;
3773 3828
3774 my $fh = pidfile; 3829 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3830 unlink $PIDFILE if <$fh> == $$;
3776} 3831}
… …
3801} 3856}
3802 3857
3803sub do_reload_perl() { 3858sub do_reload_perl() {
3804 # can/must only be called in main 3859 # can/must only be called in main
3805 if (in_main) { 3860 if (in_main) {
3806 warn "can only reload from main coroutine"; 3861 error "can only reload from main coroutine";
3807 return; 3862 return;
3808 } 3863 }
3809 3864
3810 return if $RELOAD++; 3865 return if $RELOAD++;
3811 3866
3812 my $t1 = AE::time; 3867 my $t1 = AE::time;
3813 3868
3814 while ($RELOAD) { 3869 while ($RELOAD) {
3815 warn "reloading..."; 3870 info "reloading...";
3816 3871
3817 warn "entering sync_job"; 3872 trace "entering sync_job";
3818 3873
3819 cf::sync_job { 3874 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3875 cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3876
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3877 trace "cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3878 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3879 %EXT_CORO = ();
3837 3880
3838 warn "removing commands"; 3881 trace "removing commands";
3839 %COMMAND = (); 3882 %COMMAND = ();
3840 3883
3841 warn "removing ext/exti commands"; 3884 trace "removing ext/exti commands";
3842 %EXTCMD = (); 3885 %EXTCMD = ();
3843 %EXTICMD = (); 3886 %EXTICMD = ();
3844 3887
3845 warn "unloading/nuking all extensions"; 3888 trace "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3889 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3890 trace "... unloading $pkg";
3848 3891
3849 if (my $cb = $pkg->can ("unload")) { 3892 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3893 eval {
3851 $cb->($pkg); 3894 $cb->($pkg);
3852 1 3895 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3896 } or error "$pkg unloaded, but with errors: $@";
3854 } 3897 }
3855 3898
3856 warn "... clearing $pkg"; 3899 trace "... clearing $pkg";
3857 clear_package $pkg; 3900 clear_package $pkg;
3858 } 3901 }
3859 3902
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3903 trace "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3904 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3905 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3906
3864 warn "... unloading $k"; 3907 trace "... unloading $k";
3865 delete $INC{$k}; 3908 delete $INC{$k};
3866 3909
3867 $k =~ s/\.pm$//; 3910 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3911 $k =~ s/\//::/g;
3869 3912
… …
3872 } 3915 }
3873 3916
3874 clear_package $k; 3917 clear_package $k;
3875 } 3918 }
3876 3919
3877 warn "getting rid of safe::, as good as possible"; 3920 trace "getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3921 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3922 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 3923
3881 warn "unloading cf.pm \"a bit\""; 3924 trace "unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3925 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3926 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3927
3885 # don't, removes xs symbols, too, 3928 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3929 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3930 #clear_package __PACKAGE__;
3888 3931
3889 warn "unload completed, starting to reload now"; 3932 info "unload completed, starting to reload now";
3890 3933
3891 warn "reloading cf.pm"; 3934 trace "reloading cf.pm";
3892 require cf; 3935 require cf;
3893 cf::_connect_to_perl_1; 3936 cf::_connect_to_perl_1;
3894 3937
3895 warn "loading config and database again"; 3938 trace "loading config and database again";
3896 cf::reload_config; 3939 cf::reload_config;
3897 3940
3898 warn "loading extensions"; 3941 trace "loading extensions";
3899 cf::load_extensions; 3942 cf::load_extensions;
3900 3943
3901 if ($REATTACH_ON_RELOAD) { 3944 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 3945 trace "reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 3946 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 3947 trace "reattaching attachments to maps";
3905 reattach $_ for values %MAP; 3948 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 3949 trace "reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 3950 reattach $_ for values %PLAYER;
3908 } 3951 }
3909 3952
3910 warn "running post_init jobs"; 3953 trace "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT; 3954 (pop @POST_INIT)->(1) while @POST_INIT;
3912 3955
3913 warn "leaving sync_job"; 3956 trace "leaving sync_job";
3914 3957
3915 1 3958 1
3916 } or do { 3959 } or do {
3917 warn $@; 3960 error $@;
3918 cf::cleanup "error while reloading, exiting."; 3961 cf::cleanup "error while reloading, exiting.";
3919 }; 3962 };
3920 3963
3921 warn "reloaded"; 3964 info "reloaded";
3922 --$RELOAD; 3965 --$RELOAD;
3923 } 3966 }
3924 3967
3925 $t1 = AE::time - $t1; 3968 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 3969 info "reload completed in ${t1}s\n";
3927}; 3970};
3928 3971
3929our $RELOAD_WATCHER; # used only during reload 3972our $RELOAD_WATCHER; # used only during reload
3930 3973
3931sub reload_perl() { 3974sub reload_perl() {
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4034 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4035 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4036 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4037 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4038 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4039 or error "ERROR: unable to write runtime file: $!";
3997 }; 4040 };
3998 } 4041 }
3999 4042
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4043 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4044 $sig->send;
… …
4009 4052
4010 if (0) { 4053 if (0) {
4011 if ($NEXT_TICK) { 4054 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4055 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4056 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4057 debug "jitter $JITTER\n";#d#
4015 } 4058 }
4016 } 4059 }
4017} 4060}
4018 4061
4019{ 4062{

Diff Legend

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