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.541 by root, Tue May 4 23:33:16 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";
1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1424 1457
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1459 if exists $v->{meta}{mandatory};
1460
1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1427 } else { 1463 } else {
1428 $done{$k} = delete $todo{$k}; 1464 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1465 push @EXTS, $v->{pkg};
1430 $progress = 1; 1466 $progress = 1;
1431 1467
1432 warn "$v->{base}: extension inactive.\n" 1468 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1469 unless $active;
1434 } 1470 }
1435 } 1471 }
1436 1472
1437 unless ($progress) { 1473 unless ($progress) {
… …
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1646
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1612 $pl->deactivate; 1648 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1616 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1617 1652
1618 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1674 \@logins 1709 \@logins
1675} 1710}
1676 1711
1677=item $player->maps 1712=item $player->maps
1678 1713
1714=item cf::player::maps $login
1715
1679Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1680player. May block. 1717player. May block.
1681 1718
1682=cut 1719=cut
1683 1720
… …
1744 1781
1745=cut 1782=cut
1746 1783
1747sub find_by_path($) { 1784sub find_by_path($) {
1748 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1749 1788
1750 my ($match, $specificity); 1789 my ($match, $specificity);
1751 1790
1752 for my $region (list) { 1791 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
… …
1810 1849
1811sub register { 1850sub register {
1812 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1852 my $pkg = caller;
1814 1853
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1855
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1857}
1820 1858
1821# also paths starting with '/' 1859# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1861
1824sub thawer_merge { 1862sub thawer_merge {
1825 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1826 1864
1827 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2137 or next; 2175 or next;
2138 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2139 or next; 2177 or next;
2140 $neigh->load; 2178 $neigh->load;
2141 2179
2180 # now find the diagonal neighbours
2142 push @neigh, 2181 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2184 }
2146 2185
… …
2153} 2192}
2154 2193
2155sub find_sync { 2194sub find_sync {
2156 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2157 2196
2158 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2159} 2201}
2160 2202
2161sub do_load_sync { 2203sub do_load_sync {
2162 my ($map) = @_; 2204 my ($map) = @_;
2163 2205
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2166 2208
2167 cf::sync_job { $map->load }; 2209 $map->load;
2168} 2210}
2169 2211
2170our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2172 2214
… …
2198 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2199 2241
2200 () 2242 ()
2201} 2243}
2202 2244
2245# common code, used by both ->save and ->swapout
2203sub save { 2246sub _save {
2204 my ($self) = @_; 2247 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2248
2208 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2209 2250
2210 return unless $self->dirty; 2251 return unless $self->dirty;
2211 2252
… …
2231 } else { 2272 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2274 }
2234} 2275}
2235 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2236sub swap_out { 2285sub swap_out {
2237 my ($self) = @_; 2286 my ($self) = @_;
2238 2287
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2289
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2247 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2249 2344
2250 $self->deactivate; 2345 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2347 $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 2348
2298 $self->unlink_save; 2349 $self->unlink_save;
2299 $self->destroy; 2350 $self->destroy;
2300} 2351}
2301 2352
… …
2309 2360
2310 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2311 2362
2312 $self->unlink_save; 2363 $self->unlink_save;
2313 2364
2314 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2370
… …
2549 2600
2550Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2551 2602
2552The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2555map. 2606map.
2556 2607
2557Will never block. 2608Will never block.
2558 2609
2559=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2581 my ($self) = @_; 2632 my ($self) = @_;
2582 2633
2583 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2584 2635
2636 ++$self->{_link_recursion};
2637
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2639
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2589 2642
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2644}
2592 2645
2593sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2595 2648
… …
2620 $map->load_neighbours; 2673 $map->load_neighbours;
2621 2674
2622 return unless $self->contr->active; 2675 return unless $self->contr->active;
2623 2676
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2626 2679 # entering was successful
2680 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2682 $self->activate_recursive;
2629} 2683 }
2630 2684
2685}
2686
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2688
2633Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2643 2699
2644our $GOTOGEN; 2700our $GOTOGEN;
2645 2701
2646sub cf::object::player::goto { 2702sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2648 2710
2649 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2713
2652 $self->enter_link; 2714 $self->enter_link;
… …
2676 my $map = eval { 2738 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2678 2740
2679 if ($map) { 2741 if ($map) {
2680 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2744 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2746 }
2685 2747
2686 $map 2748 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2697 } 2759 }
2698 2760
2699 $done->() if $done; 2761 $done->($self) if $done;
2700 })->prio (1); 2762 })->prio (1);
2701} 2763}
2702 2764
2703=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2704 2766
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2863
2802 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2865 $self->leave_link;
2804 } 2866 }
2805 })->prio (1); 2867 })->prio (1);
2806} 2868}
2807 2869
… …
3120 3182
3121 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3184 if $reply;
3123 3185
3124 } else { 3186 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3188 }
3127 3189
3128 cf::override; 3190 cf::override;
3129 }, 3191 },
3130); 3192);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3215) { 3277) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3280 for @funs;
3220} 3281}
3221 3282
… …
3260 local @cf::_safe_eval_args = values %vars; 3321 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3322 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3323 }
3263 3324
3264 if ($@) { 3325 if ($@) {
3265 warn "$@"; 3326 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3268 } 3329 }
3269 3330
3270 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3271} 3332}
3272 3333
… …
3297=cut 3358=cut
3298 3359
3299############################################################################# 3360#############################################################################
3300# the server's init and main functions 3361# the server's init and main functions
3301 3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 ref $dir and next;
3376 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377 or next;
3378
3379 $data = "#line 1 $dir/$mod\n$data";
3380
3381 open my $fh, "<", \$data or die;
3382
3383 return $fh;
3384 }
3385
3386 ()
3387}
3388
3389sub init_inc {
3390 # save original @INC
3391 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393 # make sure we can do scalar-opens
3394 open my $dummy, "<", \my $dummy2;
3395
3396 # execute some stuff so perl load's some of the core modules
3397 /Ü/ =~ /ü/i;
3398 eval { &Storable::nstore_fd };
3399
3400 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402 debug "module loading will be asynchronous from this point on.";
3403}
3404
3302sub load_facedata($) { 3405sub load_facedata($) {
3303 my ($path) = @_; 3406 my ($path) = @_;
3304 3407
3305 # HACK to clear player env face cache, we need some signal framework 3408 # HACK to clear player env face cache, we need some signal framework
3306 # for this (global event?) 3409 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3411
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3413
3311 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3312 3415
3313 my $facedata; 3416 my $facedata;
3314 0 < aio_load $path, $facedata 3417 0 < aio_load $path, $facedata
3315 or die "$path: $!"; 3418 or die "$path: $!";
3316 3419
… …
3350 3453
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3457 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3459 }
3357 3460
3358 cf::cede_to_tick; 3461 cf::cede_to_tick;
3359 } 3462 }
3360 } 3463 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3482
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3382 } else { 3485 } else {
3383 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3384 } 3487 }
3385 3488
3386 cf::cede_to_tick; 3489 cf::cede_to_tick;
3387 } 3490 }
3388 } 3491 }
3389 3492
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3494
3392 1 3495 1
3393} 3496}
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 3497
3415register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3417 3500
3418 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3540sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3460} 3543}
3461 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3462sub reload_resources { 3568sub reload_resources {
3463 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3464 3570
3465 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3466 reload_archetypes; 3573 reload_archetypes;
3467 reload_regions; 3574 reload_regions;
3468 reload_treasures; 3575 reload_treasures;
3469 3576
3470 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3471} 3578}
3472 3579
3473sub reload_config { 3580sub reload_config {
3474 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3475 3582
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3583 open my $fh, "<:utf8", "$CONFDIR/config"
3477 or return; 3584 or return;
3478 3585
3479 local $/; 3586 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = YAML::XS::Load scalar <$fh>;
3481 3588
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3590
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $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}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3593
3487 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3598 };
3492 warn $@ if $@; 3599 warn $@ if $@;
3493 } 3600 }
3494 3601
3495 warn "finished reloading resource files\n"; 3602 trace "finished reloading resource files\n";
3496} 3603}
3497 3604
3498sub pidfile() { 3605sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3514 print $fh $$; 3621 print $fh $$;
3515} 3622}
3516 3623
3517sub main_loop { 3624sub main_loop {
3518 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3519 if (1) { 3626 if (1) {
3520 EV::loop; 3627 EV::loop;
3521 } 3628 }
3522 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3524} 3631}
3525 3632
3526sub main { 3633sub main {
3527 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3528 3635
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 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 3640
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3642
3541 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
… …
3548 }; 3650 };
3549 3651
3550 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3551 3653
3552 cf::sync_job { 3654 cf::sync_job {
3655 init_inc;
3656
3657 cf::init_experience;
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3553 cf::load_settings; 3662 cf::load_settings;
3554 cf::load_materials; 3663 cf::load_materials;
3555 3664
3556 reload_resources; 3665 reload_resources;
3557 reload_config; 3666 reload_config;
… …
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3683 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3684
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3685 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3686 };
3578 3687
3688 cf::object::thawer::errors_are_fatal 0;
3689 info "parse errors in files are no longer fatal from this point on.\n";
3690
3691 my $free_main; $free_main = EV::idle sub {
3692 undef $free_main;
3693 undef &main; # free gobs of memory :)
3694 };
3695
3579 main_loop; 3696 goto &main_loop;
3580} 3697}
3581 3698
3582############################################################################# 3699#############################################################################
3583# initialisation and cleanup 3700# initialisation and cleanup
3584 3701
… …
3623 or return; 3740 or return;
3624 3741
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3742 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3743 and return;
3627 3744
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3745 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3746
3630 1 3747 1
3631} 3748}
3632 3749
3633our $uuid_lock; 3750our $uuid_lock;
… …
3645 or return; 3762 or return;
3646 3763
3647 my $value = uuid_seq uuid_cur; 3764 my $value = uuid_seq uuid_cur;
3648 3765
3649 unless ($value) { 3766 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3767 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3768 return;
3652 } 3769 }
3653 3770
3654 my $value = uuid_str $value + $uuid_skip; 3771 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3772 $uuid_skip = 0;
… …
3665 or return; 3782 or return;
3666 3783
3667 aio_rename "$uuid~", $uuid 3784 aio_rename "$uuid~", $uuid
3668 and return; 3785 and return;
3669 3786
3670 warn "uuid file written ($value).\n"; 3787 trace "uuid file written ($value).\n";
3671 3788
3672 1 3789 1
3673 3790
3674} 3791}
3675 3792
… …
3681} 3798}
3682 3799
3683sub emergency_save() { 3800sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3801 my $freeze_guard = cf::freeze_mainloop;
3685 3802
3686 warn "emergency_perl_save: enter\n"; 3803 info "emergency_perl_save: enter\n";
3804
3805 # this is a trade-off: we want to be very quick here, so
3806 # save all maps without fsync, and later call a global sync
3807 # (which in turn might be very very slow)
3808 local $USE_FSYNC = 0;
3687 3809
3688 cf::sync_job { 3810 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3811 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 3812
3694 # use a peculiar iteration method to avoid tripping on perl 3813 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3814 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3815 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3816 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3817 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3818 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3819 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3820 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3821 $pl->save;
3703 } 3822 }
3704 warn "emergency_perl_save: end player save\n"; 3823 info "emergency_perl_save: end player save\n";
3705 3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3706 warn "emergency_perl_save: begin map save\n"; 3827 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3828 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3829 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3830 $map->valid or next;
3710 $map->save; 3831 $map->save;
3711 } 3832 }
3712 warn "emergency_perl_save: end map save\n"; 3833 info "emergency_perl_save: end map save\n";
3713 3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3837 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3838 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3839 info "emergency_perl_save: end database checkpoint\n";
3717 3840
3718 warn "emergency_perl_save: begin write uuid\n"; 3841 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3842 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3843 info "emergency_perl_save: end write uuid\n";
3844
3845 cf::write_runtime_sync; # external watchdog should not bark
3846
3847 trace "emergency_perl_save: syncing database to disk";
3848 BDB::db_env_txn_checkpoint $DB_ENV;
3849
3850 info "emergency_perl_save: starting sync\n";
3851 IO::AIO::aio_sync sub {
3852 info "emergency_perl_save: finished sync\n";
3853 };
3854
3855 cf::write_runtime_sync; # external watchdog should not bark
3856
3857 trace "emergency_perl_save: flushing outstanding aio requests";
3858 while (IO::AIO::nreqs || BDB::nreqs) {
3859 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3860 }
3861
3862 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3863 };
3722 3864
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"; 3865 info "emergency_perl_save: leave\n";
3729} 3866}
3730 3867
3731sub post_cleanup { 3868sub post_cleanup {
3732 my ($make_core) = @_; 3869 my ($make_core) = @_;
3733 3870
3871 IO::AIO::flush;
3872
3734 warn Carp::longmess "post_cleanup backtrace" 3873 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3874 if $make_core;
3736 3875
3737 my $fh = pidfile; 3876 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3877 unlink $PIDFILE if <$fh> == $$;
3739} 3878}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3898 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3899 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3900 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3901# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3902 }
3764 warn "cleared package $pkg\n";#d#
3765} 3903}
3766 3904
3767sub do_reload_perl() { 3905sub do_reload_perl() {
3768 # can/must only be called in main 3906 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3907 if (in_main) {
3770 warn "can only reload from main coroutine"; 3908 error "can only reload from main coroutine";
3771 return; 3909 return;
3772 } 3910 }
3773 3911
3774 return if $RELOAD++; 3912 return if $RELOAD++;
3775 3913
3776 my $t1 = AE::time; 3914 my $t1 = AE::time;
3777 3915
3778 while ($RELOAD) { 3916 while ($RELOAD) {
3779 warn "reloading..."; 3917 info "reloading...";
3780 3918
3781 warn "entering sync_job"; 3919 trace "entering sync_job";
3782 3920
3783 cf::sync_job { 3921 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3922 cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3923
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"; 3924 trace "cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3926 %EXT_CORO = ();
3801 3927
3802 warn "removing commands"; 3928 trace "removing commands";
3803 %COMMAND = (); 3929 %COMMAND = ();
3804 3930
3805 warn "removing ext/exti commands"; 3931 trace "removing ext/exti commands";
3806 %EXTCMD = (); 3932 %EXTCMD = ();
3807 %EXTICMD = (); 3933 %EXTICMD = ();
3808 3934
3809 warn "unloading/nuking all extensions"; 3935 trace "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3812 3938
3813 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3940 eval {
3815 $cb->($pkg); 3941 $cb->($pkg);
3816 1 3942 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3818 } 3944 }
3819 3945
3820 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3821 clear_package $pkg; 3947 clear_package $pkg;
3822 } 3948 }
3823 3949
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3953
3828 warn "... unloading $k"; 3954 trace "... unloading $k";
3829 delete $INC{$k}; 3955 delete $INC{$k};
3830 3956
3831 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3833 3959
… …
3836 } 3962 }
3837 3963
3838 clear_package $k; 3964 clear_package $k;
3839 } 3965 }
3840 3966
3841 warn "getting rid of safe::, as good as possible"; 3967 trace "getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3968 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3970
3845 warn "unloading cf.pm \"a bit\""; 3971 trace "unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3974
3849 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3976 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3852 3978
3853 warn "unload completed, starting to reload now"; 3979 info "unload completed, starting to reload now";
3854 3980
3855 warn "reloading cf.pm"; 3981 trace "reloading cf.pm";
3856 require cf; 3982 require cf;
3857 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3858 3984
3859 warn "loading config and database again"; 3985 trace "loading config and database again";
3860 cf::reload_config; 3986 cf::reload_config;
3861 3987
3862 warn "loading extensions"; 3988 trace "loading extensions";
3863 cf::load_extensions; 3989 cf::load_extensions;
3864 3990
3865 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3992 trace "reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3994 trace "reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3996 trace "reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3872 } 3998 }
3873 3999
3874 warn "running post_init jobs"; 4000 trace "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT; 4001 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4002
3877 warn "leaving sync_job"; 4003 trace "leaving sync_job";
3878 4004
3879 1 4005 1
3880 } or do { 4006 } or do {
3881 warn $@; 4007 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4008 cf::cleanup "error while reloading, exiting.";
3883 }; 4009 };
3884 4010
3885 warn "reloaded"; 4011 info "reloaded";
3886 --$RELOAD; 4012 --$RELOAD;
3887 } 4013 }
3888 4014
3889 $t1 = AE::time - $t1; 4015 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4016 info "reload completed in ${t1}s\n";
3891}; 4017};
3892 4018
3893our $RELOAD_WATCHER; # used only during reload 4019our $RELOAD_WATCHER; # used only during reload
3894 4020
3895sub reload_perl() { 4021sub reload_perl() {
… …
3916 reload_perl; 4042 reload_perl;
3917 }; 4043 };
3918 } 4044 }
3919}; 4045};
3920 4046
3921unshift @INC, $LIBDIR; 4047#############################################################################
3922 4048
3923my $bug_warning = 0; 4049my $bug_warning = 0;
3924 4050
3925our @WAIT_FOR_TICK; 4051our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4052our @WAIT_FOR_TICK_BEGIN;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4081 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4082 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4083 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4084 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4085 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4086 or error "ERROR: unable to write runtime file: $!";
3961 }; 4087 };
3962 } 4088 }
3963 4089
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4090 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4091 $sig->send;
… …
3973 4099
3974 if (0) { 4100 if (0) {
3975 if ($NEXT_TICK) { 4101 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4102 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4103 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4104 debug "jitter $JITTER\n";#d#
3979 } 4105 }
3980 } 4106 }
3981} 4107}
3982 4108
3983{ 4109{

Diff Legend

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