ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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