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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 104our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 105our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 106our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 107our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 108
111our %RESOURCE; 109our %RESOURCE; # unused
110
111our $OUTPUT_RATE_MIN = 3000;
112our $OUTPUT_RATE_MAX = 1000000;
113
114our $MAX_LINKS = 32; # how many chained exits to follow
115our $VERBOSE_IO = 1;
112 116
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 117our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 118our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 119our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 120our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
162 166
163our $EMERGENCY_POSITION; 167our $EMERGENCY_POSITION;
164 168
165sub cf::map::normalise; 169sub cf::map::normalise;
166 170
171sub in_main() {
172 $Coro::current == $Coro::main
173}
174
167############################################################################# 175#############################################################################
168 176
169%REFLECT = (); 177%REFLECT = ();
170for (@REFLECT) { 178for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 179 my $reflect = JSON::XS::decode_json $_;
… …
242 250
243=back 251=back
244 252
245=cut 253=cut
246 254
255sub error(@) { LOG llevError, join "", @_ }
256sub warn (@) { LOG llevWarn , join "", @_ }
257sub info (@) { LOG llevInfo , join "", @_ }
258sub debug(@) { LOG llevDebug, join "", @_ }
259sub trace(@) { LOG llevTrace, join "", @_ }
260
247$Coro::State::WARNHOOK = sub { 261$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 262 my $msg = join "", @_;
249 263
250 $msg .= "\n" 264 $msg .= "\n"
251 unless $msg =~ /\n$/; 265 unless $msg =~ /\n$/;
252 266
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 267 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 268
255 LOG llevError, $msg; 269 LOG llevWarn, $msg;
256}; 270};
257 271
258$Coro::State::DIEHOOK = sub { 272$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 273 return unless $^S eq 0; # "eq", not "=="
260 274
261 warn Carp::longmess $_[0]; 275 error Carp::longmess $_[0];
262 276
263 if ($Coro::current == $Coro::main) {#d# 277 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 278 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 279 return;#d#
266 }#d# 280 }#d#
267 281
268 # kill coroutine otherwise 282 # kill coroutine otherwise
269 Coro::terminate 283 Coro::terminate
… …
396} 410}
397 411
398=item cf::periodic $interval, $cb 412=item cf::periodic $interval, $cb
399 413
400Like EV::periodic, but randomly selects a starting point so that the actions 414Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 415get spread over time.
402 416
403=cut 417=cut
404 418
405sub periodic($$) { 419sub periodic($$) {
406 my ($interval, $cb) = @_; 420 my ($interval, $cb) = @_;
… …
502=cut 516=cut
503 517
504sub sync_job(&) { 518sub sync_job(&) {
505 my ($job) = @_; 519 my ($job) = @_;
506 520
507 if ($Coro::current == $Coro::main) { 521 if (in_main) {
508 my $time = AE::time; 522 my $time = AE::time;
509 523
510 # this is the main coro, too bad, we have to block 524 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 525 # till the operation succeeds, freezing the server :/
512 526
513 LOG llevError, Carp::longmess "sync job";#d# 527 #LOG llevError, Carp::longmess "sync job";#d#
514 528
515 my $freeze_guard = freeze_mainloop; 529 my $freeze_guard = freeze_mainloop;
516 530
517 my $busy = 1; 531 my $busy = 1;
518 my @res; 532 my @res;
519 533
520 (async { 534 (async {
521 $Coro::current->desc ("sync job coro"); 535 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 536 @res = eval { $job->() };
523 warn $@ if $@; 537 error $@ if $@;
524 undef $busy; 538 undef $busy;
525 })->prio (Coro::PRIO_MAX); 539 })->prio (Coro::PRIO_MAX);
526 540
527 while ($busy) { 541 while ($busy) {
528 if (Coro::nready) { 542 if (Coro::nready) {
… …
584 reset_signals; 598 reset_signals;
585 &$cb 599 &$cb
586 }, @args; 600 }, @args;
587 601
588 wantarray ? @res : $res[-1] 602 wantarray ? @res : $res[-1]
603}
604
605sub objinfo {
606 (
607 "counter value" => cf::object::object_count,
608 "objects created" => cf::object::create_count,
609 "objects destroyed" => cf::object::destroy_count,
610 "freelist size" => cf::object::free_count,
611 "allocated objects" => cf::object::objects_size,
612 "active objects" => cf::object::actives_size,
613 )
589} 614}
590 615
591=item $coin = coin_from_name $name 616=item $coin = coin_from_name $name
592 617
593=cut 618=cut
… …
630within each server. 655within each server.
631 656
632=cut 657=cut
633 658
634sub db_table($) { 659sub db_table($) {
660 cf::error "db_get called from main context"
661 if $Coro::current == $Coro::main;
662
635 my ($name) = @_; 663 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 664 my $db = BDB::db_create $DB_ENV;
637 665
638 eval { 666 eval {
639 $db->set_flags (BDB::CHKSUM); 667 $db->set_flags (BDB::CHKSUM);
… …
649} 677}
650 678
651our $DB; 679our $DB;
652 680
653sub db_init { 681sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 682 $DB ||= db_table "db";
656 };
657} 683}
658 684
659sub db_get($$) { 685sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 686 my $key = "$_[0]/$_[1]";
661 687
662 cf::sync_job { 688 cf::error "db_get called from main context"
689 if $Coro::current == $Coro::main;
690
663 BDB::db_get $DB, undef, $key, my $data; 691 BDB::db_get $DB, undef, $key, my $data;
664 692
665 $! ? () 693 $! ? ()
666 : $data 694 : $data
667 }
668} 695}
669 696
670sub db_put($$$) { 697sub db_put($$$) {
671 BDB::dbreq_pri 4; 698 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 755
729 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 757 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
732 759
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 761
735 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
738 765
… …
748 775
749=cut 776=cut
750 777
751sub datalog($@) { 778sub datalog($@) {
752 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 781}
755 782
756=back 783=back
757 784
758=cut 785=cut
… …
953 980
954 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 983
957 } elsif (ref $type) { 984 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
959 986
960 } else { 987 } else {
961 shift @arg; 988 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
963 } 990 }
964 } 991 }
965} 992}
966 993
967sub _object_attach { 994sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
978 } 1005 }
979 1006
980 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
981 } else { 1008 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1010 }
984 1011
985 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
986} 1013}
987 1014
… …
1046 1073
1047 for (@$callbacks) { 1074 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1049 1076
1050 if ($@) { 1077 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1079 override;
1054 } 1080 }
1055 1081
1056 return 1 if $override; 1082 return 1 if $override;
1057 } 1083 }
… …
1136 for (@$attach) { 1162 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1139 } 1165 }
1140 } else { 1166 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1168 }
1143 } 1169 }
1144} 1170}
1145 1171
1146cf::attachable->attach ( 1172cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1174 1200
1175 sync_job { 1201 sync_job {
1176 if (length $$rdata) { 1202 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1180 1207
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1211 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1207 1234
1208 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1237 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1212 } 1239 }
1213 } else { 1240 } else {
1214 aio_unlink $filename; 1241 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1216 } 1243 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1268 $av = $st->{objs};
1242 } 1269 }
1243 1270
1244 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1247 1275
1248 ($data, $av) 1276 ($data, $av)
1249} 1277}
1250 1278
1251=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1343 1371
1344 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1373 if $reply;
1346 1374
1347 } else { 1375 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1377 }
1350 1378
1351 cf::override; 1379 cf::override;
1352 }, 1380 },
1353); 1381);
… …
1364 1392
1365 $grp 1393 $grp
1366} 1394}
1367 1395
1368sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1369 cf::sync_job { 1399 cf::sync_job {
1370 my %todo; 1400 my %todo;
1371 1401
1372 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1403 next unless -r $path;
… …
1391 1421
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1424
1395 $ext{source} = 1425 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1426 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1427 . "#line 1 \"$path\"\n{\n"
1398 . $source 1428 . $source
1399 . "\n};\n1"; 1429 . "\n};\n1";
1400 1430
1401 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1444 next ext
1415 unless exists $done{$_}; 1445 unless exists $done{$_};
1416 } 1446 }
1417 1447
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1449
1420 my $active = eval $v->{source}; 1450 my $active = eval $v->{source};
1421 1451
1422 if (length $@) { 1452 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1453 error "$v->{path}: $@\n";
1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1424 1455
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1456 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1457 if exists $v->{meta}{mandatory};
1458
1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1460 delete $todo{$k};
1427 } else { 1461 } else {
1428 $done{$k} = delete $todo{$k}; 1462 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1463 push @EXTS, $v->{pkg};
1430 $progress = 1; 1464 $progress = 1;
1431 1465
1432 warn "$v->{base}: extension inactive.\n" 1466 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1467 unless $active;
1434 } 1468 }
1435 } 1469 }
1436 1470
1437 unless ($progress) { 1471 unless ($progress) {
… …
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1644
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1646 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1648 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1649 $pl->ns->destroy if $pl->ns;
1617 1650
1618 my $path = playerdir $pl; 1651 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1652 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1707 \@logins
1675} 1708}
1676 1709
1677=item $player->maps 1710=item $player->maps
1678 1711
1712=item cf::player::maps $login
1713
1679Returns an arrayref of map paths that are private for this 1714Returns an arrayref of map paths that are private for this
1680player. May block. 1715player. May block.
1681 1716
1682=cut 1717=cut
1683 1718
… …
1744 1779
1745=cut 1780=cut
1746 1781
1747sub find_by_path($) { 1782sub find_by_path($) {
1748 my ($path) = @_; 1783 my ($path) = @_;
1784
1785 $path =~ s/^~[^\/]*//; # skip ~login
1749 1786
1750 my ($match, $specificity); 1787 my ($match, $specificity);
1751 1788
1752 for my $region (list) { 1789 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1790 if ($region->{match} && $path =~ $region->{match}) {
… …
1810 1847
1811sub register { 1848sub register {
1812 my (undef, $regex, $prio) = @_; 1849 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1850 my $pkg = caller;
1814 1851
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1852 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1853
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1855}
1820 1856
1821# also paths starting with '/' 1857# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1859
1824sub thawer_merge { 1860sub thawer_merge {
1825 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1826 1862
1827 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
2137 or next; 2173 or next;
2138 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2139 or next; 2175 or next;
2140 $neigh->load; 2176 $neigh->load;
2141 2177
2178 # now find the diagonal neighbours
2142 push @neigh, 2179 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2182 }
2146 2183
… …
2153} 2190}
2154 2191
2155sub find_sync { 2192sub find_sync {
2156 my ($path, $origin) = @_; 2193 my ($path, $origin) = @_;
2157 2194
2158 cf::sync_job { find $path, $origin } 2195 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2196 if $Coro::current == $Coro::main;
2197
2198 find $path, $origin
2159} 2199}
2160 2200
2161sub do_load_sync { 2201sub do_load_sync {
2162 my ($map) = @_; 2202 my ($map) = @_;
2163 2203
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2204 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2205 if $Coro::current == $Coro::main;
2166 2206
2167 cf::sync_job { $map->load }; 2207 $map->load;
2168} 2208}
2169 2209
2170our %MAP_PREFETCH; 2210our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2211our $MAP_PREFETCHER = undef;
2172 2212
… …
2198 $MAP_PREFETCHER->prio (6); 2238 $MAP_PREFETCHER->prio (6);
2199 2239
2200 () 2240 ()
2201} 2241}
2202 2242
2243# common code, used by both ->save and ->swapout
2203sub save { 2244sub _save {
2204 my ($self) = @_; 2245 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2246
2208 $self->{last_save} = $cf::RUNTIME; 2247 $self->{last_save} = $cf::RUNTIME;
2209 2248
2210 return unless $self->dirty; 2249 return unless $self->dirty;
2211 2250
… …
2231 } else { 2270 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2272 }
2234} 2273}
2235 2274
2275sub save {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 $self->_save;
2281}
2282
2236sub swap_out { 2283sub swap_out {
2237 my ($self) = @_; 2284 my ($self) = @_;
2238 2285
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2287
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2288 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2289 return if $self->{deny_save};
2290 return if $self->players;
2247 2291
2292 # first deactivate the map and "unlink" it from the core
2293 $self->deactivate;
2294 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # then atomically save
2298 $self->_save;
2299
2300 # then free the map
2301 $self->clear;
2302}
2303
2304sub reset_at {
2305 my ($self) = @_;
2306
2307 # TODO: safety, remove and allow resettable per-player maps
2308 return 1e99 if $self->{deny_reset};
2309
2310 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2311 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2312
2313 $time + $to
2314}
2315
2316sub should_reset {
2317 my ($self) = @_;
2318
2319 $self->reset_at <= $cf::RUNTIME
2320}
2321
2322sub reset {
2323 my ($self) = @_;
2324
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2327 return if $self->players;
2328
2329 cf::trace "resetting map ", $self->path, "\n";
2330
2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # need to save uniques path
2334 unless ($self->{deny_save}) {
2335 my $uniq = $self->uniq_path; utf8::encode $uniq;
2336
2337 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2338 if $uniq;
2339 }
2340
2341 delete $cf::MAP{$self->path};
2249 2342
2250 $self->deactivate; 2343 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2344 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2345 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2346
2298 $self->unlink_save; 2347 $self->unlink_save;
2299 $self->destroy; 2348 $self->destroy;
2300} 2349}
2301 2350
… …
2309 2358
2310 delete $cf::MAP{$self->path}; 2359 delete $cf::MAP{$self->path};
2311 2360
2312 $self->unlink_save; 2361 $self->unlink_save;
2313 2362
2314 bless $self, "cf::map"; 2363 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2364 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2365 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2366 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2367 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2368
… …
2549 2598
2550Freezes the player and moves him/her to a special map (C<{link}>). 2599Freezes the player and moves him/her to a special map (C<{link}>).
2551 2600
2552The player should be reasonably safe there for short amounts of time (e.g. 2601The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2602for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2603though, as the player cannot control the character while it is on the link
2555map. 2604map.
2556 2605
2557Will never block. 2606Will never block.
2558 2607
2559=item $player_object->leave_link ($map, $x, $y) 2608=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2629sub cf::object::player::enter_link {
2581 my ($self) = @_; 2630 my ($self) = @_;
2582 2631
2583 $self->deactivate_recursive; 2632 $self->deactivate_recursive;
2584 2633
2634 ++$self->{_link_recursion};
2635
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2636 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2637
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2638 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2639 if $self->map && $self->map->{path} ne "{link}";
2589 2640
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2641 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2642}
2592 2643
2593sub cf::object::player::leave_link { 2644sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2645 my ($self, $map, $x, $y) = @_;
2595 2646
… …
2620 $map->load_neighbours; 2671 $map->load_neighbours;
2621 2672
2622 return unless $self->contr->active; 2673 return unless $self->contr->active;
2623 2674
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2675 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2676 if ($self->enter_map ($map, $x, $y)) {
2626 2677 # entering was successful
2678 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2679 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2680 $self->activate_recursive;
2629} 2681 }
2630 2682
2683}
2684
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2685=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2686
2633Moves the player to the given map-path and coordinates by first freezing 2687Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2688her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2689that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2690the new (success) or old (failed) map position. In either case, $done will
… …
2643 2697
2644our $GOTOGEN; 2698our $GOTOGEN;
2645 2699
2646sub cf::object::player::goto { 2700sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2701 my ($self, $path, $x, $y, $check, $done) = @_;
2702
2703 if ($self->{_link_recursion} >= $MAX_LINKS) {
2704 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2705 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2706 ($path, $x, $y) = @$EMERGENCY_POSITION;
2707 }
2648 2708
2649 # do generation counting so two concurrent goto's will be executed in-order 2709 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2710 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2711
2652 $self->enter_link; 2712 $self->enter_link;
… …
2676 my $map = eval { 2736 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2737 my $map = defined $path ? cf::map::find $path : undef;
2678 2738
2679 if ($map) { 2739 if ($map) {
2680 $map = $map->customise_for ($self); 2740 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2741 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2742 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2743 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2744 }
2685 2745
2686 $map 2746 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2754 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2755 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2756 $self->leave_link ($map, $x, $y);
2697 } 2757 }
2698 2758
2699 $done->() if $done; 2759 $done->($self) if $done;
2700 })->prio (1); 2760 })->prio (1);
2701} 2761}
2702 2762
2703=item $player_object->enter_exit ($exit_object) 2763=item $player_object->enter_exit ($exit_object)
2704 2764
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2857 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2858 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2859 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2860 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2861
2802 warn "ERROR in enter_exit: $@"; 2862 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2863 $self->leave_link;
2804 } 2864 }
2805 })->prio (1); 2865 })->prio (1);
2806} 2866}
2807 2867
… …
3120 3180
3121 $ns->ext_reply ($reply, @reply) 3181 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3182 if $reply;
3123 3183
3124 } else { 3184 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3185 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3186 }
3127 3187
3128 cf::override; 3188 cf::override;
3129 }, 3189 },
3130); 3190);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3271 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3272 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3273 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3274 ["cf::map" => qw(trigger)],
3215) { 3275) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3276 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3277 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3278 for @funs;
3220} 3279}
3221 3280
… …
3260 local @cf::_safe_eval_args = values %vars; 3319 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3320 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3321 }
3263 3322
3264 if ($@) { 3323 if ($@) {
3265 warn "$@"; 3324 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3325 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3326 "with arguments " . (join " ", %vars) . "\n";
3268 } 3327 }
3269 3328
3270 wantarray ? @res : $res[0] 3329 wantarray ? @res : $res[0]
3271} 3330}
3272 3331
… …
3306 # for this (global event?) 3365 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3366 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3367
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3368 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3369
3311 warn "loading facedata from $path\n"; 3370 trace "loading facedata from $path\n";
3312 3371
3313 my $facedata; 3372 my $facedata;
3314 0 < aio_load $path, $facedata 3373 0 < aio_load $path, $facedata
3315 or die "$path: $!"; 3374 or die "$path: $!";
3316 3375
… …
3350 3409
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3410 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3411 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3412 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3413 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3414 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3415 }
3357 3416
3358 cf::cede_to_tick; 3417 cf::cede_to_tick;
3359 } 3418 }
3360 } 3419 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3437 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3438
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3439 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3440 cf::face::set_type $idx, $info->{type};
3382 } else { 3441 } else {
3383 $RESOURCE{$name} = $info; 3442 $RESOURCE{$name} = $info; # unused
3384 } 3443 }
3385 3444
3386 cf::cede_to_tick; 3445 cf::cede_to_tick;
3387 } 3446 }
3388 } 3447 }
3389 3448
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3449 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3450
3392 1 3451 1
3393} 3452}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3453
3415register_exticmd fx_want => sub { 3454register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3455 my ($ns, $want) = @_;
3417 3456
3418 while (my ($k, $v) = each %$want) { 3457 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3496sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3497 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3498 or die "unable to load treasurelists\n";
3460} 3499}
3461 3500
3501sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n";
3503
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3508
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_]
3511 or next;
3512
3513 my $face = cf::face::find "sound/$sound->[1]";
3514 cf::sound::set $sound->[0] => $face;
3515 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3516 }
3517
3518 while (my ($k, $v) = each %{$soundconf->{event}}) {
3519 my $face = cf::face::find "sound/$v";
3520 cf::sound::set $k => $face;
3521 }
3522}
3523
3462sub reload_resources { 3524sub reload_resources {
3463 warn "reloading resource files...\n"; 3525 trace "reloading resource files...\n";
3464 3526
3465 reload_facedata; 3527 reload_facedata;
3528 reload_sound;
3466 reload_archetypes; 3529 reload_archetypes;
3467 reload_regions; 3530 reload_regions;
3468 reload_treasures; 3531 reload_treasures;
3469 3532
3470 warn "finished reloading resource files\n"; 3533 trace "finished reloading resource files\n";
3471} 3534}
3472 3535
3473sub reload_config { 3536sub reload_config {
3474 warn "reloading config file...\n"; 3537 trace "reloading config file...\n";
3475 3538
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3539 open my $fh, "<:utf8", "$CONFDIR/config"
3477 or return; 3540 or return;
3478 3541
3479 local $/; 3542 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3543 *CFG = YAML::XS::Load scalar <$fh>;
3481 3544
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3546
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3549
3487 if (exists $CFG{mlockall}) { 3550 if (exists $CFG{mlockall}) {
… …
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3553 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3554 };
3492 warn $@ if $@; 3555 warn $@ if $@;
3493 } 3556 }
3494 3557
3495 warn "finished reloading resource files\n"; 3558 trace "finished reloading resource files\n";
3496} 3559}
3497 3560
3498sub pidfile() { 3561sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3563 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3576 seek $fh, 0, 0;
3514 print $fh $$; 3577 print $fh $$;
3515} 3578}
3516 3579
3517sub main_loop { 3580sub main_loop {
3518 warn "EV::loop starting\n"; 3581 trace "EV::loop starting\n";
3519 if (1) { 3582 if (1) {
3520 EV::loop; 3583 EV::loop;
3521 } 3584 }
3522 warn "EV::loop returned\n"; 3585 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3586 goto &main_loop unless $REALLY_UNLOOP;
3524} 3587}
3525 3588
3526sub main { 3589sub main {
3527 cf::init_globals; # initialise logging 3590 cf::init_globals; # initialise logging
3528 3591
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3596
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3598
3541 # we must not ever block the main coroutine 3599 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3600 local $Coro::idle = sub {
… …
3548 }; 3606 };
3549 3607
3550 evthread_start IO::AIO::poll_fileno; 3608 evthread_start IO::AIO::poll_fileno;
3551 3609
3552 cf::sync_job { 3610 cf::sync_job {
3611 cf::init_experience;
3612 cf::init_anim;
3613 cf::init_attackmess;
3614 cf::init_dynamic;
3615
3553 cf::load_settings; 3616 cf::load_settings;
3554 cf::load_materials; 3617 cf::load_materials;
3555 3618
3556 reload_resources; 3619 reload_resources;
3557 reload_config; 3620 reload_config;
… …
3573 use POSIX (); 3636 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3638
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3639 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3640 };
3641
3642 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n";
3578 3644
3579 main_loop; 3645 main_loop;
3580} 3646}
3581 3647
3582############################################################################# 3648#############################################################################
… …
3623 or return; 3689 or return;
3624 3690
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3691 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3692 and return;
3627 3693
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3694 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3695
3630 1 3696 1
3631} 3697}
3632 3698
3633our $uuid_lock; 3699our $uuid_lock;
… …
3645 or return; 3711 or return;
3646 3712
3647 my $value = uuid_seq uuid_cur; 3713 my $value = uuid_seq uuid_cur;
3648 3714
3649 unless ($value) { 3715 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3716 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3717 return;
3652 } 3718 }
3653 3719
3654 my $value = uuid_str $value + $uuid_skip; 3720 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3721 $uuid_skip = 0;
… …
3665 or return; 3731 or return;
3666 3732
3667 aio_rename "$uuid~", $uuid 3733 aio_rename "$uuid~", $uuid
3668 and return; 3734 and return;
3669 3735
3670 warn "uuid file written ($value).\n"; 3736 trace "uuid file written ($value).\n";
3671 3737
3672 1 3738 1
3673 3739
3674} 3740}
3675 3741
… …
3681} 3747}
3682 3748
3683sub emergency_save() { 3749sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3750 my $freeze_guard = cf::freeze_mainloop;
3685 3751
3686 warn "emergency_perl_save: enter\n"; 3752 info "emergency_perl_save: enter\n";
3753
3754 # this is a trade-off: we want to be very quick here, so
3755 # save all maps without fsync, and later call a global sync
3756 # (which in turn might be very very slow)
3757 local $USE_FSYNC = 0;
3687 3758
3688 cf::sync_job { 3759 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3760 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3761
3694 # use a peculiar iteration method to avoid tripping on perl 3762 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3763 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3764 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3765 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3766 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3767 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3768 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3769 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3770 $pl->save;
3703 } 3771 }
3704 warn "emergency_perl_save: end player save\n"; 3772 info "emergency_perl_save: end player save\n";
3705 3773
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3706 warn "emergency_perl_save: begin map save\n"; 3776 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3777 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3778 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3779 $map->valid or next;
3710 $map->save; 3780 $map->save;
3711 } 3781 }
3712 warn "emergency_perl_save: end map save\n"; 3782 info "emergency_perl_save: end map save\n";
3713 3783
3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3786 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3787 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3788 info "emergency_perl_save: end database checkpoint\n";
3717 3789
3718 warn "emergency_perl_save: begin write uuid\n"; 3790 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3791 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3792 info "emergency_perl_save: end write uuid\n";
3793
3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 trace "emergency_perl_save: syncing database to disk";
3797 BDB::db_env_txn_checkpoint $DB_ENV;
3798
3799 info "emergency_perl_save: starting sync\n";
3800 IO::AIO::aio_sync sub {
3801 info "emergency_perl_save: finished sync\n";
3802 };
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: flushing outstanding aio requests";
3807 while (IO::AIO::nreqs || BDB::nreqs) {
3808 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3809 }
3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3812 };
3722 3813
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3814 info "emergency_perl_save: leave\n";
3729} 3815}
3730 3816
3731sub post_cleanup { 3817sub post_cleanup {
3732 my ($make_core) = @_; 3818 my ($make_core) = @_;
3733 3819
3820 IO::AIO::flush;
3821
3734 warn Carp::longmess "post_cleanup backtrace" 3822 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3823 if $make_core;
3736 3824
3737 my $fh = pidfile; 3825 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3826 unlink $PIDFILE if <$fh> == $$;
3739} 3827}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3847 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3848 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3849 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3850# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3851 }
3764 warn "cleared package $pkg\n";#d#
3765} 3852}
3766 3853
3767sub do_reload_perl() { 3854sub do_reload_perl() {
3768 # can/must only be called in main 3855 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3856 if (in_main) {
3770 warn "can only reload from main coroutine"; 3857 error "can only reload from main coroutine";
3771 return; 3858 return;
3772 } 3859 }
3773 3860
3774 return if $RELOAD++; 3861 return if $RELOAD++;
3775 3862
3776 my $t1 = AE::time; 3863 my $t1 = AE::time;
3777 3864
3778 while ($RELOAD) { 3865 while ($RELOAD) {
3779 warn "reloading..."; 3866 info "reloading...";
3780 3867
3781 warn "entering sync_job"; 3868 trace "entering sync_job";
3782 3869
3783 cf::sync_job { 3870 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3871 cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3872
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3873 trace "cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3874 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3875 %EXT_CORO = ();
3801 3876
3802 warn "removing commands"; 3877 trace "removing commands";
3803 %COMMAND = (); 3878 %COMMAND = ();
3804 3879
3805 warn "removing ext/exti commands"; 3880 trace "removing ext/exti commands";
3806 %EXTCMD = (); 3881 %EXTCMD = ();
3807 %EXTICMD = (); 3882 %EXTICMD = ();
3808 3883
3809 warn "unloading/nuking all extensions"; 3884 trace "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3885 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3886 trace "... unloading $pkg";
3812 3887
3813 if (my $cb = $pkg->can ("unload")) { 3888 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3889 eval {
3815 $cb->($pkg); 3890 $cb->($pkg);
3816 1 3891 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3892 } or error "$pkg unloaded, but with errors: $@";
3818 } 3893 }
3819 3894
3820 warn "... clearing $pkg"; 3895 trace "... clearing $pkg";
3821 clear_package $pkg; 3896 clear_package $pkg;
3822 } 3897 }
3823 3898
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3899 trace "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3900 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3902
3828 warn "... unloading $k"; 3903 trace "... unloading $k";
3829 delete $INC{$k}; 3904 delete $INC{$k};
3830 3905
3831 $k =~ s/\.pm$//; 3906 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3907 $k =~ s/\//::/g;
3833 3908
… …
3836 } 3911 }
3837 3912
3838 clear_package $k; 3913 clear_package $k;
3839 } 3914 }
3840 3915
3841 warn "getting rid of safe::, as good as possible"; 3916 trace "getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3917 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3919
3845 warn "unloading cf.pm \"a bit\""; 3920 trace "unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3921 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3923
3849 # don't, removes xs symbols, too, 3924 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3925 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3926 #clear_package __PACKAGE__;
3852 3927
3853 warn "unload completed, starting to reload now"; 3928 info "unload completed, starting to reload now";
3854 3929
3855 warn "reloading cf.pm"; 3930 trace "reloading cf.pm";
3856 require cf; 3931 require cf;
3857 cf::_connect_to_perl_1; 3932 cf::_connect_to_perl_1;
3858 3933
3859 warn "loading config and database again"; 3934 trace "loading config and database again";
3860 cf::reload_config; 3935 cf::reload_config;
3861 3936
3862 warn "loading extensions"; 3937 trace "loading extensions";
3863 cf::load_extensions; 3938 cf::load_extensions;
3864 3939
3865 if ($REATTACH_ON_RELOAD) { 3940 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3941 trace "reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3942 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3943 trace "reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3944 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3945 trace "reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3946 reattach $_ for values %PLAYER;
3872 } 3947 }
3873 3948
3874 warn "running post_init jobs"; 3949 trace "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT; 3950 (pop @POST_INIT)->(1) while @POST_INIT;
3876 3951
3877 warn "leaving sync_job"; 3952 trace "leaving sync_job";
3878 3953
3879 1 3954 1
3880 } or do { 3955 } or do {
3881 warn $@; 3956 error $@;
3882 cf::cleanup "error while reloading, exiting."; 3957 cf::cleanup "error while reloading, exiting.";
3883 }; 3958 };
3884 3959
3885 warn "reloaded"; 3960 info "reloaded";
3886 --$RELOAD; 3961 --$RELOAD;
3887 } 3962 }
3888 3963
3889 $t1 = AE::time - $t1; 3964 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 3965 info "reload completed in ${t1}s\n";
3891}; 3966};
3892 3967
3893our $RELOAD_WATCHER; # used only during reload 3968our $RELOAD_WATCHER; # used only during reload
3894 3969
3895sub reload_perl() { 3970sub reload_perl() {
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4030 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4031 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4032 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4033 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4034 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4035 or error "ERROR: unable to write runtime file: $!";
3961 }; 4036 };
3962 } 4037 }
3963 4038
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4039 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4040 $sig->send;
… …
3973 4048
3974 if (0) { 4049 if (0) {
3975 if ($NEXT_TICK) { 4050 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4051 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4052 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4053 debug "jitter $JITTER\n";#d#
3979 } 4054 }
3980 } 4055 }
3981} 4056}
3982 4057
3983{ 4058{

Diff Legend

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