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

Diff Legend

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