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.514 by root, Mon Apr 12 17:13:36 2010 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 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;
… …
1405 1423
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1426
1409 $ext{source} = 1427 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1412 . $source 1430 . $source
1413 . "\n};\n1"; 1431 . "\n};\n1";
1414 1432
1415 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1446 next ext
1429 unless exists $done{$_}; 1447 unless exists $done{$_};
1430 } 1448 }
1431 1449
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1451
1434 my $active = eval $v->{source}; 1452 my $active = eval $v->{source};
1435 1453
1436 if (length $@) { 1454 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1455 error "$v->{path}: $@\n";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1438 1457
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1460
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1441 } else { 1463 } else {
1442 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1444 $progress = 1; 1466 $progress = 1;
1445 1467
1446 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1469 unless $active;
1448 } 1470 }
1449 } 1471 }
1450 1472
1451 unless ($progress) { 1473 unless ($progress) {
… …
1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1624 1646
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1626 $pl->deactivate; 1648 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1630 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1631 1652
1632 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1688 \@logins 1709 \@logins
1689} 1710}
1690 1711
1691=item $player->maps 1712=item $player->maps
1692 1713
1714=item cf::player::maps $login
1715
1693Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1694player. May block. 1717player. May block.
1695 1718
1696=cut 1719=cut
1697 1720
… …
1758 1781
1759=cut 1782=cut
1760 1783
1761sub find_by_path($) { 1784sub find_by_path($) {
1762 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1763 1788
1764 my ($match, $specificity); 1789 my ($match, $specificity);
1765 1790
1766 for my $region (list) { 1791 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
… …
1831 1856
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1857 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1858}
1834 1859
1835# also paths starting with '/' 1860# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1861$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1862
1838sub thawer_merge { 1863sub thawer_merge {
1839 my ($self, $merge) = @_; 1864 my ($self, $merge) = @_;
1840 1865
1841 # we have to keep some variables in memory intact 1866 # we have to keep some variables in memory intact
… …
2151 or next; 2176 or next;
2152 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2153 or next; 2178 or next;
2154 $neigh->load; 2179 $neigh->load;
2155 2180
2181 # now find the diagonal neighbours
2156 push @neigh, 2182 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2185 }
2160 2186
… …
2167} 2193}
2168 2194
2169sub find_sync { 2195sub find_sync {
2170 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2171 2197
2172 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
2173} 2202}
2174 2203
2175sub do_load_sync { 2204sub do_load_sync {
2176 my ($map) = @_; 2205 my ($map) = @_;
2177 2206
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2180 2209
2181 cf::sync_job { $map->load }; 2210 $map->load;
2182} 2211}
2183 2212
2184our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2186 2215
… …
2212 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2213 2242
2214 () 2243 ()
2215} 2244}
2216 2245
2246# common code, used by both ->save and ->swapout
2217sub save { 2247sub _save {
2218 my ($self) = @_; 2248 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2249
2222 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2223 2251
2224 return unless $self->dirty; 2252 return unless $self->dirty;
2225 2253
… …
2245 } else { 2273 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2275 }
2248} 2276}
2249 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2250sub swap_out { 2286sub swap_out {
2251 my ($self) = @_; 2287 my ($self) = @_;
2252 2288
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2290
2258 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2291 return if $self->in_memory != cf::MAP_ACTIVE;
2260 return if $self->{deny_save}; 2292 return if $self->{deny_save};
2293 return if $self->players;
2261 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->in_memory (cf::MAP_SWAPPED); 2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
2304 $self->clear;
2305}
2306
2307sub reset_at {
2308 my ($self) = @_;
2309
2310 # TODO: safety, remove and allow resettable per-player maps
2311 return 1e99 if $self->{deny_reset};
2312
2313 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2314 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2315
2316 $time + $to
2317}
2318
2319sub should_reset {
2320 my ($self) = @_;
2321
2322 $self->reset_at <= $cf::RUNTIME
2323}
2324
2325sub reset {
2326 my ($self) = @_;
2327
2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2329
2330 return if $self->players;
2331
2332 cf::trace "resetting map ", $self->path, "\n";
2333
2334 $self->in_memory (cf::MAP_SWAPPED);
2335
2336 # need to save uniques path
2337 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339
2340 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2341 if $uniq;
2342 }
2343
2344 delete $cf::MAP{$self->path};
2263 2345
2264 $self->deactivate; 2346 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2348 $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 2349
2312 $self->unlink_save; 2350 $self->unlink_save;
2313 $self->destroy; 2351 $self->destroy;
2314} 2352}
2315 2353
… …
2323 2361
2324 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2325 2363
2326 $self->unlink_save; 2364 $self->unlink_save;
2327 2365
2328 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2371
… …
2563 2601
2564Freezes 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}>).
2565 2603
2566The 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.
2567for 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,
2568though, 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
2569map. 2607map.
2570 2608
2571Will never block. 2609Will never block.
2572 2610
2573=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2595 my ($self) = @_; 2633 my ($self) = @_;
2596 2634
2597 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2598 2636
2637 ++$self->{_link_recursion};
2638
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2640
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2603 2643
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2645}
2606 2646
2607sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2609 2649
… …
2634 $map->load_neighbours; 2674 $map->load_neighbours;
2635 2675
2636 return unless $self->contr->active; 2676 return unless $self->contr->active;
2637 2677
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2640 2680 # entering was successful
2681 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2682 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2683 $self->activate_recursive;
2643} 2684 }
2644 2685
2686}
2687
2645=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)]])
2646 2689
2647Moves 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
2648her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2649that 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
2650the 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
… …
2657 2700
2658our $GOTOGEN; 2701our $GOTOGEN;
2659 2702
2660sub cf::object::player::goto { 2703sub cf::object::player::goto {
2661 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 }
2662 2711
2663 # 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
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2714
2666 $self->enter_link; 2715 $self->enter_link;
… …
2690 my $map = eval { 2739 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2692 2741
2693 if ($map) { 2742 if ($map) {
2694 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2745 } else {
2697 $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);
2698 } 2747 }
2699 2748
2700 $map 2749 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2711 } 2760 }
2712 2761
2713 $done->() if $done; 2762 $done->($self) if $done;
2714 })->prio (1); 2763 })->prio (1);
2715} 2764}
2716 2765
2717=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2718 2767
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "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. "
2813 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2864
2816 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2866 $self->leave_link;
2818 } 2867 }
2819 })->prio (1); 2868 })->prio (1);
2820} 2869}
2821 2870
… …
3134 3183
3135 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3185 if $reply;
3137 3186
3138 } else { 3187 } else {
3139 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";
3140 } 3189 }
3141 3190
3142 cf::override; 3191 cf::override;
3143 }, 3192 },
3144); 3193);
… …
3274 local @cf::_safe_eval_args = values %vars; 3323 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3324 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3325 }
3277 3326
3278 if ($@) { 3327 if ($@) {
3279 warn "$@"; 3328 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3329 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3330 "with arguments " . (join " ", %vars) . "\n";
3282 } 3331 }
3283 3332
3284 wantarray ? @res : $res[0] 3333 wantarray ? @res : $res[0]
3285} 3334}
3286 3335
… …
3320 # for this (global event?) 3369 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3370 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3371
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3372 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3373
3325 warn "loading facedata from $path\n"; 3374 trace "loading facedata from $path\n";
3326 3375
3327 my $facedata; 3376 my $facedata;
3328 0 < aio_load $path, $facedata 3377 0 < aio_load $path, $facedata
3329 or die "$path: $!"; 3378 or die "$path: $!";
3330 3379
… …
3364 3413
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3414 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3415 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3416 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3417 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3418 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3419 }
3371 3420
3372 cf::cede_to_tick; 3421 cf::cede_to_tick;
3373 } 3422 }
3374 } 3423 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3441 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3442
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3443 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3444 cf::face::set_type $idx, $info->{type};
3396 } else { 3445 } else {
3397 $RESOURCE{$name} = $info; 3446 $RESOURCE{$name} = $info; # unused
3398 } 3447 }
3399 3448
3400 cf::cede_to_tick; 3449 cf::cede_to_tick;
3401 } 3450 }
3402 } 3451 }
3403 3452
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3453 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3454
3406 1 3455 1
3407} 3456}
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 3457
3429register_exticmd fx_want => sub { 3458register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3459 my ($ns, $want) = @_;
3431 3460
3432 while (my ($k, $v) = each %$want) { 3461 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3500sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3501 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3502 or die "unable to load treasurelists\n";
3474} 3503}
3475 3504
3505sub reload_sound {
3506 trace "loading sound config from $DATADIR/sound\n";
3507
3508 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3509 or die "$DATADIR/sound $!";
3510
3511 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3512
3513 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3514 my $sound = $soundconf->{compat}[$_]
3515 or next;
3516
3517 my $face = cf::face::find "sound/$sound->[1]";
3518 cf::sound::set $sound->[0] => $face;
3519 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3520 }
3521
3522 while (my ($k, $v) = each %{$soundconf->{event}}) {
3523 my $face = cf::face::find "sound/$v";
3524 cf::sound::set $k => $face;
3525 }
3526}
3527
3476sub reload_resources { 3528sub reload_resources {
3477 warn "reloading resource files...\n"; 3529 trace "reloading resource files...\n";
3478 3530
3479 reload_facedata; 3531 reload_facedata;
3532 reload_sound;
3480 reload_archetypes; 3533 reload_archetypes;
3481 reload_regions; 3534 reload_regions;
3482 reload_treasures; 3535 reload_treasures;
3483 3536
3484 warn "finished reloading resource files\n"; 3537 trace "finished reloading resource files\n";
3485} 3538}
3486 3539
3487sub reload_config { 3540sub reload_config {
3488 warn "reloading config file...\n"; 3541 trace "reloading config file...\n";
3489 3542
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3543 open my $fh, "<:utf8", "$CONFDIR/config"
3491 or return; 3544 or return;
3492 3545
3493 local $/; 3546 local $/;
3494 *CFG = YAML::XS::Load scalar <$fh>; 3547 *CFG = YAML::XS::Load scalar <$fh>;
3495 3548
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3549 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3550
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3551 $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}; 3552 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3553
3501 if (exists $CFG{mlockall}) { 3554 if (exists $CFG{mlockall}) {
… …
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3557 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3558 };
3506 warn $@ if $@; 3559 warn $@ if $@;
3507 } 3560 }
3508 3561
3509 warn "finished reloading resource files\n"; 3562 trace "finished reloading resource files\n";
3510} 3563}
3511 3564
3512sub pidfile() { 3565sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3566 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3567 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3580 seek $fh, 0, 0;
3528 print $fh $$; 3581 print $fh $$;
3529} 3582}
3530 3583
3531sub main_loop { 3584sub main_loop {
3532 warn "EV::loop starting\n"; 3585 trace "EV::loop starting\n";
3533 if (1) { 3586 if (1) {
3534 EV::loop; 3587 EV::loop;
3535 } 3588 }
3536 warn "EV::loop returned\n"; 3589 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3590 goto &main_loop unless $REALLY_UNLOOP;
3538} 3591}
3539 3592
3540sub main { 3593sub main {
3541 cf::init_globals; # initialise logging 3594 cf::init_globals; # initialise logging
3542 3595
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3596 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3597 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3598 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3599 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552 3600
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3601 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3554 3602
3555 # we must not ever block the main coroutine 3603 # we must not ever block the main coroutine
3556 local $Coro::idle = sub { 3604 local $Coro::idle = sub {
… …
3562 }; 3610 };
3563 3611
3564 evthread_start IO::AIO::poll_fileno; 3612 evthread_start IO::AIO::poll_fileno;
3565 3613
3566 cf::sync_job { 3614 cf::sync_job {
3615 cf::init_experience;
3616 cf::init_anim;
3617 cf::init_attackmess;
3618 cf::init_dynamic;
3619
3567 cf::load_settings; 3620 cf::load_settings;
3568 cf::load_materials; 3621 cf::load_materials;
3569 3622
3570 reload_resources; 3623 reload_resources;
3571 reload_config; 3624 reload_config;
… …
3587 use POSIX (); 3640 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3641 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3642
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3643 (pop @POST_INIT)->(0) while @POST_INIT;
3591 }; 3644 };
3645
3646 cf::object::thawer::errors_are_fatal 0;
3647 info "parse errors in files are no longer fatal from this point on.\n";
3592 3648
3593 main_loop; 3649 main_loop;
3594} 3650}
3595 3651
3596############################################################################# 3652#############################################################################
… …
3637 or return; 3693 or return;
3638 3694
3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3695 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3640 and return; 3696 and return;
3641 3697
3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3698 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3643 3699
3644 1 3700 1
3645} 3701}
3646 3702
3647our $uuid_lock; 3703our $uuid_lock;
… …
3659 or return; 3715 or return;
3660 3716
3661 my $value = uuid_seq uuid_cur; 3717 my $value = uuid_seq uuid_cur;
3662 3718
3663 unless ($value) { 3719 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n"; 3720 info "cowardly refusing to write zero uuid value!\n";
3665 return; 3721 return;
3666 } 3722 }
3667 3723
3668 my $value = uuid_str $value + $uuid_skip; 3724 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0; 3725 $uuid_skip = 0;
… …
3679 or return; 3735 or return;
3680 3736
3681 aio_rename "$uuid~", $uuid 3737 aio_rename "$uuid~", $uuid
3682 and return; 3738 and return;
3683 3739
3684 warn "uuid file written ($value).\n"; 3740 trace "uuid file written ($value).\n";
3685 3741
3686 1 3742 1
3687 3743
3688} 3744}
3689 3745
… …
3695} 3751}
3696 3752
3697sub emergency_save() { 3753sub emergency_save() {
3698 my $freeze_guard = cf::freeze_mainloop; 3754 my $freeze_guard = cf::freeze_mainloop;
3699 3755
3700 warn "emergency_perl_save: enter\n"; 3756 info "emergency_perl_save: enter\n";
3757
3758 # this is a trade-off: we want to be very quick here, so
3759 # save all maps without fsync, and later call a global sync
3760 # (which in turn might be very very slow)
3761 local $USE_FSYNC = 0;
3701 3762
3702 cf::sync_job { 3763 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so 3764 cf::write_runtime_sync; # external watchdog should not bark
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707 3765
3708 # use a peculiar iteration method to avoid tripping on perl 3766 # use a peculiar iteration method to avoid tripping on perl
3709 # refcount bugs in for. also avoids problems with players 3767 # refcount bugs in for. also avoids problems with players
3710 # and maps saved/destroyed asynchronously. 3768 # and maps saved/destroyed asynchronously.
3711 warn "emergency_perl_save: begin player save\n"; 3769 info "emergency_perl_save: begin player save\n";
3712 for my $login (keys %cf::PLAYER) { 3770 for my $login (keys %cf::PLAYER) {
3713 my $pl = $cf::PLAYER{$login} or next; 3771 my $pl = $cf::PLAYER{$login} or next;
3714 $pl->valid or next; 3772 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3773 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3716 $pl->save; 3774 $pl->save;
3717 } 3775 }
3718 warn "emergency_perl_save: end player save\n"; 3776 info "emergency_perl_save: end player save\n";
3719 3777
3778 cf::write_runtime_sync; # external watchdog should not bark
3779
3720 warn "emergency_perl_save: begin map save\n"; 3780 info "emergency_perl_save: begin map save\n";
3721 for my $path (keys %cf::MAP) { 3781 for my $path (keys %cf::MAP) {
3722 my $map = $cf::MAP{$path} or next; 3782 my $map = $cf::MAP{$path} or next;
3723 $map->valid or next; 3783 $map->valid or next;
3724 $map->save; 3784 $map->save;
3725 } 3785 }
3726 warn "emergency_perl_save: end map save\n"; 3786 info "emergency_perl_save: end map save\n";
3727 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3728 warn "emergency_perl_save: begin database checkpoint\n"; 3790 info "emergency_perl_save: begin database checkpoint\n";
3729 BDB::db_env_txn_checkpoint $DB_ENV; 3791 BDB::db_env_txn_checkpoint $DB_ENV;
3730 warn "emergency_perl_save: end database checkpoint\n"; 3792 info "emergency_perl_save: end database checkpoint\n";
3731 3793
3732 warn "emergency_perl_save: begin write uuid\n"; 3794 info "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1; 3795 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n"; 3796 info "emergency_perl_save: end write uuid\n";
3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 trace "emergency_perl_save: syncing database to disk";
3801 BDB::db_env_txn_checkpoint $DB_ENV;
3802
3803 info "emergency_perl_save: starting sync\n";
3804 IO::AIO::aio_sync sub {
3805 info "emergency_perl_save: finished sync\n";
3806 };
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3735 }; 3816 };
3736 3817
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3742 warn "emergency_perl_save: leave\n"; 3818 info "emergency_perl_save: leave\n";
3743} 3819}
3744 3820
3745sub post_cleanup { 3821sub post_cleanup {
3746 my ($make_core) = @_; 3822 my ($make_core) = @_;
3747 3823
3824 IO::AIO::flush;
3825
3748 warn Carp::longmess "post_cleanup backtrace" 3826 error Carp::longmess "post_cleanup backtrace"
3749 if $make_core; 3827 if $make_core;
3750 3828
3751 my $fh = pidfile; 3829 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$; 3830 unlink $PIDFILE if <$fh> == $$;
3753} 3831}
… …
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3851 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) { 3852 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"}; 3853 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3854# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 } 3855 }
3778 warn "cleared package $pkg\n";#d#
3779} 3856}
3780 3857
3781sub do_reload_perl() { 3858sub do_reload_perl() {
3782 # can/must only be called in main 3859 # can/must only be called in main
3783 if ($Coro::current != $Coro::main) { 3860 if (in_main) {
3784 warn "can only reload from main coroutine"; 3861 error "can only reload from main coroutine";
3785 return; 3862 return;
3786 } 3863 }
3787 3864
3788 return if $RELOAD++; 3865 return if $RELOAD++;
3789 3866
3790 my $t1 = AE::time; 3867 my $t1 = AE::time;
3791 3868
3792 while ($RELOAD) { 3869 while ($RELOAD) {
3793 warn "reloading..."; 3870 info "reloading...";
3794 3871
3795 warn "entering sync_job"; 3872 trace "entering sync_job";
3796 3873
3797 cf::sync_job { 3874 cf::sync_job {
3798 cf::write_runtime_sync; # external watchdog should not bark
3799 cf::emergency_save; 3875 cf::emergency_save;
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 3876
3802 warn "syncing database to disk";
3803 BDB::db_env_txn_checkpoint $DB_ENV;
3804
3805 # if anything goes wrong in here, we should simply crash as we already saved
3806
3807 warn "flushing outstanding aio requests";
3808 while (IO::AIO::nreqs || BDB::nreqs) {
3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3810 }
3811
3812 warn "cancelling all extension coros"; 3877 trace "cancelling all extension coros";
3813 $_->cancel for values %EXT_CORO; 3878 $_->cancel for values %EXT_CORO;
3814 %EXT_CORO = (); 3879 %EXT_CORO = ();
3815 3880
3816 warn "removing commands"; 3881 trace "removing commands";
3817 %COMMAND = (); 3882 %COMMAND = ();
3818 3883
3819 warn "removing ext/exti commands"; 3884 trace "removing ext/exti commands";
3820 %EXTCMD = (); 3885 %EXTCMD = ();
3821 %EXTICMD = (); 3886 %EXTICMD = ();
3822 3887
3823 warn "unloading/nuking all extensions"; 3888 trace "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) { 3889 for my $pkg (@EXTS) {
3825 warn "... unloading $pkg"; 3890 trace "... unloading $pkg";
3826 3891
3827 if (my $cb = $pkg->can ("unload")) { 3892 if (my $cb = $pkg->can ("unload")) {
3828 eval { 3893 eval {
3829 $cb->($pkg); 3894 $cb->($pkg);
3830 1 3895 1
3831 } or warn "$pkg unloaded, but with errors: $@"; 3896 } or error "$pkg unloaded, but with errors: $@";
3832 } 3897 }
3833 3898
3834 warn "... clearing $pkg"; 3899 trace "... clearing $pkg";
3835 clear_package $pkg; 3900 clear_package $pkg;
3836 } 3901 }
3837 3902
3838 warn "unloading all perl modules loaded from $LIBDIR"; 3903 trace "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) { 3904 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3905 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841 3906
3842 warn "... unloading $k"; 3907 trace "... unloading $k";
3843 delete $INC{$k}; 3908 delete $INC{$k};
3844 3909
3845 $k =~ s/\.pm$//; 3910 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g; 3911 $k =~ s/\//::/g;
3847 3912
… …
3850 } 3915 }
3851 3916
3852 clear_package $k; 3917 clear_package $k;
3853 } 3918 }
3854 3919
3855 warn "getting rid of safe::, as good as possible"; 3920 trace "getting rid of safe::, as good as possible";
3856 clear_package "safe::$_" 3921 clear_package "safe::$_"
3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3922 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3858 3923
3859 warn "unloading cf.pm \"a bit\""; 3924 trace "unloading cf.pm \"a bit\"";
3860 delete $INC{"cf.pm"}; 3925 delete $INC{"cf.pm"};
3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3926 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3862 3927
3863 # don't, removes xs symbols, too, 3928 # don't, removes xs symbols, too,
3864 # and global variables created in xs 3929 # and global variables created in xs
3865 #clear_package __PACKAGE__; 3930 #clear_package __PACKAGE__;
3866 3931
3867 warn "unload completed, starting to reload now"; 3932 info "unload completed, starting to reload now";
3868 3933
3869 warn "reloading cf.pm"; 3934 trace "reloading cf.pm";
3870 require cf; 3935 require cf;
3871 cf::_connect_to_perl_1; 3936 cf::_connect_to_perl_1;
3872 3937
3873 warn "loading config and database again"; 3938 trace "loading config and database again";
3874 cf::reload_config; 3939 cf::reload_config;
3875 3940
3876 warn "loading extensions"; 3941 trace "loading extensions";
3877 cf::load_extensions; 3942 cf::load_extensions;
3878 3943
3879 if ($REATTACH_ON_RELOAD) { 3944 if ($REATTACH_ON_RELOAD) {
3880 warn "reattaching attachments to objects/players"; 3945 trace "reattaching attachments to objects/players";
3881 _global_reattach; # objects, sockets 3946 _global_reattach; # objects, sockets
3882 warn "reattaching attachments to maps"; 3947 trace "reattaching attachments to maps";
3883 reattach $_ for values %MAP; 3948 reattach $_ for values %MAP;
3884 warn "reattaching attachments to players"; 3949 trace "reattaching attachments to players";
3885 reattach $_ for values %PLAYER; 3950 reattach $_ for values %PLAYER;
3886 } 3951 }
3887 3952
3888 warn "running post_init jobs"; 3953 trace "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT; 3954 (pop @POST_INIT)->(1) while @POST_INIT;
3890 3955
3891 warn "leaving sync_job"; 3956 trace "leaving sync_job";
3892 3957
3893 1 3958 1
3894 } or do { 3959 } or do {
3895 warn $@; 3960 error $@;
3896 cf::cleanup "error while reloading, exiting."; 3961 cf::cleanup "error while reloading, exiting.";
3897 }; 3962 };
3898 3963
3899 warn "reloaded"; 3964 info "reloaded";
3900 --$RELOAD; 3965 --$RELOAD;
3901 } 3966 }
3902 3967
3903 $t1 = AE::time - $t1; 3968 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n"; 3969 info "reload completed in ${t1}s\n";
3905}; 3970};
3906 3971
3907our $RELOAD_WATCHER; # used only during reload 3972our $RELOAD_WATCHER; # used only during reload
3908 3973
3909sub reload_perl() { 3974sub reload_perl() {
… …
3969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4034 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4035 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3971 Coro::async_pool { 4036 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver"; 4037 $Coro::current->{desc} = "runtime saver";
3973 write_runtime_sync 4038 write_runtime_sync
3974 or warn "ERROR: unable to write runtime file: $!"; 4039 or error "ERROR: unable to write runtime file: $!";
3975 }; 4040 };
3976 } 4041 }
3977 4042
3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4043 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3979 $sig->send; 4044 $sig->send;
… …
3987 4052
3988 if (0) { 4053 if (0) {
3989 if ($NEXT_TICK) { 4054 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK; 4055 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4056 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d# 4057 debug "jitter $JITTER\n";#d#
3993 } 4058 }
3994 } 4059 }
3995} 4060}
3996 4061
3997{ 4062{

Diff Legend

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