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.518 by root, Fri Apr 16 02:21:26 2010 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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
… …
121our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 127our $DB_ENV;
125 128
126our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
… …
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 $_;
… …
226from wherever your confdir points to. 233from wherever your confdir points to.
227 234
228=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
229 236
230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
231returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
232per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
233 245
234=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
235 247
236This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
245 257
246=back 258=back
247 259
248=cut 260=cut
249 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
250$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 269 my $msg = join "", @_;
252 270
253 $msg .= "\n" 271 $msg .= "\n"
254 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
255 273
256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257 275
258 LOG llevError, $msg; 276 LOG llevWarn, $msg;
259}; 277};
260 278
261$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
263 281
264 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
265 283
266 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 286 return;#d#
269 }#d# 287 }#d#
270 288
271 # kill coroutine otherwise 289 # kill coroutine otherwise
272 Coro::terminate 290 Coro::terminate
… …
505=cut 523=cut
506 524
507sub sync_job(&) { 525sub sync_job(&) {
508 my ($job) = @_; 526 my ($job) = @_;
509 527
510 if ($Coro::current == $Coro::main) { 528 if (in_main) {
511 my $time = AE::time; 529 my $time = AE::time;
512 530
513 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
515 533
516 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
517 535
518 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
519 537
520 my $busy = 1; 538 my $busy = 1;
521 my @res; 539 my @res;
522 540
523 (async { 541 (async {
524 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 543 @res = eval { $job->() };
526 warn $@ if $@; 544 error $@ if $@;
527 undef $busy; 545 undef $busy;
528 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
529 547
530 while ($busy) { 548 while ($busy) {
531 if (Coro::nready) { 549 if (Coro::nready) {
… …
644within each server. 662within each server.
645 663
646=cut 664=cut
647 665
648sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
649 my ($name) = @_; 670 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
651 672
652 eval { 673 eval {
653 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
663} 684}
664 685
665our $DB; 686our $DB;
666 687
667sub db_init { 688sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
670 };
671} 690}
672 691
673sub db_get($$) { 692sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
675 694
676 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
677 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
678 699
679 $! ? () 700 $! ? ()
680 : $data 701 : $data
681 }
682} 702}
683 703
684sub db_put($$$) { 704sub db_put($$$) {
685 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 762
743 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 764 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
746 766
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 768
749 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
752 772
… …
762 782
763=cut 783=cut
764 784
765sub datalog($@) { 785sub datalog($@) {
766 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 788}
769 789
770=back 790=back
771 791
772=cut 792=cut
… …
967 987
968 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 990
971 } elsif (ref $type) { 991 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
973 993
974 } else { 994 } else {
975 shift @arg; 995 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
977 } 997 }
978 } 998 }
979} 999}
980 1000
981sub _object_attach { 1001sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
992 } 1012 }
993 1013
994 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
995 } else { 1015 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1017 }
998 1018
999 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
1000} 1020}
1001 1021
… …
1060 1080
1061 for (@$callbacks) { 1081 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1063 1083
1064 if ($@) { 1084 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1086 override;
1068 } 1087 }
1069 1088
1070 return 1 if $override; 1089 return 1 if $override;
1071 } 1090 }
… …
1150 for (@$attach) { 1169 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1153 } 1172 }
1154 } else { 1173 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1175 }
1157 } 1176 }
1158} 1177}
1159 1178
1160cf::attachable->attach ( 1179cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1188 1207
1189 sync_job { 1208 sync_job {
1190 if (length $$rdata) { 1209 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1194 1214
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1218 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1221 1241
1222 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1244 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1226 } 1246 }
1227 } else { 1247 } else {
1228 aio_unlink $filename; 1248 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1230 } 1250 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1275 $av = $st->{objs};
1256 } 1276 }
1257 1277
1258 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1261 1282
1262 ($data, $av) 1283 ($data, $av)
1263} 1284}
1264 1285
1265=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1357 1378
1358 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1380 if $reply;
1360 1381
1361 } else { 1382 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1384 }
1364 1385
1365 cf::override; 1386 cf::override;
1366 }, 1387 },
1367); 1388);
… …
1378 1399
1379 $grp 1400 $grp
1380} 1401}
1381 1402
1382sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1383 cf::sync_job { 1406 cf::sync_job {
1384 my %todo; 1407 my %todo;
1385 1408
1386 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1410 next unless -r $path;
… …
1405 1428
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1431
1409 $ext{source} = 1432 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1412 . $source 1435 . $source
1413 . "\n};\n1"; 1436 . "\n};\n1";
1414 1437
1415 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1451 next ext
1429 unless exists $done{$_}; 1452 unless exists $done{$_};
1430 } 1453 }
1431 1454
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1456
1434 my $active = eval $v->{source}; 1457 my $active = eval $v->{source};
1435 1458
1436 if (length $@) { 1459 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1460 error "$v->{path}: $@\n";
1438 1461
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1463 if exists $v->{meta}{mandatory};
1464
1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1441 } else { 1467 } else {
1442 $done{$k} = delete $todo{$k}; 1468 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1469 push @EXTS, $v->{pkg};
1444 $progress = 1; 1470 $progress = 1;
1445 1471
1446 warn "$v->{base}: extension inactive.\n" 1472 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1473 unless $active;
1448 } 1474 }
1449 } 1475 }
1450 1476
1451 unless ($progress) { 1477 unless ($progress) {
… …
1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1624 1650
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1626 $pl->deactivate; 1652 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1630 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1631 1656
1632 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1688 \@logins 1713 \@logins
1689} 1714}
1690 1715
1691=item $player->maps 1716=item $player->maps
1692 1717
1718=item cf::player::maps $login
1719
1693Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1694player. May block. 1721player. May block.
1695 1722
1696=cut 1723=cut
1697 1724
… …
1758 1785
1759=cut 1786=cut
1760 1787
1761sub find_by_path($) { 1788sub find_by_path($) {
1762 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1763 1792
1764 my ($match, $specificity); 1793 my ($match, $specificity);
1765 1794
1766 for my $region (list) { 1795 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
… …
1824 1853
1825sub register { 1854sub register {
1826 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1856 my $pkg = caller;
1828 1857
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1859
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1861}
1834 1862
1835# also paths starting with '/' 1863# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1865
1838sub thawer_merge { 1866sub thawer_merge {
1839 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1840 1868
1841 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1846} 1874}
1847 1875
1848sub normalise { 1876sub normalise {
1849 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1850 1878
1851 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1852 1880
1853 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1854 1882
1855 # map plan: 1883 # map plan:
1856 # 1884 #
… …
1895 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1896 return $self; 1924 return $self;
1897 } 1925 }
1898 } 1926 }
1899 1927
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1929 ()
1902} 1930}
1903 1931
1904sub init { 1932sub init {
1905 my ($self) = @_; 1933 my ($self) = @_;
… …
2027} 2055}
2028 2056
2029sub find; 2057sub find;
2030sub find { 2058sub find {
2031 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
2032 2062
2033 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
2034 2064
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2151 or next; 2181 or next;
2152 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2153 or next; 2183 or next;
2154 $neigh->load; 2184 $neigh->load;
2155 2185
2186 # now find the diagonal neighbours
2156 push @neigh, 2187 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2190 }
2160 2191
… …
2167} 2198}
2168 2199
2169sub find_sync { 2200sub find_sync {
2170 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2171 2202
2172 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2173} 2207}
2174 2208
2175sub do_load_sync { 2209sub do_load_sync {
2176 my ($map) = @_; 2210 my ($map) = @_;
2177 2211
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2180 2214
2181 cf::sync_job { $map->load }; 2215 $map->load;
2182} 2216}
2183 2217
2184our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2186 2220
… …
2298 2332
2299 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2300 2334
2301 return if $self->players; 2335 return if $self->players;
2302 2336
2303 warn "resetting map ", $self->path, "\n"; 2337 cf::trace "resetting map ", $self->path, "\n";
2304 2338
2305 $self->in_memory (cf::MAP_SWAPPED); 2339 $self->in_memory (cf::MAP_SWAPPED);
2306 2340
2307 # need to save uniques path 2341 # need to save uniques path
2308 unless ($self->{deny_save}) { 2342 unless ($self->{deny_save}) {
… …
2332 2366
2333 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2334 2368
2335 $self->unlink_save; 2369 $self->unlink_save;
2336 2370
2337 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2338 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2339 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2340 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2341 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342 2376
… …
2572 2606
2573Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2574 2608
2575The player should be reasonably safe there for short amounts of time (e.g. 2609The player should be reasonably safe there for short amounts of time (e.g.
2576for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link 2611though, as the player cannot control the character while it is on the link
2578map. 2612map.
2579 2613
2580Will never block. 2614Will never block.
2581 2615
2582=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2603sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2604 my ($self) = @_; 2638 my ($self) = @_;
2605 2639
2606 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2607 2641
2642 ++$self->{_link_recursion};
2643
2608 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2609 2645
2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2612 2648
2613 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2614} 2650}
2615 2651
2616sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2617 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2618 2654
… …
2643 $map->load_neighbours; 2679 $map->load_neighbours;
2644 2680
2645 return unless $self->contr->active; 2681 return unless $self->contr->active;
2646 2682
2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2649 2685 # entering was successful
2686 delete $self->{_link_recursion};
2650 # only activate afterwards, to support waiting in hooks 2687 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive; 2688 $self->activate_recursive;
2652} 2689 }
2653 2690
2691}
2692
2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655 2694
2656Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2657her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2658that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2659the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
… …
2666 2705
2667our $GOTOGEN; 2706our $GOTOGEN;
2668 2707
2669sub cf::object::player::goto { 2708sub cf::object::player::goto {
2670 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2671 2716
2672 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674 2719
2675 $self->enter_link; 2720 $self->enter_link;
… …
2699 my $map = eval { 2744 my $map = eval {
2700 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2701 2746
2702 if ($map) { 2747 if ($map) {
2703 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2704 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2705 } else { 2750 } else {
2706 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707 } 2752 }
2708 2753
2709 $map 2754 $map
… …
2717 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2718 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2719 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2720 } 2765 }
2721 2766
2722 $done->() if $done; 2767 $done->($self) if $done;
2723 })->prio (1); 2768 })->prio (1);
2724} 2769}
2725 2770
2726=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2727 2772
… …
2820 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2821 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2822 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2823 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2824 2869
2825 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2826 $self->leave_link; 2871 $self->leave_link;
2827 } 2872 }
2828 })->prio (1); 2873 })->prio (1);
2829} 2874}
2830 2875
… …
3143 3188
3144 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3145 if $reply; 3190 if $reply;
3146 3191
3147 } else { 3192 } else {
3148 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3149 } 3194 }
3150 3195
3151 cf::override; 3196 cf::override;
3152 }, 3197 },
3153); 3198);
… …
3234 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3235 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3236 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3237 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3238) { 3283) {
3239 no strict 'refs';
3240 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242 for @funs; 3286 for @funs;
3243} 3287}
3244 3288
… …
3283 local @cf::_safe_eval_args = values %vars; 3327 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval; 3328 @res = wantarray ? eval eval : scalar eval $eval;
3285 } 3329 }
3286 3330
3287 if ($@) { 3331 if ($@) {
3288 warn "$@"; 3332 warn "$@",
3289 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3290 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3291 } 3335 }
3292 3336
3293 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3294} 3338}
3295 3339
… …
3329 # for this (global event?) 3373 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3331 3375
3332 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333 3377
3334 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3335 3379
3336 my $facedata;
3337 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3338 or die "$path: $!"; 3381 or die "$path: $!";
3339 3382
3340 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3341 3384
3342 $facedata->{version} == 2 3385 $facedata->{version} == 2
… …
3373 3416
3374 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3375 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377 } else { 3420 } else {
3378 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3379 } 3422 }
3380 3423
3381 cf::cede_to_tick; 3424 cf::cede_to_tick;
3382 } 3425 }
3383 } 3426 }
… …
3401 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402 3445
3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3405 } else { 3448 } else {
3406 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3407 } 3450 }
3408 3451
3409 cf::cede_to_tick; 3452 cf::cede_to_tick;
3410 } 3453 }
3411 } 3454 }
3412 3455
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414 3457
3415 1 3458 1
3416} 3459}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3437 3460
3438register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3439 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3440 3463
3441 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3480sub reload_treasures { 3503sub reload_treasures {
3481 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3482 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3483} 3506}
3484 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3485sub reload_resources { 3531sub reload_resources {
3486 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3487 3533
3534 reload_exp_table;
3535 reload_materials;
3488 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3489 reload_archetypes; 3538 reload_archetypes;
3490 reload_regions; 3539 reload_regions;
3491 reload_treasures; 3540 reload_treasures;
3492 3541
3493 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3494} 3543}
3495 3544
3496sub reload_config { 3545sub reload_config {
3497 warn "reloading config file...\n"; 3546 trace "reloading config file...\n";
3498 3547
3499 open my $fh, "<:utf8", "$CONFDIR/config" 3548 0 < aio_load "$CONFDIR/config", my $config
3500 or return; 3549 or die "$CONFDIR/config: $!";
3501 3550
3502 local $/; 3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3503 *CFG = YAML::XS::Load scalar <$fh>; 3554 *CFG = YAML::XS::Load $config;
3504 3555
3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506 3557
3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3509 3560
3510 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3563 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513 and die "WARNING: m(un)lockall failed: $!\n"; 3564 and die "WARNING: m(un)lockall failed: $!\n";
3514 }; 3565 };
3515 warn $@ if $@; 3566 warn $@ if $@;
3516 } 3567 }
3517
3518 warn "finished reloading resource files\n";
3519} 3568}
3520 3569
3521sub pidfile() { 3570sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!"; 3572 or die "$PIDFILE: $!";
… …
3536 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3537 print $fh $$; 3586 print $fh $$;
3538} 3587}
3539 3588
3540sub main_loop { 3589sub main_loop {
3541 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3542 if (1) { 3591 if (1) {
3543 EV::loop; 3592 EV::loop;
3544 } 3593 }
3545 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3547} 3596}
3548 3597
3549sub main { 3598sub main {
3550 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3551 3600
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556 3605
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558 3607
… …
3566 }; 3615 };
3567 3616
3568 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3569 3618
3570 cf::sync_job { 3619 cf::sync_job {
3571 cf::init_experience; 3620 cf::incloader::init ();
3621
3572 cf::init_anim; 3622 cf::init_anim;
3573 cf::init_attackmess; 3623 cf::init_attackmess;
3574 cf::init_dynamic; 3624 cf::init_dynamic;
3575 3625
3576 cf::load_settings; 3626 cf::load_settings;
3577 cf::load_materials;
3578 3627
3579 reload_resources; 3628 reload_resources;
3580 reload_config; 3629 reload_config;
3581 db_init; 3630 db_init;
3582 3631
… …
3598 3647
3599 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3600 }; 3649 };
3601 3650
3602 cf::object::thawer::errors_are_fatal 0; 3651 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n"; 3652 info "parse errors in files are no longer fatal from this point on.\n";
3604 3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3605 main_loop; 3659 goto &main_loop;
3606} 3660}
3607 3661
3608############################################################################# 3662#############################################################################
3609# initialisation and cleanup 3663# initialisation and cleanup
3610 3664
… …
3649 or return; 3703 or return;
3650 3704
3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652 and return; 3706 and return;
3653 3707
3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655 3709
3656 1 3710 1
3657} 3711}
3658 3712
3659our $uuid_lock; 3713our $uuid_lock;
… …
3671 or return; 3725 or return;
3672 3726
3673 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3674 3728
3675 unless ($value) { 3729 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3677 return; 3731 return;
3678 } 3732 }
3679 3733
3680 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3691 or return; 3745 or return;
3692 3746
3693 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3694 and return; 3748 and return;
3695 3749
3696 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3697 3751
3698 1 3752 1
3699 3753
3700} 3754}
3701 3755
… …
3707} 3761}
3708 3762
3709sub emergency_save() { 3763sub emergency_save() {
3710 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3711 3765
3712 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3713 3772
3714 cf::sync_job { 3773 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719 3775
3720 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3721 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3722 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3723 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3724 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3725 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3726 $pl->valid or next; 3782 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728 $pl->save; 3784 $pl->save;
3729 } 3785 }
3730 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3731 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3732 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3733 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3734 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3735 $map->valid or next; 3793 $map->valid or next;
3736 $map->save; 3794 $map->save;
3737 } 3795 }
3738 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3739 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3740 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3741 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3742 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3743 3803
3744 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1; 3805 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3747 }; 3826 };
3748 3827
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3754 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3755} 3829}
3756 3830
3757sub post_cleanup { 3831sub post_cleanup {
3758 my ($make_core) = @_; 3832 my ($make_core) = @_;
3759 3833
3834 IO::AIO::flush;
3835
3760 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3761 if $make_core; 3837 if $make_core;
3762 3838
3763 my $fh = pidfile; 3839 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3765} 3841}
… …
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 } 3865 }
3790 warn "cleared package $pkg\n";#d#
3791} 3866}
3792 3867
3793sub do_reload_perl() { 3868sub do_reload_perl() {
3794 # can/must only be called in main 3869 # can/must only be called in main
3795 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3796 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3797 return; 3872 return;
3798 } 3873 }
3799 3874
3800 return if $RELOAD++; 3875 return if $RELOAD++;
3801 3876
3802 my $t1 = AE::time; 3877 my $t1 = AE::time;
3803 3878
3804 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3805 warn "reloading..."; 3881 info "reloading...";
3806 3882
3807 warn "entering sync_job"; 3883 trace "entering sync_job";
3808 3884
3809 cf::sync_job { 3885 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811 cf::emergency_save; 3886 #cf::emergency_save;
3812 cf::write_runtime_sync; # external watchdog should not bark
3813 3887
3814 warn "syncing database to disk";
3815 BDB::db_env_txn_checkpoint $DB_ENV;
3816
3817 # if anything goes wrong in here, we should simply crash as we already saved
3818
3819 warn "flushing outstanding aio requests";
3820 while (IO::AIO::nreqs || BDB::nreqs) {
3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3822 }
3823
3824 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3825 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3826 %EXT_CORO = (); 3890 %EXT_CORO = ();
3827 3891
3828 warn "removing commands"; 3892 trace "removing commands";
3829 %COMMAND = (); 3893 %COMMAND = ();
3830 3894
3831 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3832 %EXTCMD = (); 3896 %EXTCMD = ();
3833 %EXTICMD = (); 3897 %EXTICMD = ();
3834 3898
3835 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3837 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3838 3902
3839 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3840 eval { 3904 eval {
3841 $cb->($pkg); 3905 $cb->($pkg);
3842 1 3906 1
3843 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3844 } 3908 }
3845 3909
3846 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3847 clear_package $pkg; 3911 clear_package $pkg;
3848 } 3912 }
3849 3913
3850 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853 3917
3854 warn "... unloading $k"; 3918 trace "... unloading $k";
3855 delete $INC{$k}; 3919 delete $INC{$k};
3856 3920
3857 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3859 3923
… …
3862 } 3926 }
3863 3927
3864 clear_package $k; 3928 clear_package $k;
3865 } 3929 }
3866 3930
3867 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3868 clear_package "safe::$_" 3932 clear_package "safe::$_"
3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3870 3934
3871 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3872 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3874 3938
3875 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3876 # and global variables created in xs 3940 # and global variables created in xs
3877 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3878 3942
3879 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3880 3944
3881 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3882 require cf; 3946 require cf;
3883 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3884 3948
3885 warn "loading config and database again"; 3949 trace "loading config and database again";
3886 cf::reload_config; 3950 cf::reload_config;
3887 3951
3888 warn "loading extensions"; 3952 trace "loading extensions";
3889 cf::load_extensions; 3953 cf::load_extensions;
3890 3954
3891 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3892 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3893 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3894 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3895 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3896 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3897 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3898 } 3962 }
3899 3963
3900 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3902 3966
3903 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3904 3968
3905 1 3969 1
3906 } or do { 3970 } or do {
3907 warn $@; 3971 error $@;
3908 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3909 }; 3973 };
3910 3974
3911 warn "reloaded"; 3975 info "reloaded";
3912 --$RELOAD; 3976 --$RELOAD;
3913 } 3977 }
3914 3978
3915 $t1 = AE::time - $t1; 3979 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3917}; 3981};
3918 3982
3919our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3920 3984
3921sub reload_perl() { 3985sub reload_perl() {
… …
3942 reload_perl; 4006 reload_perl;
3943 }; 4007 };
3944 } 4008 }
3945}; 4009};
3946 4010
3947unshift @INC, $LIBDIR; 4011#############################################################################
3948 4012
3949my $bug_warning = 0; 4013my $bug_warning = 0;
3950 4014
3951our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3952our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3953 4017
3954sub wait_for_tick { 4018sub wait_for_tick() {
3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3956 4020
3957 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3958 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3959 $signal->wait; 4023 $signal->wait;
3960} 4024}
3961 4025
3962sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3964 4028
3965 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3966 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3967 $signal->wait; 4031 $signal->wait;
… …
3981 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3983 Coro::async_pool { 4047 Coro::async_pool {
3984 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3985 write_runtime_sync 4049 write_runtime_sync
3986 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3987 }; 4051 };
3988 } 4052 }
3989 4053
3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3991 $sig->send; 4055 $sig->send;
… …
3999 4063
4000 if (0) { 4064 if (0) {
4001 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
4002 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
4005 } 4069 }
4006 } 4070 }
4007} 4071}
4008 4072
4009{ 4073{

Diff Legend

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