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.516 by root, Thu Apr 15 06:05:52 2010 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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) {
… …
574Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 593never block itself or use any form of event handling.
576 594
577=cut 595=cut
578 596
597sub post_fork {
598 reset_signals;
599}
600
579sub fork_call(&@) { 601sub fork_call(&@) {
580 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
581 603
582 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
583 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
585 607
586 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
587 reset_signals; 609 cf::post_fork;
588 &$cb 610 &$cb
589 }, @args; 611 }, @args;
590 612
591 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
592} 614}
… …
644within each server. 666within each server.
645 667
646=cut 668=cut
647 669
648sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
649 my ($name) = @_; 674 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
651 676
652 eval { 677 eval {
653 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
663} 688}
664 689
665our $DB; 690our $DB;
666 691
667sub db_init { 692sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
670 };
671} 694}
672 695
673sub db_get($$) { 696sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
675 698
676 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
677 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
678 703
679 $! ? () 704 $! ? ()
680 : $data 705 : $data
681 }
682} 706}
683 707
684sub db_put($$$) { 708sub db_put($$$) {
685 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 766
743 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 768 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
746 770
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 772
749 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
752 776
… …
762 786
763=cut 787=cut
764 788
765sub datalog($@) { 789sub datalog($@) {
766 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 792}
769 793
770=back 794=back
771 795
772=cut 796=cut
… …
967 991
968 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 994
971 } elsif (ref $type) { 995 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
973 997
974 } else { 998 } else {
975 shift @arg; 999 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
977 } 1001 }
978 } 1002 }
979} 1003}
980 1004
981sub _object_attach { 1005sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
992 } 1016 }
993 1017
994 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
995 } else { 1019 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1021 }
998 1022
999 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
1000} 1024}
1001 1025
… …
1060 1084
1061 for (@$callbacks) { 1085 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1063 1087
1064 if ($@) { 1088 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1090 override;
1068 } 1091 }
1069 1092
1070 return 1 if $override; 1093 return 1 if $override;
1071 } 1094 }
… …
1150 for (@$attach) { 1173 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1153 } 1176 }
1154 } else { 1177 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1179 }
1157 } 1180 }
1158} 1181}
1159 1182
1160cf::attachable->attach ( 1183cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1188 1211
1189 sync_job { 1212 sync_job {
1190 if (length $$rdata) { 1213 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1194 1218
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1221 1245
1222 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1248 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1226 } 1250 }
1227 } else { 1251 } else {
1228 aio_unlink $filename; 1252 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1230 } 1254 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1279 $av = $st->{objs};
1256 } 1280 }
1257 1281
1258 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1261 1286
1262 ($data, $av) 1287 ($data, $av)
1263} 1288}
1264 1289
1265=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1357 1382
1358 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1384 if $reply;
1360 1385
1361 } else { 1386 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1388 }
1364 1389
1365 cf::override; 1390 cf::override;
1366 }, 1391 },
1367); 1392);
… …
1378 1403
1379 $grp 1404 $grp
1380} 1405}
1381 1406
1382sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1383 cf::sync_job { 1410 cf::sync_job {
1384 my %todo; 1411 my %todo;
1385 1412
1386 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1414 next unless -r $path;
… …
1405 1432
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1435
1409 $ext{source} = 1436 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1412 . $source 1439 . $source
1413 . "\n};\n1"; 1440 . "\n};\n1";
1414 1441
1415 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1455 next ext
1429 unless exists $done{$_}; 1456 unless exists $done{$_};
1430 } 1457 }
1431 1458
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1460
1434 my $active = eval $v->{source}; 1461 my $active = eval $v->{source};
1435 1462
1436 if (length $@) { 1463 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1464 error "$v->{path}: $@\n";
1438 1465
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1467 if exists $v->{meta}{mandatory};
1468
1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1441 } else { 1471 } else {
1442 $done{$k} = delete $todo{$k}; 1472 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1473 push @EXTS, $v->{pkg};
1444 $progress = 1; 1474 $progress = 1;
1445 1475
1446 warn "$v->{base}: extension inactive.\n" 1476 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1477 unless $active;
1448 } 1478 }
1449 } 1479 }
1450 1480
1451 unless ($progress) { 1481 unless ($progress) {
… …
1622 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1624 1654
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1626 $pl->deactivate; 1656 $pl->deactivate;
1657
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1630 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1631 1663
1632 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1688 \@logins 1720 \@logins
1689} 1721}
1690 1722
1691=item $player->maps 1723=item $player->maps
1692 1724
1725=item cf::player::maps $login
1726
1693Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1694player. May block. 1728player. May block.
1695 1729
1696=cut 1730=cut
1697 1731
… …
1758 1792
1759=cut 1793=cut
1760 1794
1761sub find_by_path($) { 1795sub find_by_path($) {
1762 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1763 1799
1764 my ($match, $specificity); 1800 my ($match, $specificity);
1765 1801
1766 for my $region (list) { 1802 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
… …
1824 1860
1825sub register { 1861sub register {
1826 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1863 my $pkg = caller;
1828 1864
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1866
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1868}
1834 1869
1835# also paths starting with '/' 1870# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1872
1838sub thawer_merge { 1873sub thawer_merge {
1839 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1840 1875
1841 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1846} 1881}
1847 1882
1848sub normalise { 1883sub normalise {
1849 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1850 1885
1851 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1852 1887
1853 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1854 1889
1855 # map plan: 1890 # map plan:
1856 # 1891 #
… …
1895 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1896 return $self; 1931 return $self;
1897 } 1932 }
1898 } 1933 }
1899 1934
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1936 ()
1902} 1937}
1903 1938
1904sub init { 1939sub init {
1905 my ($self) = @_; 1940 my ($self) = @_;
… …
2027} 2062}
2028 2063
2029sub find; 2064sub find;
2030sub find { 2065sub find {
2031 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
2032 2069
2033 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2034 2071
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2151 or next; 2188 or next;
2152 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2153 or next; 2190 or next;
2154 $neigh->load; 2191 $neigh->load;
2155 2192
2193 # now find the diagonal neighbours
2156 push @neigh, 2194 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2197 }
2160 2198
… …
2167} 2205}
2168 2206
2169sub find_sync { 2207sub find_sync {
2170 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2171 2209
2172 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2173} 2214}
2174 2215
2175sub do_load_sync { 2216sub do_load_sync {
2176 my ($map) = @_; 2217 my ($map) = @_;
2177 2218
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2180 2221
2181 cf::sync_job { $map->load }; 2222 $map->load;
2182} 2223}
2183 2224
2184our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2186 2227
… …
2212 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2213 2254
2214 () 2255 ()
2215} 2256}
2216 2257
2258# common code, used by both ->save and ->swapout
2217sub save { 2259sub _save {
2218 my ($self) = @_; 2260 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2261
2222 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2223 2263
2224 return unless $self->dirty; 2264 return unless $self->dirty;
2225 2265
… …
2245 } else { 2285 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2287 }
2248} 2288}
2249 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2250sub swap_out { 2298sub swap_out {
2251 my ($self) = @_; 2299 my ($self) = @_;
2252 2300
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2302
2258 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2260 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2261 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2263 2357
2264 $self->deactivate; 2358 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2360 $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 2361
2312 $self->unlink_save; 2362 $self->unlink_save;
2313 $self->destroy; 2363 $self->destroy;
2314} 2364}
2315 2365
… …
2323 2373
2324 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2325 2375
2326 $self->unlink_save; 2376 $self->unlink_save;
2327 2377
2328 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2383
… …
2563 2613
2564Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2565 2615
2566The player should be reasonably safe there for short amounts of time (e.g. 2616The 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, 2617for 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 2618though, as the player cannot control the character while it is on the link
2569map. 2619map.
2570 2620
2571Will never block. 2621Will never block.
2572 2622
2573=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2595 my ($self) = @_; 2645 my ($self) = @_;
2596 2646
2597 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2598 2648
2649 ++$self->{_link_recursion};
2650
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2652
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2603 2655
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2657}
2606 2658
2607sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2609 2661
… …
2634 $map->load_neighbours; 2686 $map->load_neighbours;
2635 2687
2636 return unless $self->contr->active; 2688 return unless $self->contr->active;
2637 2689
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2640 2692 # entering was successful
2693 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2695 $self->activate_recursive;
2643} 2696 }
2644 2697
2698}
2699
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2701
2647Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2704that 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 2705the new (success) or old (failed) map position. In either case, $done will
… …
2657 2712
2658our $GOTOGEN; 2713our $GOTOGEN;
2659 2714
2660sub cf::object::player::goto { 2715sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2662 2723
2663 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2726
2666 $self->enter_link; 2727 $self->enter_link;
… …
2690 my $map = eval { 2751 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2692 2753
2693 if ($map) { 2754 if ($map) {
2694 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2757 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2759 }
2699 2760
2700 $map 2761 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2711 } 2772 }
2712 2773
2713 $done->() if $done; 2774 $done->($self) if $done;
2714 })->prio (1); 2775 })->prio (1);
2715} 2776}
2716 2777
2717=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2718 2779
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2876
2816 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2878 $self->leave_link;
2818 } 2879 }
2819 })->prio (1); 2880 })->prio (1);
2820} 2881}
2821 2882
… …
3134 3195
3135 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3197 if $reply;
3137 3198
3138 } else { 3199 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3201 }
3141 3202
3142 cf::override; 3203 cf::override;
3143 }, 3204 },
3144); 3205);
… …
3225 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3229) { 3290) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3293 for @funs;
3234} 3294}
3235 3295
… …
3274 local @cf::_safe_eval_args = values %vars; 3334 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3335 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3336 }
3277 3337
3278 if ($@) { 3338 if ($@) {
3279 warn "$@"; 3339 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3282 } 3342 }
3283 3343
3284 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3285} 3345}
3286 3346
… …
3320 # for this (global event?) 3380 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3382
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3384
3325 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3326 3386
3327 my $facedata;
3328 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3329 or die "$path: $!"; 3388 or die "$path: $!";
3330 3389
3331 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3332 3391
3333 $facedata->{version} == 2 3392 $facedata->{version} == 2
… …
3364 3423
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3427 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3429 }
3371 3430
3372 cf::cede_to_tick; 3431 cf::cede_to_tick;
3373 } 3432 }
3374 } 3433 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3452
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3396 } else { 3455 } else {
3397 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3398 } 3457 }
3399 3458
3400 cf::cede_to_tick; 3459 cf::cede_to_tick;
3401 } 3460 }
3402 } 3461 }
3403 3462
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3464
3406 1 3465 1
3407} 3466}
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 3467
3429register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3431 3470
3432 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3510sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3474} 3513}
3475 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3476sub reload_resources { 3538sub reload_resources {
3477 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3478 3540
3541 reload_exp_table;
3542 reload_materials;
3479 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3480 reload_archetypes; 3545 reload_archetypes;
3481 reload_regions; 3546 reload_regions;
3482 reload_treasures; 3547 reload_treasures;
3483 3548
3484 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3485} 3550}
3486 3551
3487sub reload_config { 3552sub reload_config {
3488 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3489 3554
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3491 or return; 3556 or die "$CONFDIR/config: $!";
3492 3557
3493 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3494 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3495 3562
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3564
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $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}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3567
3501 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3572 };
3506 warn $@ if $@; 3573 warn $@ if $@;
3507 } 3574 }
3508
3509 warn "finished reloading resource files\n";
3510} 3575}
3511 3576
3512sub pidfile() { 3577sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3528 print $fh $$; 3593 print $fh $$;
3529} 3594}
3530 3595
3531sub main_loop { 3596sub main_loop {
3532 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3533 if (1) { 3598 if (1) {
3534 EV::loop; 3599 EV::loop;
3535 } 3600 }
3536 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3538} 3603}
3539 3604
3540sub main { 3605sub main {
3541 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3542 3607
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547 3612
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549 3614
… …
3557 }; 3622 };
3558 3623
3559 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3560 3625
3561 cf::sync_job { 3626 cf::sync_job {
3562 cf::init_experience; 3627 cf::incloader::init ();
3628
3563 cf::init_anim; 3629 cf::init_anim;
3564 cf::init_attackmess; 3630 cf::init_attackmess;
3565 cf::init_dynamic; 3631 cf::init_dynamic;
3566 3632
3567 cf::load_settings; 3633 cf::load_settings;
3568 cf::load_materials;
3569 3634
3570 reload_resources; 3635 reload_resources;
3571 reload_config; 3636 reload_config;
3572 db_init; 3637 db_init;
3573 3638
… …
3589 3654
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3591 }; 3656 };
3592 3657
3593 cf::object::thawer::errors_are_fatal 0; 3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3594 3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3595 main_loop; 3666 goto &main_loop;
3596} 3667}
3597 3668
3598############################################################################# 3669#############################################################################
3599# initialisation and cleanup 3670# initialisation and cleanup
3600 3671
… …
3639 or return; 3710 or return;
3640 3711
3641 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3642 and return; 3713 and return;
3643 3714
3644 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3645 3716
3646 1 3717 1
3647} 3718}
3648 3719
3649our $uuid_lock; 3720our $uuid_lock;
… …
3661 or return; 3732 or return;
3662 3733
3663 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3664 3735
3665 unless ($value) { 3736 unless ($value) {
3666 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3667 return; 3738 return;
3668 } 3739 }
3669 3740
3670 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3671 $uuid_skip = 0; 3742 $uuid_skip = 0;
… …
3681 or return; 3752 or return;
3682 3753
3683 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3684 and return; 3755 and return;
3685 3756
3686 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3687 3758
3688 1 3759 1
3689 3760
3690} 3761}
3691 3762
… …
3697} 3768}
3698 3769
3699sub emergency_save() { 3770sub emergency_save() {
3700 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3701 3772
3702 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3703 3779
3704 cf::sync_job { 3780 cf::sync_job {
3705 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3706 # save all maps without fsync, and later call a global sync
3707 # (which in turn might be very very slow)
3708 local $USE_FSYNC = 0;
3709 3782
3710 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3711 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3712 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3713 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3714 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3715 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3716 $pl->valid or next; 3789 $pl->valid or next;
3717 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3718 $pl->save; 3791 $pl->save;
3719 } 3792 }
3720 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3721 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3722 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3723 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3724 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3725 $map->valid or next; 3800 $map->valid or next;
3726 $map->save; 3801 $map->save;
3727 } 3802 }
3728 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3729 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3730 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3731 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3732 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3733 3810
3734 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3735 write_uuid_sync 1; 3812 write_uuid_sync 1;
3736 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3737 }; 3833 };
3738 3834
3739 warn "emergency_perl_save: starting sync()\n";
3740 IO::AIO::aio_sync sub {
3741 warn "emergency_perl_save: finished sync()\n";
3742 };
3743
3744 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3745} 3836}
3746 3837
3747sub post_cleanup { 3838sub post_cleanup {
3748 my ($make_core) = @_; 3839 my ($make_core) = @_;
3749 3840
3841 IO::AIO::flush;
3842
3750 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3751 if $make_core; 3844 if $make_core;
3752 3845
3753 my $fh = pidfile; 3846 my $fh = pidfile;
3754 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3755} 3848}
… …
3775 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3776 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3777 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3778# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3779 } 3872 }
3780 warn "cleared package $pkg\n";#d#
3781} 3873}
3782 3874
3783sub do_reload_perl() { 3875sub do_reload_perl() {
3784 # can/must only be called in main 3876 # can/must only be called in main
3785 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3786 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3787 return; 3879 return;
3788 } 3880 }
3789 3881
3790 return if $RELOAD++; 3882 return if $RELOAD++;
3791 3883
3792 my $t1 = AE::time; 3884 my $t1 = AE::time;
3793 3885
3794 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3795 warn "reloading..."; 3888 info "reloading...";
3796 3889
3797 warn "entering sync_job"; 3890 trace "entering sync_job";
3798 3891
3799 cf::sync_job { 3892 cf::sync_job {
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 cf::emergency_save; 3893 #cf::emergency_save;
3802 cf::write_runtime_sync; # external watchdog should not bark
3803 3894
3804 warn "syncing database to disk";
3805 BDB::db_env_txn_checkpoint $DB_ENV;
3806
3807 # if anything goes wrong in here, we should simply crash as we already saved
3808
3809 warn "flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812 }
3813
3814 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3815 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3816 %EXT_CORO = (); 3897 %EXT_CORO = ();
3817 3898
3818 warn "removing commands"; 3899 trace "removing commands";
3819 %COMMAND = (); 3900 %COMMAND = ();
3820 3901
3821 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3822 %EXTCMD = (); 3903 %EXTCMD = ();
3823 %EXTICMD = (); 3904 %EXTICMD = ();
3824 3905
3825 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3826 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3827 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3828 3909
3829 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3830 eval { 3911 eval {
3831 $cb->($pkg); 3912 $cb->($pkg);
3832 1 3913 1
3833 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3834 } 3915 }
3835 3916
3836 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3837 clear_package $pkg; 3918 clear_package $pkg;
3838 } 3919 }
3839 3920
3840 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3841 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3842 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3843 3924
3844 warn "... unloading $k"; 3925 trace "... unloading $k";
3845 delete $INC{$k}; 3926 delete $INC{$k};
3846 3927
3847 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3848 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3849 3930
… …
3852 } 3933 }
3853 3934
3854 clear_package $k; 3935 clear_package $k;
3855 } 3936 }
3856 3937
3857 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3858 clear_package "safe::$_" 3939 clear_package "safe::$_"
3859 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3860 3941
3861 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3862 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3863 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3864 3945
3865 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3866 # and global variables created in xs 3947 # and global variables created in xs
3867 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3868 3949
3869 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3870 3951
3871 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3872 require cf; 3953 require cf;
3873 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3874 3955
3875 warn "loading config and database again"; 3956 trace "loading config and database again";
3876 cf::reload_config; 3957 cf::reload_config;
3877 3958
3878 warn "loading extensions"; 3959 trace "loading extensions";
3879 cf::load_extensions; 3960 cf::load_extensions;
3880 3961
3881 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3882 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3883 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3884 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3885 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3886 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3887 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3888 } 3969 }
3889 3970
3890 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3891 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3892 3973
3893 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3894 3975
3895 1 3976 1
3896 } or do { 3977 } or do {
3897 warn $@; 3978 error $@;
3898 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3899 }; 3980 };
3900 3981
3901 warn "reloaded"; 3982 info "reloaded";
3902 --$RELOAD; 3983 --$RELOAD;
3903 } 3984 }
3904 3985
3905 $t1 = AE::time - $t1; 3986 $t1 = AE::time - $t1;
3906 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3907}; 3988};
3908 3989
3909our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3910 3991
3911sub reload_perl() { 3992sub reload_perl() {
… …
3932 reload_perl; 4013 reload_perl;
3933 }; 4014 };
3934 } 4015 }
3935}; 4016};
3936 4017
3937unshift @INC, $LIBDIR; 4018#############################################################################
3938 4019
3939my $bug_warning = 0; 4020my $bug_warning = 0;
3940 4021
3941our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3942our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3943 4024
3944sub wait_for_tick { 4025sub wait_for_tick() {
3945 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3946 4027
3947 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3948 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3949 $signal->wait; 4030 $signal->wait;
3950} 4031}
3951 4032
3952sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3953 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3954 4035
3955 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3956 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3957 $signal->wait; 4038 $signal->wait;
… …
3971 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3972 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3973 Coro::async_pool { 4054 Coro::async_pool {
3974 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3975 write_runtime_sync 4056 write_runtime_sync
3976 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3977 }; 4058 };
3978 } 4059 }
3979 4060
3980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3981 $sig->send; 4062 $sig->send;
… …
3989 4070
3990 if (0) { 4071 if (0) {
3991 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3992 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3993 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3994 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3995 } 4076 }
3996 } 4077 }
3997} 4078}
3998 4079
3999{ 4080{

Diff Legend

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