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.516 by root, Thu Apr 15 06:05:52 2010 UTC vs.
Revision 1.536 by root, Thu Apr 29 08:26:38 2010 UTC

… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 112
113our $OUTPUT_RATE_MIN = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
165 168
166our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
167 170
168sub cf::map::normalise; 171sub cf::map::normalise;
169 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
170############################################################################# 177#############################################################################
171 178
172%REFLECT = (); 179%REFLECT = ();
173for (@REFLECT) { 180for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
245 252
246=back 253=back
247 254
248=cut 255=cut
249 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
250$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 264 my $msg = join "", @_;
252 265
253 $msg .= "\n" 266 $msg .= "\n"
254 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
255 268
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 270
258 LOG llevError, $msg; 271 LOG llevWarn, $msg;
259}; 272};
260 273
261$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
263 276
264 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
265 278
266 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 281 return;#d#
269 }#d# 282 }#d#
270 283
271 # kill coroutine otherwise 284 # kill coroutine otherwise
272 Coro::terminate 285 Coro::terminate
… …
505=cut 518=cut
506 519
507sub sync_job(&) { 520sub sync_job(&) {
508 my ($job) = @_; 521 my ($job) = @_;
509 522
510 if ($Coro::current == $Coro::main) { 523 if (in_main) {
511 my $time = AE::time; 524 my $time = AE::time;
512 525
513 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
515 528
516 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
517 530
518 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
519 532
520 my $busy = 1; 533 my $busy = 1;
521 my @res; 534 my @res;
522 535
523 (async { 536 (async {
524 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 538 @res = eval { $job->() };
526 warn $@ if $@; 539 error $@ if $@;
527 undef $busy; 540 undef $busy;
528 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
529 542
530 while ($busy) { 543 while ($busy) {
531 if (Coro::nready) { 544 if (Coro::nready) {
… …
644within each server. 657within each server.
645 658
646=cut 659=cut
647 660
648sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
649 my ($name) = @_; 665 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
651 667
652 eval { 668 eval {
653 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
663} 679}
664 680
665our $DB; 681our $DB;
666 682
667sub db_init { 683sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
670 };
671} 685}
672 686
673sub db_get($$) { 687sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
675 689
676 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
677 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
678 694
679 $! ? () 695 $! ? ()
680 : $data 696 : $data
681 }
682} 697}
683 698
684sub db_put($$$) { 699sub db_put($$$) {
685 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 757
743 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 759 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
746 761
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 763
749 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
752 767
… …
762 777
763=cut 778=cut
764 779
765sub datalog($@) { 780sub datalog($@) {
766 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 783}
769 784
770=back 785=back
771 786
772=cut 787=cut
… …
967 982
968 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 985
971 } elsif (ref $type) { 986 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
973 988
974 } else { 989 } else {
975 shift @arg; 990 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
977 } 992 }
978 } 993 }
979} 994}
980 995
981sub _object_attach { 996sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
992 } 1007 }
993 1008
994 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
995 } else { 1010 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1012 }
998 1013
999 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
1000} 1015}
1001 1016
… …
1060 1075
1061 for (@$callbacks) { 1076 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1063 1078
1064 if ($@) { 1079 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1081 override;
1068 } 1082 }
1069 1083
1070 return 1 if $override; 1084 return 1 if $override;
1071 } 1085 }
… …
1150 for (@$attach) { 1164 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1153 } 1167 }
1154 } else { 1168 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1170 }
1157 } 1171 }
1158} 1172}
1159 1173
1160cf::attachable->attach ( 1174cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1188 1202
1189 sync_job { 1203 sync_job {
1190 if (length $$rdata) { 1204 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1194 1209
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1221 1236
1222 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1239 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1226 } 1241 }
1227 } else { 1242 } else {
1228 aio_unlink $filename; 1243 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1230 } 1245 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1270 $av = $st->{objs};
1256 } 1271 }
1257 1272
1258 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1261 1277
1262 ($data, $av) 1278 ($data, $av)
1263} 1279}
1264 1280
1265=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1357 1373
1358 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1375 if $reply;
1360 1376
1361 } else { 1377 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1379 }
1364 1380
1365 cf::override; 1381 cf::override;
1366 }, 1382 },
1367); 1383);
… …
1378 1394
1379 $grp 1395 $grp
1380} 1396}
1381 1397
1382sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1383 cf::sync_job { 1401 cf::sync_job {
1384 my %todo; 1402 my %todo;
1385 1403
1386 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1405 next unless -r $path;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1446 next ext
1429 unless exists $done{$_}; 1447 unless exists $done{$_};
1430 } 1448 }
1431 1449
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1451
1434 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1435 1453
1436 if (length $@) { 1454 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1438 1456
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1458 if exists $v->{meta}{mandatory};
1459
1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1441 } else { 1462 } else {
1442 $done{$k} = delete $todo{$k}; 1463 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1464 push @EXTS, $v->{pkg};
1444 $progress = 1; 1465 $progress = 1;
1445 1466
1446 warn "$v->{base}: extension inactive.\n" 1467 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1468 unless $active;
1448 } 1469 }
1449 } 1470 }
1450 1471
1451 unless ($progress) { 1472 unless ($progress) {
… …
1623 $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
1624 1645
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1626 $pl->deactivate; 1647 $pl->deactivate;
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1630 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1631 1651
1632 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1688 \@logins 1708 \@logins
1689} 1709}
1690 1710
1691=item $player->maps 1711=item $player->maps
1692 1712
1713=item cf::player::maps $login
1714
1693Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1694player. May block. 1716player. May block.
1695 1717
1696=cut 1718=cut
1697 1719
… …
1758 1780
1759=cut 1781=cut
1760 1782
1761sub find_by_path($) { 1783sub find_by_path($) {
1762 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1763 1787
1764 my ($match, $specificity); 1788 my ($match, $specificity);
1765 1789
1766 for my $region (list) { 1790 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
… …
1831 1855
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1857}
1834 1858
1835# also paths starting with '/' 1859# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1861
1838sub thawer_merge { 1862sub thawer_merge {
1839 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1840 1864
1841 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2151 or next; 2175 or next;
2152 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2153 or next; 2177 or next;
2154 $neigh->load; 2178 $neigh->load;
2155 2179
2180 # now find the diagonal neighbours
2156 push @neigh, 2181 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2184 }
2160 2185
… …
2167} 2192}
2168 2193
2169sub find_sync { 2194sub find_sync {
2170 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2171 2196
2172 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2173} 2201}
2174 2202
2175sub do_load_sync { 2203sub do_load_sync {
2176 my ($map) = @_; 2204 my ($map) = @_;
2177 2205
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2180 2208
2181 cf::sync_job { $map->load }; 2209 $map->load;
2182} 2210}
2183 2211
2184our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2186 2214
… …
2212 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2213 2241
2214 () 2242 ()
2215} 2243}
2216 2244
2245# common code, used by both ->save and ->swapout
2217sub save { 2246sub _save {
2218 my ($self) = @_; 2247 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2248
2222 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2223 2250
2224 return unless $self->dirty; 2251 return unless $self->dirty;
2225 2252
… …
2245 } else { 2272 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2274 }
2248} 2275}
2249 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2250sub swap_out { 2285sub swap_out {
2251 my ($self) = @_; 2286 my ($self) = @_;
2252 2287
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2289
2258 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2260 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2261 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2263 2344
2264 $self->deactivate; 2345 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2347 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2348
2312 $self->unlink_save; 2349 $self->unlink_save;
2313 $self->destroy; 2350 $self->destroy;
2314} 2351}
2315 2352
… …
2323 2360
2324 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2325 2362
2326 $self->unlink_save; 2363 $self->unlink_save;
2327 2364
2328 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2370
… …
2563 2600
2564Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2565 2602
2566The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2567for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2569map. 2606map.
2570 2607
2571Will never block. 2608Will never block.
2572 2609
2573=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2595 my ($self) = @_; 2632 my ($self) = @_;
2596 2633
2597 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2598 2635
2636 ++$self->{_link_recursion};
2637
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2639
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2603 2642
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2644}
2606 2645
2607sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2609 2648
… …
2634 $map->load_neighbours; 2673 $map->load_neighbours;
2635 2674
2636 return unless $self->contr->active; 2675 return unless $self->contr->active;
2637 2676
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2640 2679 # entering was successful
2680 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2682 $self->activate_recursive;
2643} 2683 }
2644 2684
2685}
2686
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2688
2647Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2650the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2657 2699
2658our $GOTOGEN; 2700our $GOTOGEN;
2659 2701
2660sub cf::object::player::goto { 2702sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2662 2710
2663 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2713
2666 $self->enter_link; 2714 $self->enter_link;
… …
2690 my $map = eval { 2738 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2692 2740
2693 if ($map) { 2741 if ($map) {
2694 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2744 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2746 }
2699 2747
2700 $map 2748 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2711 } 2759 }
2712 2760
2713 $done->() if $done; 2761 $done->($self) if $done;
2714 })->prio (1); 2762 })->prio (1);
2715} 2763}
2716 2764
2717=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2718 2766
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2863
2816 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2865 $self->leave_link;
2818 } 2866 }
2819 })->prio (1); 2867 })->prio (1);
2820} 2868}
2821 2869
… …
3134 3182
3135 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3184 if $reply;
3137 3185
3138 } else { 3186 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3188 }
3141 3189
3142 cf::override; 3190 cf::override;
3143 }, 3191 },
3144); 3192);
… …
3274 local @cf::_safe_eval_args = values %vars; 3322 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3323 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3324 }
3277 3325
3278 if ($@) { 3326 if ($@) {
3279 warn "$@"; 3327 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3282 } 3330 }
3283 3331
3284 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3285} 3333}
3286 3334
… …
3320 # for this (global event?) 3368 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3370
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3372
3325 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3326 3374
3327 my $facedata; 3375 my $facedata;
3328 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3329 or die "$path: $!"; 3377 or die "$path: $!";
3330 3378
… …
3364 3412
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3416 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3418 }
3371 3419
3372 cf::cede_to_tick; 3420 cf::cede_to_tick;
3373 } 3421 }
3374 } 3422 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3441
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3396 } else { 3444 } else {
3397 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3398 } 3446 }
3399 3447
3400 cf::cede_to_tick; 3448 cf::cede_to_tick;
3401 } 3449 }
3402 } 3450 }
3403 3451
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3453
3406 1 3454 1
3407} 3455}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3456
3429register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3431 3459
3432 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3499sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3474} 3502}
3475 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
3476sub reload_resources { 3527sub reload_resources {
3477 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3478 3529
3479 reload_facedata; 3530 reload_facedata;
3531 reload_sound;
3480 reload_archetypes; 3532 reload_archetypes;
3481 reload_regions; 3533 reload_regions;
3482 reload_treasures; 3534 reload_treasures;
3483 3535
3484 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
3485} 3537}
3486 3538
3487sub reload_config { 3539sub reload_config {
3488 warn "reloading config file...\n"; 3540 trace "reloading config file...\n";
3489 3541
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
3491 or return; 3543 or return;
3492 3544
3493 local $/; 3545 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
3495 3547
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3549
3498 $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};
3499 $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};
3500 3552
3501 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
… …
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3557 };
3506 warn $@ if $@; 3558 warn $@ if $@;
3507 } 3559 }
3508 3560
3509 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3510} 3562}
3511 3563
3512sub pidfile() { 3564sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3566 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3579 seek $fh, 0, 0;
3528 print $fh $$; 3580 print $fh $$;
3529} 3581}
3530 3582
3531sub main_loop { 3583sub main_loop {
3532 warn "EV::loop starting\n"; 3584 trace "EV::loop starting\n";
3533 if (1) { 3585 if (1) {
3534 EV::loop; 3586 EV::loop;
3535 } 3587 }
3536 warn "EV::loop returned\n"; 3588 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3589 goto &main_loop unless $REALLY_UNLOOP;
3538} 3590}
3539 3591
3540sub main { 3592sub main {
3541 cf::init_globals; # initialise logging 3593 cf::init_globals; # initialise logging
… …
3589 3641
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3642 (pop @POST_INIT)->(0) while @POST_INIT;
3591 }; 3643 };
3592 3644
3593 cf::object::thawer::errors_are_fatal 0; 3645 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n";
3594 3647
3595 main_loop; 3648 main_loop;
3596} 3649}
3597 3650
3598############################################################################# 3651#############################################################################
… …
3639 or return; 3692 or return;
3640 3693
3641 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3694 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3642 and return; 3695 and return;
3643 3696
3644 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3697 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3645 3698
3646 1 3699 1
3647} 3700}
3648 3701
3649our $uuid_lock; 3702our $uuid_lock;
… …
3661 or return; 3714 or return;
3662 3715
3663 my $value = uuid_seq uuid_cur; 3716 my $value = uuid_seq uuid_cur;
3664 3717
3665 unless ($value) { 3718 unless ($value) {
3666 warn "cowardly refusing to write zero uuid value!\n"; 3719 info "cowardly refusing to write zero uuid value!\n";
3667 return; 3720 return;
3668 } 3721 }
3669 3722
3670 my $value = uuid_str $value + $uuid_skip; 3723 my $value = uuid_str $value + $uuid_skip;
3671 $uuid_skip = 0; 3724 $uuid_skip = 0;
… …
3681 or return; 3734 or return;
3682 3735
3683 aio_rename "$uuid~", $uuid 3736 aio_rename "$uuid~", $uuid
3684 and return; 3737 and return;
3685 3738
3686 warn "uuid file written ($value).\n"; 3739 trace "uuid file written ($value).\n";
3687 3740
3688 1 3741 1
3689 3742
3690} 3743}
3691 3744
… …
3697} 3750}
3698 3751
3699sub emergency_save() { 3752sub emergency_save() {
3700 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
3701 3754
3702 warn "emergency_perl_save: enter\n"; 3755 info "emergency_perl_save: enter\n";
3756
3757 # this is a trade-off: we want to be very quick here, so
3758 # save all maps without fsync, and later call a global sync
3759 # (which in turn might be very very slow)
3760 local $USE_FSYNC = 0;
3703 3761
3704 cf::sync_job { 3762 cf::sync_job {
3705 # this is a trade-off: we want to be very quick here, so 3763 cf::write_runtime_sync; # external watchdog should not bark
3706 # save all maps without fsync, and later call a global sync
3707 # (which in turn might be very very slow)
3708 local $USE_FSYNC = 0;
3709 3764
3710 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
3711 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
3712 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
3713 warn "emergency_perl_save: begin player save\n"; 3768 info "emergency_perl_save: begin player save\n";
3714 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
3715 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
3716 $pl->valid or next; 3771 $pl->valid or next;
3717 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3718 $pl->save; 3773 $pl->save;
3719 } 3774 }
3720 warn "emergency_perl_save: end player save\n"; 3775 info "emergency_perl_save: end player save\n";
3721 3776
3777 cf::write_runtime_sync; # external watchdog should not bark
3778
3722 warn "emergency_perl_save: begin map save\n"; 3779 info "emergency_perl_save: begin map save\n";
3723 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
3724 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
3725 $map->valid or next; 3782 $map->valid or next;
3726 $map->save; 3783 $map->save;
3727 } 3784 }
3728 warn "emergency_perl_save: end map save\n"; 3785 info "emergency_perl_save: end map save\n";
3729 3786
3787 cf::write_runtime_sync; # external watchdog should not bark
3788
3730 warn "emergency_perl_save: begin database checkpoint\n"; 3789 info "emergency_perl_save: begin database checkpoint\n";
3731 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
3732 warn "emergency_perl_save: end database checkpoint\n"; 3791 info "emergency_perl_save: end database checkpoint\n";
3733 3792
3734 warn "emergency_perl_save: begin write uuid\n"; 3793 info "emergency_perl_save: begin write uuid\n";
3735 write_uuid_sync 1; 3794 write_uuid_sync 1;
3736 warn "emergency_perl_save: end write uuid\n"; 3795 info "emergency_perl_save: end write uuid\n";
3796
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3799 trace "emergency_perl_save: syncing database to disk";
3800 BDB::db_env_txn_checkpoint $DB_ENV;
3801
3802 info "emergency_perl_save: starting sync\n";
3803 IO::AIO::aio_sync sub {
3804 info "emergency_perl_save: finished sync\n";
3805 };
3806
3807 cf::write_runtime_sync; # external watchdog should not bark
3808
3809 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3737 }; 3815 };
3738 3816
3739 warn "emergency_perl_save: starting sync()\n";
3740 IO::AIO::aio_sync sub {
3741 warn "emergency_perl_save: finished sync()\n";
3742 };
3743
3744 warn "emergency_perl_save: leave\n"; 3817 info "emergency_perl_save: leave\n";
3745} 3818}
3746 3819
3747sub post_cleanup { 3820sub post_cleanup {
3748 my ($make_core) = @_; 3821 my ($make_core) = @_;
3749 3822
3823 IO::AIO::flush;
3824
3825 IO::AIO::flush;
3826
3750 warn Carp::longmess "post_cleanup backtrace" 3827 error Carp::longmess "post_cleanup backtrace"
3751 if $make_core; 3828 if $make_core;
3752 3829
3753 my $fh = pidfile; 3830 my $fh = pidfile;
3754 unlink $PIDFILE if <$fh> == $$; 3831 unlink $PIDFILE if <$fh> == $$;
3755} 3832}
… …
3775 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3852 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3776 for my $name (keys %$leaf_symtab) { 3853 for my $name (keys %$leaf_symtab) {
3777 _gv_clear *{"$pkg$name"}; 3854 _gv_clear *{"$pkg$name"};
3778# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3855# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3779 } 3856 }
3780 warn "cleared package $pkg\n";#d#
3781} 3857}
3782 3858
3783sub do_reload_perl() { 3859sub do_reload_perl() {
3784 # can/must only be called in main 3860 # can/must only be called in main
3785 if ($Coro::current != $Coro::main) { 3861 if (in_main) {
3786 warn "can only reload from main coroutine"; 3862 error "can only reload from main coroutine";
3787 return; 3863 return;
3788 } 3864 }
3789 3865
3790 return if $RELOAD++; 3866 return if $RELOAD++;
3791 3867
3792 my $t1 = AE::time; 3868 my $t1 = AE::time;
3793 3869
3794 while ($RELOAD) { 3870 while ($RELOAD) {
3795 warn "reloading..."; 3871 info "reloading...";
3796 3872
3797 warn "entering sync_job"; 3873 trace "entering sync_job";
3798 3874
3799 cf::sync_job { 3875 cf::sync_job {
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 cf::emergency_save; 3876 cf::emergency_save;
3802 cf::write_runtime_sync; # external watchdog should not bark
3803 3877
3804 warn "syncing database to disk";
3805 BDB::db_env_txn_checkpoint $DB_ENV;
3806
3807 # if anything goes wrong in here, we should simply crash as we already saved
3808
3809 warn "flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 warn "cancelling all extension coros"; 3878 trace "cancelling all extension coros";
3815 $_->cancel for values %EXT_CORO; 3879 $_->cancel for values %EXT_CORO;
3816 %EXT_CORO = (); 3880 %EXT_CORO = ();
3817 3881
3818 warn "removing commands"; 3882 trace "removing commands";
3819 %COMMAND = (); 3883 %COMMAND = ();
3820 3884
3821 warn "removing ext/exti commands"; 3885 trace "removing ext/exti commands";
3822 %EXTCMD = (); 3886 %EXTCMD = ();
3823 %EXTICMD = (); 3887 %EXTICMD = ();
3824 3888
3825 warn "unloading/nuking all extensions"; 3889 trace "unloading/nuking all extensions";
3826 for my $pkg (@EXTS) { 3890 for my $pkg (@EXTS) {
3827 warn "... unloading $pkg"; 3891 trace "... unloading $pkg";
3828 3892
3829 if (my $cb = $pkg->can ("unload")) { 3893 if (my $cb = $pkg->can ("unload")) {
3830 eval { 3894 eval {
3831 $cb->($pkg); 3895 $cb->($pkg);
3832 1 3896 1
3833 } or warn "$pkg unloaded, but with errors: $@"; 3897 } or error "$pkg unloaded, but with errors: $@";
3834 } 3898 }
3835 3899
3836 warn "... clearing $pkg"; 3900 trace "... clearing $pkg";
3837 clear_package $pkg; 3901 clear_package $pkg;
3838 } 3902 }
3839 3903
3840 warn "unloading all perl modules loaded from $LIBDIR"; 3904 trace "unloading all perl modules loaded from $LIBDIR";
3841 while (my ($k, $v) = each %INC) { 3905 while (my ($k, $v) = each %INC) {
3842 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3843 3907
3844 warn "... unloading $k"; 3908 trace "... unloading $k";
3845 delete $INC{$k}; 3909 delete $INC{$k};
3846 3910
3847 $k =~ s/\.pm$//; 3911 $k =~ s/\.pm$//;
3848 $k =~ s/\//::/g; 3912 $k =~ s/\//::/g;
3849 3913
… …
3852 } 3916 }
3853 3917
3854 clear_package $k; 3918 clear_package $k;
3855 } 3919 }
3856 3920
3857 warn "getting rid of safe::, as good as possible"; 3921 trace "getting rid of safe::, as good as possible";
3858 clear_package "safe::$_" 3922 clear_package "safe::$_"
3859 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3860 3924
3861 warn "unloading cf.pm \"a bit\""; 3925 trace "unloading cf.pm \"a bit\"";
3862 delete $INC{"cf.pm"}; 3926 delete $INC{"cf.pm"};
3863 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3864 3928
3865 # don't, removes xs symbols, too, 3929 # don't, removes xs symbols, too,
3866 # and global variables created in xs 3930 # and global variables created in xs
3867 #clear_package __PACKAGE__; 3931 #clear_package __PACKAGE__;
3868 3932
3869 warn "unload completed, starting to reload now"; 3933 info "unload completed, starting to reload now";
3870 3934
3871 warn "reloading cf.pm"; 3935 trace "reloading cf.pm";
3872 require cf; 3936 require cf;
3873 cf::_connect_to_perl_1; 3937 cf::_connect_to_perl_1;
3874 3938
3875 warn "loading config and database again"; 3939 trace "loading config and database again";
3876 cf::reload_config; 3940 cf::reload_config;
3877 3941
3878 warn "loading extensions"; 3942 trace "loading extensions";
3879 cf::load_extensions; 3943 cf::load_extensions;
3880 3944
3881 if ($REATTACH_ON_RELOAD) { 3945 if ($REATTACH_ON_RELOAD) {
3882 warn "reattaching attachments to objects/players"; 3946 trace "reattaching attachments to objects/players";
3883 _global_reattach; # objects, sockets 3947 _global_reattach; # objects, sockets
3884 warn "reattaching attachments to maps"; 3948 trace "reattaching attachments to maps";
3885 reattach $_ for values %MAP; 3949 reattach $_ for values %MAP;
3886 warn "reattaching attachments to players"; 3950 trace "reattaching attachments to players";
3887 reattach $_ for values %PLAYER; 3951 reattach $_ for values %PLAYER;
3888 } 3952 }
3889 3953
3890 warn "running post_init jobs"; 3954 trace "running post_init jobs";
3891 (pop @POST_INIT)->(1) while @POST_INIT; 3955 (pop @POST_INIT)->(1) while @POST_INIT;
3892 3956
3893 warn "leaving sync_job"; 3957 trace "leaving sync_job";
3894 3958
3895 1 3959 1
3896 } or do { 3960 } or do {
3897 warn $@; 3961 error $@;
3898 cf::cleanup "error while reloading, exiting."; 3962 cf::cleanup "error while reloading, exiting.";
3899 }; 3963 };
3900 3964
3901 warn "reloaded"; 3965 info "reloaded";
3902 --$RELOAD; 3966 --$RELOAD;
3903 } 3967 }
3904 3968
3905 $t1 = AE::time - $t1; 3969 $t1 = AE::time - $t1;
3906 warn "reload completed in ${t1}s\n"; 3970 info "reload completed in ${t1}s\n";
3907}; 3971};
3908 3972
3909our $RELOAD_WATCHER; # used only during reload 3973our $RELOAD_WATCHER; # used only during reload
3910 3974
3911sub reload_perl() { 3975sub reload_perl() {
… …
3971 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4035 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3972 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4036 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3973 Coro::async_pool { 4037 Coro::async_pool {
3974 $Coro::current->{desc} = "runtime saver"; 4038 $Coro::current->{desc} = "runtime saver";
3975 write_runtime_sync 4039 write_runtime_sync
3976 or warn "ERROR: unable to write runtime file: $!"; 4040 or error "ERROR: unable to write runtime file: $!";
3977 }; 4041 };
3978 } 4042 }
3979 4043
3980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4044 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3981 $sig->send; 4045 $sig->send;
… …
3989 4053
3990 if (0) { 4054 if (0) {
3991 if ($NEXT_TICK) { 4055 if ($NEXT_TICK) {
3992 my $jitter = $TICK_START - $NEXT_TICK; 4056 my $jitter = $TICK_START - $NEXT_TICK;
3993 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4057 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3994 warn "jitter $JITTER\n";#d# 4058 debug "jitter $JITTER\n";#d#
3995 } 4059 }
3996 } 4060 }
3997} 4061}
3998 4062
3999{ 4063{

Diff Legend

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