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.521 by root, Fri Apr 16 23:28:42 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
… …
165 168
166our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
167 170
168sub cf::map::normalise; 171sub cf::map::normalise;
169 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
170############################################################################# 177#############################################################################
171 178
172%REFLECT = (); 179%REFLECT = ();
173for (@REFLECT) { 180for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
245 252
246=back 253=back
247 254
248=cut 255=cut
249 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
250$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 264 my $msg = join "", @_;
252 265
253 $msg .= "\n" 266 $msg .= "\n"
254 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
255 268
256 $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;
257 270
258 LOG llevError, $msg; 271 LOG llevWarn, $msg;
259}; 272};
260 273
261$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
263 276
264 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
265 278
266 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 281 return;#d#
269 }#d# 282 }#d#
270 283
271 # kill coroutine otherwise 284 # kill coroutine otherwise
272 Coro::terminate 285 Coro::terminate
… …
505=cut 518=cut
506 519
507sub sync_job(&) { 520sub sync_job(&) {
508 my ($job) = @_; 521 my ($job) = @_;
509 522
510 if ($Coro::current == $Coro::main) { 523 if (in_main) {
511 my $time = AE::time; 524 my $time = AE::time;
512 525
513 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
515 528
516 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
517 530
518 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
519 532
520 my $busy = 1; 533 my $busy = 1;
521 my @res; 534 my @res;
522 535
523 (async { 536 (async {
524 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 538 @res = eval { $job->() };
526 warn $@ if $@; 539 error $@ if $@;
527 undef $busy; 540 undef $busy;
528 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
529 542
530 while ($busy) { 543 while ($busy) {
531 if (Coro::nready) { 544 if (Coro::nready) {
… …
644within each server. 657within each server.
645 658
646=cut 659=cut
647 660
648sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
649 my ($name) = @_; 665 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
651 667
652 eval { 668 eval {
653 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
663} 679}
664 680
665our $DB; 681our $DB;
666 682
667sub db_init { 683sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
670 };
671} 685}
672 686
673sub db_get($$) { 687sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
675 689
676 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
677 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
678 694
679 $! ? () 695 $! ? ()
680 : $data 696 : $data
681 }
682} 697}
683 698
684sub db_put($$$) { 699sub db_put($$$) {
685 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 757
743 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 759 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
746 761
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 763
749 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
752 767
… …
762 777
763=cut 778=cut
764 779
765sub datalog($@) { 780sub datalog($@) {
766 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 783}
769 784
770=back 785=back
771 786
772=cut 787=cut
… …
967 982
968 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 985
971 } elsif (ref $type) { 986 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
973 988
974 } else { 989 } else {
975 shift @arg; 990 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
977 } 992 }
978 } 993 }
979} 994}
980 995
981sub _object_attach { 996sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
992 } 1007 }
993 1008
994 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
995 } else { 1010 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1012 }
998 1013
999 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1000} 1015}
1001 1016
… …
1060 1075
1061 for (@$callbacks) { 1076 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1063 1078
1064 if ($@) { 1079 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1081 override;
1068 } 1082 }
1069 1083
1070 return 1 if $override; 1084 return 1 if $override;
1071 } 1085 }
… …
1150 for (@$attach) { 1164 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1153 } 1167 }
1154 } else { 1168 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1170 }
1157 } 1171 }
1158} 1172}
1159 1173
1160cf::attachable->attach ( 1174cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1188 1202
1189 sync_job { 1203 sync_job {
1190 if (length $$rdata) { 1204 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1194 1209
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1221 1236
1222 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1239 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1226 } 1241 }
1227 } else { 1242 } else {
1228 aio_unlink $filename; 1243 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1230 } 1245 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1270 $av = $st->{objs};
1256 } 1271 }
1257 1272
1258 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1261 1277
1262 ($data, $av) 1278 ($data, $av)
1263} 1279}
1264 1280
1265=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1357 1373
1358 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1375 if $reply;
1360 1376
1361 } else { 1377 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1379 }
1364 1380
1365 cf::override; 1381 cf::override;
1366 }, 1382 },
1367); 1383);
… …
1378 1394
1379 $grp 1395 $grp
1380} 1396}
1381 1397
1382sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1383 cf::sync_job { 1401 cf::sync_job {
1384 my %todo; 1402 my %todo;
1385 1403
1386 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1405 next unless -r $path;
… …
1405 1423
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1426
1409 $ext{source} = 1427 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1412 . $source 1430 . $source
1413 . "\n};\n1"; 1431 . "\n};\n1";
1414 1432
1415 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1446 next ext
1429 unless exists $done{$_}; 1447 unless exists $done{$_};
1430 } 1448 }
1431 1449
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1451
1434 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1435 1453
1436 if (length $@) { 1454 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1438 1457
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1441 1460
1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1444 } else { 1463 } else {
1445 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1447 $progress = 1; 1466 $progress = 1;
1448 1467
1449 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1450 unless $active; 1469 unless $active;
1451 } 1470 }
1452 } 1471 }
1453 1472
1454 unless ($progress) { 1473 unless ($progress) {
… …
1626 $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
1627 1646
1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1629 $pl->deactivate; 1648 $pl->deactivate;
1630 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;
1631 $pl->ob->check_score;
1632 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1633 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1634 1652
1635 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1636 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1691 \@logins 1709 \@logins
1692} 1710}
1693 1711
1694=item $player->maps 1712=item $player->maps
1695 1713
1714=item cf::player::maps $login
1715
1696Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1697player. May block. 1717player. May block.
1698 1718
1699=cut 1719=cut
1700 1720
… …
1761 1781
1762=cut 1782=cut
1763 1783
1764sub find_by_path($) { 1784sub find_by_path($) {
1765 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1766 1788
1767 my ($match, $specificity); 1789 my ($match, $specificity);
1768 1790
1769 for my $region (list) { 1791 for my $region (list) {
1770 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
… …
1827 1849
1828sub register { 1850sub register {
1829 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1830 my $pkg = caller; 1852 my $pkg = caller;
1831 1853
1832 no strict;
1833 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1834 1855
1835 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1836} 1857}
1837 1858
1838# also paths starting with '/' 1859# also paths starting with '/'
1839$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1840 1861
1841sub thawer_merge { 1862sub thawer_merge {
1842 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1843 1864
1844 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2154 or next; 2175 or next;
2155 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2156 or next; 2177 or next;
2157 $neigh->load; 2178 $neigh->load;
2158 2179
2180 # now find the diagonal neighbours
2159 push @neigh, 2181 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 } 2184 }
2163 2185
… …
2170} 2192}
2171 2193
2172sub find_sync { 2194sub find_sync {
2173 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2174 2196
2175 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
2176} 2201}
2177 2202
2178sub do_load_sync { 2203sub do_load_sync {
2179 my ($map) = @_; 2204 my ($map) = @_;
2180 2205
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2183 2208
2184 cf::sync_job { $map->load }; 2209 $map->load;
2185} 2210}
2186 2211
2187our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2189 2214
… …
2301 2326
2302 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2303 2328
2304 return if $self->players; 2329 return if $self->players;
2305 2330
2306 warn "resetting map ", $self->path, "\n"; 2331 cf::trace "resetting map ", $self->path, "\n";
2307 2332
2308 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2309 2334
2310 # need to save uniques path 2335 # need to save uniques path
2311 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
… …
2335 2360
2336 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2337 2362
2338 $self->unlink_save; 2363 $self->unlink_save;
2339 2364
2340 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2341 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2342 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2343 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2344 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2345 2370
… …
2575 2600
2576Freezes 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}>).
2577 2602
2578The 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.
2579for 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,
2580though, 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
2581map. 2606map.
2582 2607
2583Will never block. 2608Will never block.
2584 2609
2585=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2606sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2607 my ($self) = @_; 2632 my ($self) = @_;
2608 2633
2609 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2610 2635
2636 ++$self->{_link_recursion};
2637
2611 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2612 2639
2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2614 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2615 2642
… …
2646 $map->load_neighbours; 2673 $map->load_neighbours;
2647 2674
2648 return unless $self->contr->active; 2675 return unless $self->contr->active;
2649 2676
2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2651 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2652 2679 # entering was successful
2680 delete $self->{_link_recursion};
2653 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive; 2682 $self->activate_recursive;
2655} 2683 }
2656 2684
2685}
2686
2657=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)]])
2658 2688
2659Moves 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
2660her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2661that 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
2662the 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
… …
2669 2699
2670our $GOTOGEN; 2700our $GOTOGEN;
2671 2701
2672sub cf::object::player::goto { 2702sub cf::object::player::goto {
2673 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 }
2674 2710
2675 # 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
2676 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2677 2713
2678 $self->enter_link; 2714 $self->enter_link;
… …
2702 my $map = eval { 2738 my $map = eval {
2703 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2704 2740
2705 if ($map) { 2741 if ($map) {
2706 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2707 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2708 } else { 2744 } else {
2709 $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);
2710 } 2746 }
2711 2747
2712 $map 2748 $map
… …
2720 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2721 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2722 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2723 } 2759 }
2724 2760
2725 $done->() if $done; 2761 $done->($self) if $done;
2726 })->prio (1); 2762 })->prio (1);
2727} 2763}
2728 2764
2729=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2730 2766
… …
2823 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2824 . "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. "
2825 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2826 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2827 2863
2828 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2829 $self->leave_link; 2865 $self->leave_link;
2830 } 2866 }
2831 })->prio (1); 2867 })->prio (1);
2832} 2868}
2833 2869
… …
3146 3182
3147 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3148 if $reply; 3184 if $reply;
3149 3185
3150 } else { 3186 } else {
3151 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";
3152 } 3188 }
3153 3189
3154 cf::override; 3190 cf::override;
3155 }, 3191 },
3156); 3192);
… …
3237 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3238 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3239 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3240 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3241) { 3277) {
3242 no strict 'refs';
3243 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3245 for @funs; 3280 for @funs;
3246} 3281}
3247 3282
… …
3286 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3288 } 3323 }
3289 3324
3290 if ($@) { 3325 if ($@) {
3291 warn "$@"; 3326 warn "$@",
3292 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3293 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3294 } 3329 }
3295 3330
3296 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3297} 3332}
3298 3333
… …
3323=cut 3358=cut
3324 3359
3325############################################################################# 3360#############################################################################
3326# the server's init and main functions 3361# the server's init and main functions
3327 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
3328sub load_facedata($) { 3405sub load_facedata($) {
3329 my ($path) = @_; 3406 my ($path) = @_;
3330 3407
3331 # 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
3332 # for this (global event?) 3409 # for this (global event?)
3333 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3334 3411
3335 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3336 3413
3337 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3338 3415
3339 my $facedata; 3416 my $facedata;
3340 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3341 or die "$path: $!"; 3418 or die "$path: $!";
3342 3419
… …
3376 3453
3377 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3378 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3380 } else { 3457 } else {
3381 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3382 } 3459 }
3383 3460
3384 cf::cede_to_tick; 3461 cf::cede_to_tick;
3385 } 3462 }
3386 } 3463 }
… …
3404 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3405 3482
3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3407 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3408 } else { 3485 } else {
3409 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3410 } 3487 }
3411 3488
3412 cf::cede_to_tick; 3489 cf::cede_to_tick;
3413 } 3490 }
3414 } 3491 }
3415 3492
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3417 3494
3418 1 3495 1
3419} 3496}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3440 3497
3441register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3442 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3443 3500
3444 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
… …
3483sub reload_treasures { 3540sub reload_treasures {
3484 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3485 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3486} 3543}
3487 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
3488sub reload_resources { 3568sub reload_resources {
3489 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3490 3570
3491 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3492 reload_archetypes; 3573 reload_archetypes;
3493 reload_regions; 3574 reload_regions;
3494 reload_treasures; 3575 reload_treasures;
3495 3576
3496 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3497} 3578}
3498 3579
3499sub reload_config { 3580sub reload_config {
3500 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3501 3582
3502 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3503 or return; 3584 or return;
3504 3585
3505 local $/; 3586 local $/;
3506 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3507 3588
3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3509 3590
3510 $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};
3511 $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};
3512 3593
3513 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3516 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3517 }; 3598 };
3518 warn $@ if $@; 3599 warn $@ if $@;
3519 } 3600 }
3520 3601
3521 warn "finished reloading resource files\n"; 3602 trace "finished reloading resource files\n";
3522} 3603}
3523 3604
3524sub pidfile() { 3605sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
… …
3539 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3540 print $fh $$; 3621 print $fh $$;
3541} 3622}
3542 3623
3543sub main_loop { 3624sub main_loop {
3544 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3545 if (1) { 3626 if (1) {
3546 EV::loop; 3627 EV::loop;
3547 } 3628 }
3548 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3550} 3631}
3551 3632
3552sub main { 3633sub main {
3553 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3554 3635
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 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.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559 3640
3560 $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
3561 3642
… …
3569 }; 3650 };
3570 3651
3571 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3572 3653
3573 cf::sync_job { 3654 cf::sync_job {
3655 init_inc;
3656
3574 cf::init_experience; 3657 cf::init_experience;
3575 cf::init_anim; 3658 cf::init_anim;
3576 cf::init_attackmess; 3659 cf::init_attackmess;
3577 cf::init_dynamic; 3660 cf::init_dynamic;
3578 3661
… …
3601 3684
3602 (pop @POST_INIT)->(0) while @POST_INIT; 3685 (pop @POST_INIT)->(0) while @POST_INIT;
3603 }; 3686 };
3604 3687
3605 cf::object::thawer::errors_are_fatal 0; 3688 cf::object::thawer::errors_are_fatal 0;
3606 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";
3607 3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3608 main_loop; 3696 goto &main_loop;
3609} 3697}
3610 3698
3611############################################################################# 3699#############################################################################
3612# initialisation and cleanup 3700# initialisation and cleanup
3613 3701
… …
3652 or return; 3740 or return;
3653 3741
3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3655 and return; 3743 and return;
3656 3744
3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3658 3746
3659 1 3747 1
3660} 3748}
3661 3749
3662our $uuid_lock; 3750our $uuid_lock;
… …
3674 or return; 3762 or return;
3675 3763
3676 my $value = uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3677 3765
3678 unless ($value) { 3766 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n"; 3767 info "cowardly refusing to write zero uuid value!\n";
3680 return; 3768 return;
3681 } 3769 }
3682 3770
3683 my $value = uuid_str $value + $uuid_skip; 3771 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0; 3772 $uuid_skip = 0;
… …
3694 or return; 3782 or return;
3695 3783
3696 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3697 and return; 3785 and return;
3698 3786
3699 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3700 3788
3701 1 3789 1
3702 3790
3703} 3791}
3704 3792
… …
3710} 3798}
3711 3799
3712sub emergency_save() { 3800sub emergency_save() {
3713 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3714 3802
3715 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;
3716 3809
3717 cf::sync_job { 3810 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so 3811 cf::write_runtime_sync; # external watchdog should not bark
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722 3812
3723 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3724 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3725 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3726 warn "emergency_perl_save: begin player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3727 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3728 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3729 $pl->valid or next; 3819 $pl->valid or next;
3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3731 $pl->save; 3821 $pl->save;
3732 } 3822 }
3733 warn "emergency_perl_save: end player save\n"; 3823 info "emergency_perl_save: end player save\n";
3734 3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3735 warn "emergency_perl_save: begin map save\n"; 3827 info "emergency_perl_save: begin map save\n";
3736 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3737 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3738 $map->valid or next; 3830 $map->valid or next;
3739 $map->save; 3831 $map->save;
3740 } 3832 }
3741 warn "emergency_perl_save: end map save\n"; 3833 info "emergency_perl_save: end map save\n";
3742 3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3743 warn "emergency_perl_save: begin database checkpoint\n"; 3837 info "emergency_perl_save: begin database checkpoint\n";
3744 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3745 warn "emergency_perl_save: end database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3746 3840
3747 warn "emergency_perl_save: begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1; 3842 write_uuid_sync 1;
3749 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
3750 }; 3863 };
3751 3864
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3757 warn "emergency_perl_save: leave\n"; 3865 info "emergency_perl_save: leave\n";
3758} 3866}
3759 3867
3760sub post_cleanup { 3868sub post_cleanup {
3761 my ($make_core) = @_; 3869 my ($make_core) = @_;
3762 3870
3871 IO::AIO::flush;
3872
3763 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3764 if $make_core; 3874 if $make_core;
3765 3875
3766 my $fh = pidfile; 3876 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$; 3877 unlink $PIDFILE if <$fh> == $$;
3768} 3878}
… …
3792 } 3902 }
3793} 3903}
3794 3904
3795sub do_reload_perl() { 3905sub do_reload_perl() {
3796 # can/must only be called in main 3906 # can/must only be called in main
3797 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3798 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3799 return; 3909 return;
3800 } 3910 }
3801 3911
3802 return if $RELOAD++; 3912 return if $RELOAD++;
3803 3913
3804 my $t1 = AE::time; 3914 my $t1 = AE::time;
3805 3915
3806 while ($RELOAD) { 3916 while ($RELOAD) {
3807 warn "reloading..."; 3917 info "reloading...";
3808 3918
3809 warn "entering sync_job"; 3919 trace "entering sync_job";
3810 3920
3811 cf::sync_job { 3921 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 cf::emergency_save; 3922 cf::emergency_save;
3814 cf::write_runtime_sync; # external watchdog should not bark
3815 3923
3816 warn "syncing database to disk";
3817 BDB::db_env_txn_checkpoint $DB_ENV;
3818
3819 # if anything goes wrong in here, we should simply crash as we already saved
3820
3821 warn "flushing outstanding aio requests";
3822 while (IO::AIO::nreqs || BDB::nreqs) {
3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3824 }
3825
3826 warn "cancelling all extension coros"; 3924 trace "cancelling all extension coros";
3827 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3828 %EXT_CORO = (); 3926 %EXT_CORO = ();
3829 3927
3830 warn "removing commands"; 3928 trace "removing commands";
3831 %COMMAND = (); 3929 %COMMAND = ();
3832 3930
3833 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3834 %EXTCMD = (); 3932 %EXTCMD = ();
3835 %EXTICMD = (); 3933 %EXTICMD = ();
3836 3934
3837 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3838 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3839 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3840 3938
3841 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3842 eval { 3940 eval {
3843 $cb->($pkg); 3941 $cb->($pkg);
3844 1 3942 1
3845 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3846 } 3944 }
3847 3945
3848 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3849 clear_package $pkg; 3947 clear_package $pkg;
3850 } 3948 }
3851 3949
3852 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855 3953
3856 warn "... unloading $k"; 3954 trace "... unloading $k";
3857 delete $INC{$k}; 3955 delete $INC{$k};
3858 3956
3859 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3861 3959
… …
3864 } 3962 }
3865 3963
3866 clear_package $k; 3964 clear_package $k;
3867 } 3965 }
3868 3966
3869 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3870 clear_package "safe::$_" 3968 clear_package "safe::$_"
3871 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);
3872 3970
3873 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3874 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3876 3974
3877 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3878 # and global variables created in xs 3976 # and global variables created in xs
3879 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3880 3978
3881 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3882 3980
3883 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3884 require cf; 3982 require cf;
3885 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3886 3984
3887 warn "loading config and database again"; 3985 trace "loading config and database again";
3888 cf::reload_config; 3986 cf::reload_config;
3889 3987
3890 warn "loading extensions"; 3988 trace "loading extensions";
3891 cf::load_extensions; 3989 cf::load_extensions;
3892 3990
3893 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3894 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3895 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3896 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3897 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3898 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3899 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3900 } 3998 }
3901 3999
3902 warn "running post_init jobs"; 4000 trace "running post_init jobs";
3903 (pop @POST_INIT)->(1) while @POST_INIT; 4001 (pop @POST_INIT)->(1) while @POST_INIT;
3904 4002
3905 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3906 4004
3907 1 4005 1
3908 } or do { 4006 } or do {
3909 warn $@; 4007 error $@;
3910 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3911 }; 4009 };
3912 4010
3913 warn "reloaded"; 4011 info "reloaded";
3914 --$RELOAD; 4012 --$RELOAD;
3915 } 4013 }
3916 4014
3917 $t1 = AE::time - $t1; 4015 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n"; 4016 info "reload completed in ${t1}s\n";
3919}; 4017};
3920 4018
3921our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3922 4020
3923sub reload_perl() { 4021sub reload_perl() {
… …
3944 reload_perl; 4042 reload_perl;
3945 }; 4043 };
3946 } 4044 }
3947}; 4045};
3948 4046
3949unshift @INC, $LIBDIR; 4047#############################################################################
3950 4048
3951my $bug_warning = 0; 4049my $bug_warning = 0;
3952 4050
3953our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3954our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
… …
3983 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3984 $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.;
3985 Coro::async_pool { 4083 Coro::async_pool {
3986 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3987 write_runtime_sync 4085 write_runtime_sync
3988 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3989 }; 4087 };
3990 } 4088 }
3991 4089
3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3993 $sig->send; 4091 $sig->send;
… …
4001 4099
4002 if (0) { 4100 if (0) {
4003 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
4007 } 4105 }
4008 } 4106 }
4009} 4107}
4010 4108
4011{ 4109{

Diff Legend

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