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.526 by root, Wed Apr 21 05:48:35 2010 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 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
… …
121our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 127our $DB_ENV;
125 128
126our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
… …
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
… …
1857} 1869}
1858 1870
1859sub normalise { 1871sub normalise {
1860 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1861 1873
1862 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1863 1875
1864 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1865 1877
1866 # map plan: 1878 # map plan:
1867 # 1879 #
… …
1906 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1907 return $self; 1919 return $self;
1908 } 1920 }
1909 } 1921 }
1910 1922
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1924 ()
1913} 1925}
1914 1926
1915sub init { 1927sub init {
1916 my ($self) = @_; 1928 my ($self) = @_;
… …
2038} 2050}
2039 2051
2040sub find; 2052sub find;
2041sub find { 2053sub find {
2042 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
2055
2056 cf::cede_to_tick;
2043 2057
2044 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
2045 2059
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2162 or next; 2176 or next;
2163 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2164 or next; 2178 or next;
2165 $neigh->load; 2179 $neigh->load;
2166 2180
2181 # now find the diagonal neighbours
2167 push @neigh, 2182 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2185 }
2171 2186
… …
2178} 2193}
2179 2194
2180sub find_sync { 2195sub find_sync {
2181 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2182 2197
2183 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2184} 2202}
2185 2203
2186sub do_load_sync { 2204sub do_load_sync {
2187 my ($map) = @_; 2205 my ($map) = @_;
2188 2206
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2191 2209
2192 cf::sync_job { $map->load }; 2210 $map->load;
2193} 2211}
2194 2212
2195our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2197 2215
… …
2309 2327
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2329
2312 return if $self->players; 2330 return if $self->players;
2313 2331
2314 warn "resetting map ", $self->path, "\n"; 2332 cf::trace "resetting map ", $self->path, "\n";
2315 2333
2316 $self->in_memory (cf::MAP_SWAPPED); 2334 $self->in_memory (cf::MAP_SWAPPED);
2317 2335
2318 # need to save uniques path 2336 # need to save uniques path
2319 unless ($self->{deny_save}) { 2337 unless ($self->{deny_save}) {
… …
2583 2601
2584Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2585 2603
2586The player should be reasonably safe there for short amounts of time (e.g. 2604The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2606though, as the player cannot control the character while it is on the link
2589map. 2607map.
2590 2608
2591Will never block. 2609Will never block.
2592 2610
2593=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2615 my ($self) = @_; 2633 my ($self) = @_;
2616 2634
2617 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2618 2636
2637 ++$self->{_link_recursion};
2638
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2640
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2623 2643
… …
2654 $map->load_neighbours; 2674 $map->load_neighbours;
2655 2675
2656 return unless $self->contr->active; 2676 return unless $self->contr->active;
2657 2677
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2660 2680 # entering was successful
2681 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2683 $self->activate_recursive;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again 2684 }
2664}
2665 2685
2686}
2687
2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2667 2689
2668Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2669her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2670that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2671the new (success) or old (failed) map position. In either case, $done will 2693the new (success) or old (failed) map position. In either case, $done will
… …
2678 2700
2679our $GOTOGEN; 2701our $GOTOGEN;
2680 2702
2681sub cf::object::player::goto { 2703sub cf::object::player::goto {
2682 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2683 2711
2684 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2714
2687 $self->enter_link; 2715 $self->enter_link;
… …
2711 my $map = eval { 2739 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2713 2741
2714 if ($map) { 2742 if ($map) {
2715 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2745 } else {
2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2719 } 2747 }
2720 2748
2721 $map 2749 $map
… …
2729 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2732 } 2760 }
2733 2761
2734 $done->() if $done; 2762 $done->($self) if $done;
2735 })->prio (1); 2763 })->prio (1);
2736} 2764}
2737 2765
2738=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2739 2767
… …
2832 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2834 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2836 2864
2837 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 2866 $self->leave_link;
2839 } 2867 }
2840 })->prio (1); 2868 })->prio (1);
2841} 2869}
2842 2870
… …
3155 3183
3156 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3157 if $reply; 3185 if $reply;
3158 3186
3159 } else { 3187 } else {
3160 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161 } 3189 }
3162 3190
3163 cf::override; 3191 cf::override;
3164 }, 3192 },
3165); 3193);
… …
3246 decrease split destroy change_exp value msg lore send_msg)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3247 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3248 ["cf::player" => qw(peaceful send_msg)], 3276 ["cf::player" => qw(peaceful send_msg)],
3249 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3250) { 3278) {
3251 no strict 'refs';
3252 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254 for @funs; 3281 for @funs;
3255} 3282}
3256 3283
… …
3295 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3324 }
3298 3325
3299 if ($@) { 3326 if ($@) {
3300 warn "$@"; 3327 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3303 } 3330 }
3304 3331
3305 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3306} 3333}
3307 3334
… …
3341 # for this (global event?) 3368 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3343 3370
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3372
3346 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3347 3374
3348 my $facedata; 3375 my $facedata;
3349 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3350 or die "$path: $!"; 3377 or die "$path: $!";
3351 3378
… …
3385 3412
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3416 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3418 }
3392 3419
3393 cf::cede_to_tick; 3420 cf::cede_to_tick;
3394 } 3421 }
3395 } 3422 }
… …
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3441
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3417 } else { 3444 } else {
3418 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3419 } 3446 }
3420 3447
3421 cf::cede_to_tick; 3448 cf::cede_to_tick;
3422 } 3449 }
3423 } 3450 }
3424 3451
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3453
3427 1 3454 1
3428} 3455}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3456
3450register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3452 3459
3453 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3492sub reload_treasures { 3499sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3495} 3502}
3496 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3497sub reload_resources { 3527sub reload_resources {
3498 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3499 3529
3500 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3501 reload_archetypes; 3532 reload_archetypes;
3502 reload_regions; 3533 reload_regions;
3503 reload_treasures; 3534 reload_treasures;
3504 3535
3505 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3506} 3537}
3507 3538
3508sub reload_config { 3539sub reload_config {
3509 warn "reloading config file...\n"; 3540 trace "reloading config file...\n";
3510 3541
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3512 or return; 3543 or return;
3513 3544
3514 local $/; 3545 local $/;
3515 *CFG = YAML::XS::Load scalar <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3516 3547
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3549
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3552
3522 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
… …
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3557 };
3527 warn $@ if $@; 3558 warn $@ if $@;
3528 } 3559 }
3529 3560
3530 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3531} 3562}
3532 3563
3533sub pidfile() { 3564sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
… …
3548 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3549 print $fh $$; 3580 print $fh $$;
3550} 3581}
3551 3582
3552sub main_loop { 3583sub main_loop {
3553 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3554 if (1) { 3585 if (1) {
3555 EV::loop; 3586 EV::loop;
3556 } 3587 }
3557 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3559} 3590}
3560 3591
3561sub main { 3592sub main {
3562 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
3563 3594
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3596 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568 3599
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570 3601
… …
3578 }; 3609 };
3579 3610
3580 evthread_start IO::AIO::poll_fileno; 3611 evthread_start IO::AIO::poll_fileno;
3581 3612
3582 cf::sync_job { 3613 cf::sync_job {
3614 cf::incloader::init ();
3615
3583 cf::init_experience; 3616 cf::init_experience;
3584 cf::init_anim; 3617 cf::init_anim;
3585 cf::init_attackmess; 3618 cf::init_attackmess;
3586 cf::init_dynamic; 3619 cf::init_dynamic;
3587 3620
… …
3610 3643
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3644 (pop @POST_INIT)->(0) while @POST_INIT;
3612 }; 3645 };
3613 3646
3614 cf::object::thawer::errors_are_fatal 0; 3647 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3648 info "parse errors in files are no longer fatal from this point on.\n";
3616 3649
3650 my $free_main; $free_main = EV::idle sub {
3651 undef $free_main;
3652 undef &main; # free gobs of memory :)
3653 };
3654
3617 main_loop; 3655 goto &main_loop;
3618} 3656}
3619 3657
3620############################################################################# 3658#############################################################################
3621# initialisation and cleanup 3659# initialisation and cleanup
3622 3660
… …
3661 or return; 3699 or return;
3662 3700
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3701 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3702 and return;
3665 3703
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3704 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3705
3668 1 3706 1
3669} 3707}
3670 3708
3671our $uuid_lock; 3709our $uuid_lock;
… …
3683 or return; 3721 or return;
3684 3722
3685 my $value = uuid_seq uuid_cur; 3723 my $value = uuid_seq uuid_cur;
3686 3724
3687 unless ($value) { 3725 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 3726 info "cowardly refusing to write zero uuid value!\n";
3689 return; 3727 return;
3690 } 3728 }
3691 3729
3692 my $value = uuid_str $value + $uuid_skip; 3730 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 3731 $uuid_skip = 0;
… …
3703 or return; 3741 or return;
3704 3742
3705 aio_rename "$uuid~", $uuid 3743 aio_rename "$uuid~", $uuid
3706 and return; 3744 and return;
3707 3745
3708 warn "uuid file written ($value).\n"; 3746 trace "uuid file written ($value).\n";
3709 3747
3710 1 3748 1
3711 3749
3712} 3750}
3713 3751
… …
3719} 3757}
3720 3758
3721sub emergency_save() { 3759sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 3760 my $freeze_guard = cf::freeze_mainloop;
3723 3761
3724 warn "emergency_perl_save: enter\n"; 3762 info "emergency_perl_save: enter\n";
3763
3764 # this is a trade-off: we want to be very quick here, so
3765 # save all maps without fsync, and later call a global sync
3766 # (which in turn might be very very slow)
3767 local $USE_FSYNC = 0;
3725 3768
3726 cf::sync_job { 3769 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so 3770 cf::write_runtime_sync; # external watchdog should not bark
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731 3771
3732 # use a peculiar iteration method to avoid tripping on perl 3772 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 3773 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 3774 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 3775 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 3776 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 3777 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 3778 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3779 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 3780 $pl->save;
3741 } 3781 }
3742 warn "emergency_perl_save: end player save\n"; 3782 info "emergency_perl_save: end player save\n";
3743 3783
3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3744 warn "emergency_perl_save: begin map save\n"; 3786 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 3787 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 3788 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 3789 $map->valid or next;
3748 $map->save; 3790 $map->save;
3749 } 3791 }
3750 warn "emergency_perl_save: end map save\n"; 3792 info "emergency_perl_save: end map save\n";
3751 3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3752 warn "emergency_perl_save: begin database checkpoint\n"; 3796 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 3797 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 3798 info "emergency_perl_save: end database checkpoint\n";
3755 3799
3756 warn "emergency_perl_save: begin write uuid\n"; 3800 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 3801 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 3802 info "emergency_perl_save: end write uuid\n";
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: syncing database to disk";
3807 BDB::db_env_txn_checkpoint $DB_ENV;
3808
3809 info "emergency_perl_save: starting sync\n";
3810 IO::AIO::aio_sync sub {
3811 info "emergency_perl_save: finished sync\n";
3812 };
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3816 trace "emergency_perl_save: flushing outstanding aio requests";
3817 while (IO::AIO::nreqs || BDB::nreqs) {
3818 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3819 }
3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3759 }; 3822 };
3760 3823
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3766 warn "emergency_perl_save: leave\n"; 3824 info "emergency_perl_save: leave\n";
3767} 3825}
3768 3826
3769sub post_cleanup { 3827sub post_cleanup {
3770 my ($make_core) = @_; 3828 my ($make_core) = @_;
3771 3829
3830 IO::AIO::flush;
3831
3772 warn Carp::longmess "post_cleanup backtrace" 3832 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 3833 if $make_core;
3774 3834
3775 my $fh = pidfile; 3835 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 3836 unlink $PIDFILE if <$fh> == $$;
3777} 3837}
… …
3801 } 3861 }
3802} 3862}
3803 3863
3804sub do_reload_perl() { 3864sub do_reload_perl() {
3805 # can/must only be called in main 3865 # can/must only be called in main
3806 if (in_main) { 3866 unless (in_main) {
3807 warn "can only reload from main coroutine"; 3867 error "can only reload from main coroutine";
3808 return; 3868 return;
3809 } 3869 }
3810 3870
3811 return if $RELOAD++; 3871 return if $RELOAD++;
3812 3872
3813 my $t1 = AE::time; 3873 my $t1 = AE::time;
3814 3874
3815 while ($RELOAD) { 3875 while ($RELOAD) {
3876 cf::get_slot 0.1, -1, "reload_perl";
3816 warn "reloading..."; 3877 info "reloading...";
3817 3878
3818 warn "entering sync_job"; 3879 trace "entering sync_job";
3819 3880
3820 cf::sync_job { 3881 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 3882 #cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark
3824 3883
3825 warn "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828 # if anything goes wrong in here, we should simply crash as we already saved
3829
3830 warn "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 }
3834
3835 warn "cancelling all extension coros"; 3884 trace "cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 3885 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 3886 %EXT_CORO = ();
3838 3887
3839 warn "removing commands"; 3888 trace "removing commands";
3840 %COMMAND = (); 3889 %COMMAND = ();
3841 3890
3842 warn "removing ext/exti commands"; 3891 trace "removing ext/exti commands";
3843 %EXTCMD = (); 3892 %EXTCMD = ();
3844 %EXTICMD = (); 3893 %EXTICMD = ();
3845 3894
3846 warn "unloading/nuking all extensions"; 3895 trace "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 3896 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 3897 trace "... unloading $pkg";
3849 3898
3850 if (my $cb = $pkg->can ("unload")) { 3899 if (my $cb = $pkg->can ("unload")) {
3851 eval { 3900 eval {
3852 $cb->($pkg); 3901 $cb->($pkg);
3853 1 3902 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 3903 } or error "$pkg unloaded, but with errors: $@";
3855 } 3904 }
3856 3905
3857 warn "... clearing $pkg"; 3906 trace "... clearing $pkg";
3858 clear_package $pkg; 3907 clear_package $pkg;
3859 } 3908 }
3860 3909
3861 warn "unloading all perl modules loaded from $LIBDIR"; 3910 trace "unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 3911 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3912 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 3913
3865 warn "... unloading $k"; 3914 trace "... unloading $k";
3866 delete $INC{$k}; 3915 delete $INC{$k};
3867 3916
3868 $k =~ s/\.pm$//; 3917 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 3918 $k =~ s/\//::/g;
3870 3919
… …
3873 } 3922 }
3874 3923
3875 clear_package $k; 3924 clear_package $k;
3876 } 3925 }
3877 3926
3878 warn "getting rid of safe::, as good as possible"; 3927 trace "getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 3928 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3929 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 3930
3882 warn "unloading cf.pm \"a bit\""; 3931 trace "unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 3932 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3933 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 3934
3886 # don't, removes xs symbols, too, 3935 # don't, removes xs symbols, too,
3887 # and global variables created in xs 3936 # and global variables created in xs
3888 #clear_package __PACKAGE__; 3937 #clear_package __PACKAGE__;
3889 3938
3890 warn "unload completed, starting to reload now"; 3939 info "unload completed, starting to reload now";
3891 3940
3892 warn "reloading cf.pm"; 3941 trace "reloading cf.pm";
3893 require cf; 3942 require cf;
3894 cf::_connect_to_perl_1; 3943 cf::_connect_to_perl_1;
3895 3944
3896 warn "loading config and database again"; 3945 trace "loading config and database again";
3897 cf::reload_config; 3946 cf::reload_config;
3898 3947
3899 warn "loading extensions"; 3948 trace "loading extensions";
3900 cf::load_extensions; 3949 cf::load_extensions;
3901 3950
3902 if ($REATTACH_ON_RELOAD) { 3951 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 3952 trace "reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 3953 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 3954 trace "reattaching attachments to maps";
3906 reattach $_ for values %MAP; 3955 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 3956 trace "reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 3957 reattach $_ for values %PLAYER;
3909 } 3958 }
3910 3959
3911 warn "running post_init jobs"; 3960 trace "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT; 3961 (pop @POST_INIT)->(1) while @POST_INIT;
3913 3962
3914 warn "leaving sync_job"; 3963 trace "leaving sync_job";
3915 3964
3916 1 3965 1
3917 } or do { 3966 } or do {
3918 warn $@; 3967 error $@;
3919 cf::cleanup "error while reloading, exiting."; 3968 cf::cleanup "error while reloading, exiting.";
3920 }; 3969 };
3921 3970
3922 warn "reloaded"; 3971 info "reloaded";
3923 --$RELOAD; 3972 --$RELOAD;
3924 } 3973 }
3925 3974
3926 $t1 = AE::time - $t1; 3975 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 3976 info "reload completed in ${t1}s\n";
3928}; 3977};
3929 3978
3930our $RELOAD_WATCHER; # used only during reload 3979our $RELOAD_WATCHER; # used only during reload
3931 3980
3932sub reload_perl() { 3981sub reload_perl() {
… …
3953 reload_perl; 4002 reload_perl;
3954 }; 4003 };
3955 } 4004 }
3956}; 4005};
3957 4006
3958unshift @INC, $LIBDIR; 4007#############################################################################
3959 4008
3960my $bug_warning = 0; 4009my $bug_warning = 0;
3961 4010
3962our @WAIT_FOR_TICK; 4011our @WAIT_FOR_TICK;
3963our @WAIT_FOR_TICK_BEGIN; 4012our @WAIT_FOR_TICK_BEGIN;
… …
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4041 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4042 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4043 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4044 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4045 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4046 or error "ERROR: unable to write runtime file: $!";
3998 }; 4047 };
3999 } 4048 }
4000 4049
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4050 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4051 $sig->send;
… …
4010 4059
4011 if (0) { 4060 if (0) {
4012 if ($NEXT_TICK) { 4061 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4062 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4063 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4064 debug "jitter $JITTER\n";#d#
4016 } 4065 }
4017 } 4066 }
4018} 4067}
4019 4068
4020{ 4069{

Diff Legend

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