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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.541 by root, Tue May 4 23:33:16 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 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~";
… …
1695 \@logins 1709 \@logins
1696} 1710}
1697 1711
1698=item $player->maps 1712=item $player->maps
1699 1713
1714=item cf::player::maps $login
1715
1700Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1701player. May block. 1717player. May block.
1702 1718
1703=cut 1719=cut
1704 1720
… …
1765 1781
1766=cut 1782=cut
1767 1783
1768sub find_by_path($) { 1784sub find_by_path($) {
1769 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1770 1788
1771 my ($match, $specificity); 1789 my ($match, $specificity);
1772 1790
1773 for my $region (list) { 1791 for my $region (list) {
1774 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
… …
1831 1849
1832sub register { 1850sub register {
1833 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1834 my $pkg = caller; 1852 my $pkg = caller;
1835 1853
1836 no strict;
1837 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1838 1855
1839 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840} 1857}
1841 1858
1842# also paths starting with '/' 1859# also paths starting with '/'
1843$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844 1861
1845sub thawer_merge { 1862sub thawer_merge {
1846 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1847 1864
1848 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2158 or next; 2175 or next;
2159 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2160 or next; 2177 or next;
2161 $neigh->load; 2178 $neigh->load;
2162 2179
2180 # now find the diagonal neighbours
2163 push @neigh, 2181 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2184 }
2167 2185
… …
2174} 2192}
2175 2193
2176sub find_sync { 2194sub find_sync {
2177 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2178 2196
2179 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
2180} 2201}
2181 2202
2182sub do_load_sync { 2203sub do_load_sync {
2183 my ($map) = @_; 2204 my ($map) = @_;
2184 2205
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2187 2208
2188 cf::sync_job { $map->load }; 2209 $map->load;
2189} 2210}
2190 2211
2191our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2193 2214
… …
2305 2326
2306 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2307 2328
2308 return if $self->players; 2329 return if $self->players;
2309 2330
2310 warn "resetting map ", $self->path, "\n"; 2331 cf::trace "resetting map ", $self->path, "\n";
2311 2332
2312 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2313 2334
2314 # need to save uniques path 2335 # need to save uniques path
2315 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
… …
2339 2360
2340 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2341 2362
2342 $self->unlink_save; 2363 $self->unlink_save;
2343 2364
2344 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2345 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2346 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2347 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2348 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349 2370
… …
2579 2600
2580Freezes 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}>).
2581 2602
2582The 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.
2583for 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,
2584though, 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
2585map. 2606map.
2586 2607
2587Will never block. 2608Will never block.
2588 2609
2589=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2610sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2611 my ($self) = @_; 2632 my ($self) = @_;
2612 2633
2613 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2614 2635
2636 ++$self->{_link_recursion};
2637
2615 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2616 2639
2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2619 2642
… …
2650 $map->load_neighbours; 2673 $map->load_neighbours;
2651 2674
2652 return unless $self->contr->active; 2675 return unless $self->contr->active;
2653 2676
2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2656 2679 # entering was successful
2680 delete $self->{_link_recursion};
2657 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive; 2682 $self->activate_recursive;
2659} 2683 }
2660 2684
2685}
2686
2661=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)]])
2662 2688
2663Moves 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
2664her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2665that 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
2666the 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
… …
2673 2699
2674our $GOTOGEN; 2700our $GOTOGEN;
2675 2701
2676sub cf::object::player::goto { 2702sub cf::object::player::goto {
2677 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 }
2678 2710
2679 # 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
2680 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681 2713
2682 $self->enter_link; 2714 $self->enter_link;
… …
2706 my $map = eval { 2738 my $map = eval {
2707 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2708 2740
2709 if ($map) { 2741 if ($map) {
2710 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2711 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2712 } else { 2744 } else {
2713 $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);
2714 } 2746 }
2715 2747
2716 $map 2748 $map
… …
2724 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2725 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2726 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2727 } 2759 }
2728 2760
2729 $done->() if $done; 2761 $done->($self) if $done;
2730 })->prio (1); 2762 })->prio (1);
2731} 2763}
2732 2764
2733=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2734 2766
… …
2827 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2828 . "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. "
2829 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2830 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2831 2863
2832 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2833 $self->leave_link; 2865 $self->leave_link;
2834 } 2866 }
2835 })->prio (1); 2867 })->prio (1);
2836} 2868}
2837 2869
… …
3150 3182
3151 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3152 if $reply; 3184 if $reply;
3153 3185
3154 } else { 3186 } else {
3155 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";
3156 } 3188 }
3157 3189
3158 cf::override; 3190 cf::override;
3159 }, 3191 },
3160); 3192);
… …
3241 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3242 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3243 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3244 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3245) { 3277) {
3246 no strict 'refs';
3247 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249 for @funs; 3280 for @funs;
3250} 3281}
3251 3282
… …
3290 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3292 } 3323 }
3293 3324
3294 if ($@) { 3325 if ($@) {
3295 warn "$@"; 3326 warn "$@",
3296 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3297 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3298 } 3329 }
3299 3330
3300 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3301} 3332}
3302 3333
… …
3327=cut 3358=cut
3328 3359
3329############################################################################# 3360#############################################################################
3330# the server's init and main functions 3361# the server's init and main functions
3331 3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3404
3332sub load_facedata($) { 3405sub load_facedata($) {
3333 my ($path) = @_; 3406 my ($path) = @_;
3334 3407
3335 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3336 # for this (global event?) 3409 # for this (global event?)
3337 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3338 3411
3339 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340 3413
3341 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3342 3415
3343 my $facedata; 3416 my $facedata;
3344 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3345 or die "$path: $!"; 3418 or die "$path: $!";
3346 3419
… …
3380 3453
3381 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3382 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384 } else { 3457 } else {
3385 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3386 } 3459 }
3387 3460
3388 cf::cede_to_tick; 3461 cf::cede_to_tick;
3389 } 3462 }
3390 } 3463 }
… …
3408 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409 3482
3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3412 } else { 3485 } else {
3413 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3414 } 3487 }
3415 3488
3416 cf::cede_to_tick; 3489 cf::cede_to_tick;
3417 } 3490 }
3418 } 3491 }
3419 3492
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421 3494
3422 1 3495 1
3423} 3496}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
3444 3497
3445register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3446 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3447 3500
3448 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
… …
3487sub reload_treasures { 3540sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3490} 3543}
3491 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3492sub reload_resources { 3568sub reload_resources {
3493 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3494 3570
3495 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3496 reload_archetypes; 3573 reload_archetypes;
3497 reload_regions; 3574 reload_regions;
3498 reload_treasures; 3575 reload_treasures;
3499 3576
3500 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3501} 3578}
3502 3579
3503sub reload_config { 3580sub reload_config {
3504 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3505 3582
3506 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3507 or return; 3584 or return;
3508 3585
3509 local $/; 3586 local $/;
3510 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3511 3588
3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513 3590
3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516 3593
3517 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3520 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3521 }; 3598 };
3522 warn $@ if $@; 3599 warn $@ if $@;
3523 } 3600 }
3524 3601
3525 warn "finished reloading resource files\n"; 3602 trace "finished reloading resource files\n";
3526} 3603}
3527 3604
3528sub pidfile() { 3605sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
… …
3543 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3544 print $fh $$; 3621 print $fh $$;
3545} 3622}
3546 3623
3547sub main_loop { 3624sub main_loop {
3548 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3549 if (1) { 3626 if (1) {
3550 EV::loop; 3627 EV::loop;
3551 } 3628 }
3552 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3554} 3631}
3555 3632
3556sub main { 3633sub main {
3557 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3558 3635
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563 3640
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565 3642
… …
3573 }; 3650 };
3574 3651
3575 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3576 3653
3577 cf::sync_job { 3654 cf::sync_job {
3655 init_inc;
3656
3578 cf::init_experience; 3657 cf::init_experience;
3579 cf::init_anim; 3658 cf::init_anim;
3580 cf::init_attackmess; 3659 cf::init_attackmess;
3581 cf::init_dynamic; 3660 cf::init_dynamic;
3582 3661
… …
3605 3684
3606 (pop @POST_INIT)->(0) while @POST_INIT; 3685 (pop @POST_INIT)->(0) while @POST_INIT;
3607 }; 3686 };
3608 3687
3609 cf::object::thawer::errors_are_fatal 0; 3688 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n"; 3689 info "parse errors in files are no longer fatal from this point on.\n";
3611 3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3612 main_loop; 3696 goto &main_loop;
3613} 3697}
3614 3698
3615############################################################################# 3699#############################################################################
3616# initialisation and cleanup 3700# initialisation and cleanup
3617 3701
… …
3656 or return; 3740 or return;
3657 3741
3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659 and return; 3743 and return;
3660 3744
3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662 3746
3663 1 3747 1
3664} 3748}
3665 3749
3666our $uuid_lock; 3750our $uuid_lock;
… …
3678 or return; 3762 or return;
3679 3763
3680 my $value = uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3681 3765
3682 unless ($value) { 3766 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n"; 3767 info "cowardly refusing to write zero uuid value!\n";
3684 return; 3768 return;
3685 } 3769 }
3686 3770
3687 my $value = uuid_str $value + $uuid_skip; 3771 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0; 3772 $uuid_skip = 0;
… …
3698 or return; 3782 or return;
3699 3783
3700 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3701 and return; 3785 and return;
3702 3786
3703 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3704 3788
3705 1 3789 1
3706 3790
3707} 3791}
3708 3792
… …
3714} 3798}
3715 3799
3716sub emergency_save() { 3800sub emergency_save() {
3717 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3718 3802
3719 warn "emergency_perl_save: enter\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3720 3809
3721 cf::sync_job { 3810 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so 3811 cf::write_runtime_sync; # external watchdog should not bark
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726 3812
3727 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3728 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3729 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3730 warn "emergency_perl_save: begin player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3731 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3732 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3733 $pl->valid or next; 3819 $pl->valid or next;
3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735 $pl->save; 3821 $pl->save;
3736 } 3822 }
3737 warn "emergency_perl_save: end player save\n"; 3823 info "emergency_perl_save: end player save\n";
3738 3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3739 warn "emergency_perl_save: begin map save\n"; 3827 info "emergency_perl_save: begin map save\n";
3740 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3741 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3742 $map->valid or next; 3830 $map->valid or next;
3743 $map->save; 3831 $map->save;
3744 } 3832 }
3745 warn "emergency_perl_save: end map save\n"; 3833 info "emergency_perl_save: end map save\n";
3746 3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3747 warn "emergency_perl_save: begin database checkpoint\n"; 3837 info "emergency_perl_save: begin database checkpoint\n";
3748 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3749 warn "emergency_perl_save: end database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3750 3840
3751 warn "emergency_perl_save: begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1; 3842 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3754 }; 3863 };
3755 3864
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3761 warn "emergency_perl_save: leave\n"; 3865 info "emergency_perl_save: leave\n";
3762} 3866}
3763 3867
3764sub post_cleanup { 3868sub post_cleanup {
3765 my ($make_core) = @_; 3869 my ($make_core) = @_;
3766 3870
3871 IO::AIO::flush;
3872
3767 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3768 if $make_core; 3874 if $make_core;
3769 3875
3770 my $fh = pidfile; 3876 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$; 3877 unlink $PIDFILE if <$fh> == $$;
3772} 3878}
… …
3797} 3903}
3798 3904
3799sub do_reload_perl() { 3905sub do_reload_perl() {
3800 # can/must only be called in main 3906 # can/must only be called in main
3801 if (in_main) { 3907 if (in_main) {
3802 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3803 return; 3909 return;
3804 } 3910 }
3805 3911
3806 return if $RELOAD++; 3912 return if $RELOAD++;
3807 3913
3808 my $t1 = AE::time; 3914 my $t1 = AE::time;
3809 3915
3810 while ($RELOAD) { 3916 while ($RELOAD) {
3811 warn "reloading..."; 3917 info "reloading...";
3812 3918
3813 warn "entering sync_job"; 3919 trace "entering sync_job";
3814 3920
3815 cf::sync_job { 3921 cf::sync_job {
3816 cf::write_runtime_sync; # external watchdog should not bark
3817 cf::emergency_save; 3922 cf::emergency_save;
3818 cf::write_runtime_sync; # external watchdog should not bark
3819 3923
3820 warn "syncing database to disk";
3821 BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823 # if anything goes wrong in here, we should simply crash as we already saved
3824
3825 warn "flushing outstanding aio requests";
3826 while (IO::AIO::nreqs || BDB::nreqs) {
3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828 }
3829
3830 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3831 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3832 %EXT_CORO = (); 3926 %EXT_CORO = ();
3833 3927
3834 warn "removing commands"; 3928 trace "removing commands";
3835 %COMMAND = (); 3929 %COMMAND = ();
3836 3930
3837 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3838 %EXTCMD = (); 3932 %EXTCMD = ();
3839 %EXTICMD = (); 3933 %EXTICMD = ();
3840 3934
3841 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3843 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3844 3938
3845 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3846 eval { 3940 eval {
3847 $cb->($pkg); 3941 $cb->($pkg);
3848 1 3942 1
3849 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3850 } 3944 }
3851 3945
3852 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3853 clear_package $pkg; 3947 clear_package $pkg;
3854 } 3948 }
3855 3949
3856 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859 3953
3860 warn "... unloading $k"; 3954 trace "... unloading $k";
3861 delete $INC{$k}; 3955 delete $INC{$k};
3862 3956
3863 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3865 3959
… …
3868 } 3962 }
3869 3963
3870 clear_package $k; 3964 clear_package $k;
3871 } 3965 }
3872 3966
3873 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3874 clear_package "safe::$_" 3968 clear_package "safe::$_"
3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876 3970
3877 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3878 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880 3974
3881 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3882 # and global variables created in xs 3976 # and global variables created in xs
3883 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3884 3978
3885 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3886 3980
3887 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3888 require cf; 3982 require cf;
3889 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3890 3984
3891 warn "loading config and database again"; 3985 trace "loading config and database again";
3892 cf::reload_config; 3986 cf::reload_config;
3893 3987
3894 warn "loading extensions"; 3988 trace "loading extensions";
3895 cf::load_extensions; 3989 cf::load_extensions;
3896 3990
3897 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3898 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3899 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3900 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3901 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3902 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3903 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3904 } 3998 }
3905 3999
3906 warn "running post_init jobs"; 4000 trace "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT; 4001 (pop @POST_INIT)->(1) while @POST_INIT;
3908 4002
3909 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3910 4004
3911 1 4005 1
3912 } or do { 4006 } or do {
3913 warn $@; 4007 error $@;
3914 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3915 }; 4009 };
3916 4010
3917 warn "reloaded"; 4011 info "reloaded";
3918 --$RELOAD; 4012 --$RELOAD;
3919 } 4013 }
3920 4014
3921 $t1 = AE::time - $t1; 4015 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n"; 4016 info "reload completed in ${t1}s\n";
3923}; 4017};
3924 4018
3925our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3926 4020
3927sub reload_perl() { 4021sub reload_perl() {
… …
3948 reload_perl; 4042 reload_perl;
3949 }; 4043 };
3950 } 4044 }
3951}; 4045};
3952 4046
3953unshift @INC, $LIBDIR; 4047#############################################################################
3954 4048
3955my $bug_warning = 0; 4049my $bug_warning = 0;
3956 4050
3957our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3958our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
… …
3987 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989 Coro::async_pool { 4083 Coro::async_pool {
3990 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3991 write_runtime_sync 4085 write_runtime_sync
3992 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3993 }; 4087 };
3994 } 4088 }
3995 4089
3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997 $sig->send; 4091 $sig->send;
… …
4005 4099
4006 if (0) { 4100 if (0) {
4007 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
4008 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
4011 } 4105 }
4012 } 4106 }
4013} 4107}
4014 4108
4015{ 4109{

Diff Legend

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