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.542 by root, Wed May 5 09:05:03 2010 UTC

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

Diff Legend

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