ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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";
1442 1456
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1445 1459
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1462 } else {
1449 $done{$k} = delete $todo{$k}; 1463 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1464 push @EXTS, $v->{pkg};
1451 $progress = 1; 1465 $progress = 1;
1452 1466
1453 warn "$v->{base}: extension inactive.\n" 1467 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1468 unless $active;
1455 } 1469 }
1456 } 1470 }
1457 1471
1458 unless ($progress) { 1472 unless ($progress) {
… …
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1645
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1647 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1638 1651
1639 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1835 1848
1836sub register { 1849sub register {
1837 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1851 my $pkg = caller;
1839 1852
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1854
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1856}
1845 1857
1846# also paths starting with '/' 1858# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1860
1849sub thawer_merge { 1861sub thawer_merge {
1850 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1851 1863
1852 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
… …
2162 or next; 2174 or next;
2163 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2164 or next; 2176 or next;
2165 $neigh->load; 2177 $neigh->load;
2166 2178
2179 # now find the diagonal neighbours
2167 push @neigh, 2180 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2183 }
2171 2184
… …
2178} 2191}
2179 2192
2180sub find_sync { 2193sub find_sync {
2181 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2182 2195
2183 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2184} 2200}
2185 2201
2186sub do_load_sync { 2202sub do_load_sync {
2187 my ($map) = @_; 2203 my ($map) = @_;
2188 2204
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2191 2207
2192 cf::sync_job { $map->load }; 2208 $map->load;
2193} 2209}
2194 2210
2195our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2197 2213
… …
2309 2325
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2327
2312 return if $self->players; 2328 return if $self->players;
2313 2329
2314 warn "resetting map ", $self->path, "\n"; 2330 cf::trace "resetting map ", $self->path, "\n";
2315 2331
2316 $self->in_memory (cf::MAP_SWAPPED); 2332 $self->in_memory (cf::MAP_SWAPPED);
2317 2333
2318 # need to save uniques path 2334 # need to save uniques path
2319 unless ($self->{deny_save}) { 2335 unless ($self->{deny_save}) {
… …
2343 2359
2344 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2345 2361
2346 $self->unlink_save; 2362 $self->unlink_save;
2347 2363
2348 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2369
… …
2583 2599
2584Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2585 2601
2586The player should be reasonably safe there for short amounts of time (e.g. 2602The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2603for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2604though, as the player cannot control the character while it is on the link
2589map. 2605map.
2590 2606
2591Will never block. 2607Will never block.
2592 2608
2593=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2615 my ($self) = @_; 2631 my ($self) = @_;
2616 2632
2617 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2618 2634
2635 ++$self->{_link_recursion};
2636
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2638
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2623 2641
… …
2654 $map->load_neighbours; 2672 $map->load_neighbours;
2655 2673
2656 return unless $self->contr->active; 2674 return unless $self->contr->active;
2657 2675
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2660 2678 # entering was successful
2679 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2680 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2681 $self->activate_recursive;
2663} 2682 }
2664 2683
2684}
2685
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2687
2667Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2690that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2691the new (success) or old (failed) map position. In either case, $done will
… …
2677 2698
2678our $GOTOGEN; 2699our $GOTOGEN;
2679 2700
2680sub cf::object::player::goto { 2701sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2682 2709
2683 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2712
2686 $self->enter_link; 2713 $self->enter_link;
… …
2710 my $map = eval { 2737 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2712 2739
2713 if ($map) { 2740 if ($map) {
2714 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2743 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2745 }
2719 2746
2720 $map 2747 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2731 } 2758 }
2732 2759
2733 $done->() if $done; 2760 $done->($self) if $done;
2734 })->prio (1); 2761 })->prio (1);
2735} 2762}
2736 2763
2737=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2738 2765
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2862
2836 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2864 $self->leave_link;
2838 } 2865 }
2839 })->prio (1); 2866 })->prio (1);
2840} 2867}
2841 2868
… …
3154 3181
3155 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3183 if $reply;
3157 3184
3158 } else { 3185 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3187 }
3161 3188
3162 cf::override; 3189 cf::override;
3163 }, 3190 },
3164); 3191);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3274 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3249) { 3276) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3279 for @funs;
3254} 3280}
3255 3281
… …
3294 local @cf::_safe_eval_args = values %vars; 3320 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3321 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3322 }
3297 3323
3298 if ($@) { 3324 if ($@) {
3299 warn "$@"; 3325 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3302 } 3328 }
3303 3329
3304 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3305} 3331}
3306 3332
… …
3331=cut 3357=cut
3332 3358
3333############################################################################# 3359#############################################################################
3334# the server's init and main functions 3360# the server's init and main functions
3335 3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3403
3336sub load_facedata($) { 3404sub load_facedata($) {
3337 my ($path) = @_; 3405 my ($path) = @_;
3338 3406
3339 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3340 # for this (global event?) 3408 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3410
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3412
3345 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3346 3414
3347 my $facedata; 3415 my $facedata;
3348 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3349 or die "$path: $!"; 3417 or die "$path: $!";
3350 3418
… …
3384 3452
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3456 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3458 }
3391 3459
3392 cf::cede_to_tick; 3460 cf::cede_to_tick;
3393 } 3461 }
3394 } 3462 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3481
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3416 } else { 3484 } else {
3417 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3418 } 3486 }
3419 3487
3420 cf::cede_to_tick; 3488 cf::cede_to_tick;
3421 } 3489 }
3422 } 3490 }
3423 3491
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3493
3426 1 3494 1
3427} 3495}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3496
3449register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3451 3499
3452 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3539sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3494} 3542}
3495 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3496sub reload_resources { 3567sub reload_resources {
3497 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3498 3569
3499 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3500 reload_archetypes; 3572 reload_archetypes;
3501 reload_regions; 3573 reload_regions;
3502 reload_treasures; 3574 reload_treasures;
3503 3575
3504 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3505} 3577}
3506 3578
3507sub reload_config { 3579sub reload_config {
3508 warn "reloading config file...\n"; 3580 trace "reloading config file...\n";
3509 3581
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3511 or return; 3583 or return;
3512 3584
3513 local $/; 3585 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3515 3587
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3589
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3592
3521 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
… …
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3597 };
3526 warn $@ if $@; 3598 warn $@ if $@;
3527 } 3599 }
3528 3600
3529 warn "finished reloading resource files\n"; 3601 trace "finished reloading resource files\n";
3530} 3602}
3531 3603
3532sub pidfile() { 3604sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3548 print $fh $$; 3620 print $fh $$;
3549} 3621}
3550 3622
3551sub main_loop { 3623sub main_loop {
3552 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3553 if (1) { 3625 if (1) {
3554 EV::loop; 3626 EV::loop;
3555 } 3627 }
3556 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3558} 3630}
3559 3631
3560sub main { 3632sub main {
3561 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3562 3634
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3639
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3641
… …
3577 }; 3649 };
3578 3650
3579 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3580 3652
3581 cf::sync_job { 3653 cf::sync_job {
3654 init_inc;
3655
3582 cf::init_experience; 3656 cf::init_experience;
3583 cf::init_anim; 3657 cf::init_anim;
3584 cf::init_attackmess; 3658 cf::init_attackmess;
3585 cf::init_dynamic; 3659 cf::init_dynamic;
3586 3660
… …
3609 3683
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3611 }; 3685 };
3612 3686
3613 cf::object::thawer::errors_are_fatal 0; 3687 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3688 info "parse errors in files are no longer fatal from this point on.\n";
3615 3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3616 main_loop; 3695 goto &main_loop;
3617} 3696}
3618 3697
3619############################################################################# 3698#############################################################################
3620# initialisation and cleanup 3699# initialisation and cleanup
3621 3700
… …
3660 or return; 3739 or return;
3661 3740
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3742 and return;
3664 3743
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3745
3667 1 3746 1
3668} 3747}
3669 3748
3670our $uuid_lock; 3749our $uuid_lock;
… …
3682 or return; 3761 or return;
3683 3762
3684 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3685 3764
3686 unless ($value) { 3765 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3767 return;
3689 } 3768 }
3690 3769
3691 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3771 $uuid_skip = 0;
… …
3702 or return; 3781 or return;
3703 3782
3704 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3705 and return; 3784 and return;
3706 3785
3707 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3708 3787
3709 1 3788 1
3710 3789
3711} 3790}
3712 3791
… …
3718} 3797}
3719 3798
3720sub emergency_save() { 3799sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3722 3801
3723 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3724 3808
3725 cf::sync_job { 3809 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3811
3731 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3818 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3820 $pl->save;
3740 } 3821 }
3741 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3742 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3743 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3829 $map->valid or next;
3747 $map->save; 3830 $map->save;
3748 } 3831 }
3749 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3750 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3754 3839
3755 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3841 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3862 };
3759 3863
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3766} 3865}
3767 3866
3768sub post_cleanup { 3867sub post_cleanup {
3769 my ($make_core) = @_; 3868 my ($make_core) = @_;
3770 3869
3870 IO::AIO::flush;
3871
3771 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3873 if $make_core;
3773 3874
3774 my $fh = pidfile; 3875 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3776} 3877}
… …
3801} 3902}
3802 3903
3803sub do_reload_perl() { 3904sub do_reload_perl() {
3804 # can/must only be called in main 3905 # can/must only be called in main
3805 if (in_main) { 3906 if (in_main) {
3806 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3807 return; 3908 return;
3808 } 3909 }
3809 3910
3810 return if $RELOAD++; 3911 return if $RELOAD++;
3811 3912
3812 my $t1 = AE::time; 3913 my $t1 = AE::time;
3813 3914
3814 while ($RELOAD) { 3915 while ($RELOAD) {
3815 warn "reloading..."; 3916 info "reloading...";
3816 3917
3817 warn "entering sync_job"; 3918 trace "entering sync_job";
3818 3919
3819 cf::sync_job { 3920 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3921 cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3922
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3925 %EXT_CORO = ();
3837 3926
3838 warn "removing commands"; 3927 trace "removing commands";
3839 %COMMAND = (); 3928 %COMMAND = ();
3840 3929
3841 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3842 %EXTCMD = (); 3931 %EXTCMD = ();
3843 %EXTICMD = (); 3932 %EXTICMD = ();
3844 3933
3845 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3848 3937
3849 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3939 eval {
3851 $cb->($pkg); 3940 $cb->($pkg);
3852 1 3941 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3854 } 3943 }
3855 3944
3856 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3857 clear_package $pkg; 3946 clear_package $pkg;
3858 } 3947 }
3859 3948
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3952
3864 warn "... unloading $k"; 3953 trace "... unloading $k";
3865 delete $INC{$k}; 3954 delete $INC{$k};
3866 3955
3867 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3869 3958
… …
3872 } 3961 }
3873 3962
3874 clear_package $k; 3963 clear_package $k;
3875 } 3964 }
3876 3965
3877 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3967 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 3969
3881 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3973
3885 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3975 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3888 3977
3889 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3890 3979
3891 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3892 require cf; 3981 require cf;
3893 cf::_connect_to_perl_1; 3982 cf::_connect_to_perl_1;
3894 3983
3895 warn "loading config and database again"; 3984 trace "loading config and database again";
3896 cf::reload_config; 3985 cf::reload_config;
3897 3986
3898 warn "loading extensions"; 3987 trace "loading extensions";
3899 cf::load_extensions; 3988 cf::load_extensions;
3900 3989
3901 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3905 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3908 } 3997 }
3909 3998
3910 warn "running post_init jobs"; 3999 trace "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4001
3913 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3914 4003
3915 1 4004 1
3916 } or do { 4005 } or do {
3917 warn $@; 4006 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3919 }; 4008 };
3920 4009
3921 warn "reloaded"; 4010 info "reloaded";
3922 --$RELOAD; 4011 --$RELOAD;
3923 } 4012 }
3924 4013
3925 $t1 = AE::time - $t1; 4014 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4015 info "reload completed in ${t1}s\n";
3927}; 4016};
3928 4017
3929our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3930 4019
3931sub reload_perl() { 4020sub reload_perl() {
… …
3952 reload_perl; 4041 reload_perl;
3953 }; 4042 };
3954 } 4043 }
3955}; 4044};
3956 4045
3957unshift @INC, $LIBDIR; 4046#############################################################################
3958 4047
3959my $bug_warning = 0; 4048my $bug_warning = 0;
3960 4049
3961our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4082 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4084 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3997 }; 4086 };
3998 } 4087 }
3999 4088
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4090 $sig->send;
… …
4009 4098
4010 if (0) { 4099 if (0) {
4011 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
4015 } 4104 }
4016 } 4105 }
4017} 4106}
4018 4107
4019{ 4108{

Diff Legend

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