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.523 by root, Sat Apr 17 02:39:46 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;
… …
230from wherever your confdir points to. 233from wherever your confdir points to.
231 234
232=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
233 236
234These 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
235returns 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
236per 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();
237 245
238=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
239 247
240This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
241C<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
… …
249 257
250=back 258=back
251 259
252=cut 260=cut
253 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
254$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 269 my $msg = join "", @_;
256 270
257 $msg .= "\n" 271 $msg .= "\n"
258 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
259 273
260 $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;
261 275
262 LOG llevError, $msg; 276 LOG llevWarn, $msg;
263}; 277};
264 278
265$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
267 281
268 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
269 283
270 if (in_main) {#d# 284 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 286 return;#d#
273 }#d# 287 }#d#
274 288
275 # kill coroutine otherwise 289 # kill coroutine otherwise
276 Coro::terminate 290 Coro::terminate
… …
509=cut 523=cut
510 524
511sub sync_job(&) { 525sub sync_job(&) {
512 my ($job) = @_; 526 my ($job) = @_;
513 527
514 if ($Coro::current == $Coro::main) { 528 if (in_main) {
515 my $time = AE::time; 529 my $time = AE::time;
516 530
517 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
519 533
520 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
521 535
522 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
523 537
524 my $busy = 1; 538 my $busy = 1;
525 my @res; 539 my @res;
526 540
527 (async { 541 (async {
528 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 543 @res = eval { $job->() };
530 warn $@ if $@; 544 error $@ if $@;
531 undef $busy; 545 undef $busy;
532 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
533 547
534 while ($busy) { 548 while ($busy) {
535 if (Coro::nready) { 549 if (Coro::nready) {
… …
578Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 593never block itself or use any form of event handling.
580 594
581=cut 595=cut
582 596
597sub post_fork {
598 reset_signals;
599}
600
583sub fork_call(&@) { 601sub fork_call(&@) {
584 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
585 603
586 # 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,
587 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
589 607
590 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
591 reset_signals; 609 cf::post_fork;
592 &$cb 610 &$cb
593 }, @args; 611 }, @args;
594 612
595 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
596} 614}
… …
648within each server. 666within each server.
649 667
650=cut 668=cut
651 669
652sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
653 my ($name) = @_; 674 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
655 676
656 eval { 677 eval {
657 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
667} 688}
668 689
669our $DB; 690our $DB;
670 691
671sub db_init { 692sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
674 };
675} 694}
676 695
677sub db_get($$) { 696sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
679 698
680 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
681 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
682 703
683 $! ? () 704 $! ? ()
684 : $data 705 : $data
685 }
686} 706}
687 707
688sub db_put($$$) { 708sub db_put($$$) {
689 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 766
747 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 768 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
750 770
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 772
753 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
756 776
… …
766 786
767=cut 787=cut
768 788
769sub datalog($@) { 789sub datalog($@) {
770 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 792}
773 793
774=back 794=back
775 795
776=cut 796=cut
… …
971 991
972 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 994
975 } elsif (ref $type) { 995 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
977 997
978 } else { 998 } else {
979 shift @arg; 999 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
981 } 1001 }
982 } 1002 }
983} 1003}
984 1004
985sub _object_attach { 1005sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
996 } 1016 }
997 1017
998 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
999 } else { 1019 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1021 }
1002 1022
1003 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
1004} 1024}
1005 1025
… …
1064 1084
1065 for (@$callbacks) { 1085 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1067 1087
1068 if ($@) { 1088 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1090 override;
1072 } 1091 }
1073 1092
1074 return 1 if $override; 1093 return 1 if $override;
1075 } 1094 }
… …
1154 for (@$attach) { 1173 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1157 } 1176 }
1158 } else { 1177 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1179 }
1161 } 1180 }
1162} 1181}
1163 1182
1164cf::attachable->attach ( 1183cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1192 1211
1193 sync_job { 1212 sync_job {
1194 if (length $$rdata) { 1213 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1198 1218
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1225 1245
1226 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1248 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1230 } 1250 }
1231 } else { 1251 } else {
1232 aio_unlink $filename; 1252 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1234 } 1254 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1279 $av = $st->{objs};
1260 } 1280 }
1261 1281
1262 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1265 1286
1266 ($data, $av) 1287 ($data, $av)
1267} 1288}
1268 1289
1269=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1361 1382
1362 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1384 if $reply;
1364 1385
1365 } else { 1386 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1388 }
1368 1389
1369 cf::override; 1390 cf::override;
1370 }, 1391 },
1371); 1392);
… …
1382 1403
1383 $grp 1404 $grp
1384} 1405}
1385 1406
1386sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1387 cf::sync_job { 1410 cf::sync_job {
1388 my %todo; 1411 my %todo;
1389 1412
1390 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1414 next unless -r $path;
… …
1409 1432
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1435
1413 $ext{source} = 1436 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1416 . $source 1439 . $source
1417 . "\n};\n1"; 1440 . "\n};\n1";
1418 1441
1419 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1455 next ext
1433 unless exists $done{$_}; 1456 unless exists $done{$_};
1434 } 1457 }
1435 1458
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1460
1438 my $active = eval $v->{source}; 1461 my $active = eval $v->{source};
1439 1462
1440 if (length $@) { 1463 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1464 error "$v->{path}: $@\n";
1442 1465
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1467 if exists $v->{meta}{mandatory};
1445 1468
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1471 } else {
1449 $done{$k} = delete $todo{$k}; 1472 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1473 push @EXTS, $v->{pkg};
1451 $progress = 1; 1474 $progress = 1;
1452 1475
1453 warn "$v->{base}: extension inactive.\n" 1476 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1477 unless $active;
1455 } 1478 }
1456 } 1479 }
1457 1480
1458 unless ($progress) { 1481 unless ($progress) {
… …
1629 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1630 $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
1631 1654
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1656 $pl->deactivate;
1657
1634 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;
1635 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1638 1663
1639 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1835 1860
1836sub register { 1861sub register {
1837 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1863 my $pkg = caller;
1839 1864
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1866
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1868}
1845 1869
1846# also paths starting with '/' 1870# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1872
1849sub thawer_merge { 1873sub thawer_merge {
1850 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1851 1875
1852 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1857} 1881}
1858 1882
1859sub normalise { 1883sub normalise {
1860 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1861 1885
1862 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1863 1887
1864 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1865 1889
1866 # map plan: 1890 # map plan:
1867 # 1891 #
… …
1906 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1907 return $self; 1931 return $self;
1908 } 1932 }
1909 } 1933 }
1910 1934
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1936 ()
1913} 1937}
1914 1938
1915sub init { 1939sub init {
1916 my ($self) = @_; 1940 my ($self) = @_;
… …
2038} 2062}
2039 2063
2040sub find; 2064sub find;
2041sub find { 2065sub find {
2042 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
2043 2069
2044 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2045 2071
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2162 or next; 2188 or next;
2163 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2164 or next; 2190 or next;
2165 $neigh->load; 2191 $neigh->load;
2166 2192
2193 # now find the diagonal neighbours
2167 push @neigh, 2194 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2197 }
2171 2198
… …
2178} 2205}
2179 2206
2180sub find_sync { 2207sub find_sync {
2181 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2182 2209
2183 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
2184} 2214}
2185 2215
2186sub do_load_sync { 2216sub do_load_sync {
2187 my ($map) = @_; 2217 my ($map) = @_;
2188 2218
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2191 2221
2192 cf::sync_job { $map->load }; 2222 $map->load;
2193} 2223}
2194 2224
2195our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2197 2227
… …
2309 2339
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2341
2312 return if $self->players; 2342 return if $self->players;
2313 2343
2314 warn "resetting map ", $self->path, "\n"; 2344 cf::trace "resetting map ", $self->path, "\n";
2315 2345
2316 $self->in_memory (cf::MAP_SWAPPED); 2346 $self->in_memory (cf::MAP_SWAPPED);
2317 2347
2318 # need to save uniques path 2348 # need to save uniques path
2319 unless ($self->{deny_save}) { 2349 unless ($self->{deny_save}) {
… …
2343 2373
2344 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2345 2375
2346 $self->unlink_save; 2376 $self->unlink_save;
2347 2377
2348 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2383
… …
2583 2613
2584Freezes 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}>).
2585 2615
2586The 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.
2587for 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,
2588though, 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
2589map. 2619map.
2590 2620
2591Will never block. 2621Will never block.
2592 2622
2593=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2615 my ($self) = @_; 2645 my ($self) = @_;
2616 2646
2617 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2618 2648
2649 ++$self->{_link_recursion};
2650
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2652
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2623 2655
… …
2654 $map->load_neighbours; 2686 $map->load_neighbours;
2655 2687
2656 return unless $self->contr->active; 2688 return unless $self->contr->active;
2657 2689
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2660 2692 # entering was successful
2693 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2695 $self->activate_recursive;
2663} 2696 }
2664 2697
2698}
2699
2665=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)]])
2666 2701
2667Moves 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
2668her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2669that 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
2670the 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
… …
2677 2712
2678our $GOTOGEN; 2713our $GOTOGEN;
2679 2714
2680sub cf::object::player::goto { 2715sub cf::object::player::goto {
2681 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 }
2682 2723
2683 # 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
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2726
2686 $self->enter_link; 2727 $self->enter_link;
… …
2710 my $map = eval { 2751 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2712 2753
2713 if ($map) { 2754 if ($map) {
2714 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2757 } else {
2717 $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);
2718 } 2759 }
2719 2760
2720 $map 2761 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2731 } 2772 }
2732 2773
2733 $done->() if $done; 2774 $done->($self) if $done;
2734 })->prio (1); 2775 })->prio (1);
2735} 2776}
2736 2777
2737=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2738 2779
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "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. "
2833 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2876
2836 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2878 $self->leave_link;
2838 } 2879 }
2839 })->prio (1); 2880 })->prio (1);
2840} 2881}
2841 2882
… …
3154 3195
3155 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3197 if $reply;
3157 3198
3158 } else { 3199 } else {
3159 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";
3160 } 3201 }
3161 3202
3162 cf::override; 3203 cf::override;
3163 }, 3204 },
3164); 3205);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3249) { 3290) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3293 for @funs;
3254} 3294}
3255 3295
… …
3294 local @cf::_safe_eval_args = values %vars; 3334 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3335 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3336 }
3297 3337
3298 if ($@) { 3338 if ($@) {
3299 warn "$@"; 3339 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3302 } 3342 }
3303 3343
3304 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3305} 3345}
3306 3346
… …
3340 # for this (global event?) 3380 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3382
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3384
3345 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3346 3386
3347 my $facedata;
3348 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3349 or die "$path: $!"; 3388 or die "$path: $!";
3350 3389
3351 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3352 3391
3353 $facedata->{version} == 2 3392 $facedata->{version} == 2
… …
3384 3423
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3427 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3429 }
3391 3430
3392 cf::cede_to_tick; 3431 cf::cede_to_tick;
3393 } 3432 }
3394 } 3433 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3452
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3416 } else { 3455 } else {
3417 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3418 } 3457 }
3419 3458
3420 cf::cede_to_tick; 3459 cf::cede_to_tick;
3421 } 3460 }
3422 } 3461 }
3423 3462
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3464
3426 1 3465 1
3427} 3466}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3467
3449register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3451 3470
3452 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3510sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3494} 3513}
3495 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
3496sub reload_resources { 3538sub reload_resources {
3497 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3498 3540
3541 reload_exp_table;
3542 reload_materials;
3499 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3500 reload_archetypes; 3545 reload_archetypes;
3501 reload_regions; 3546 reload_regions;
3502 reload_treasures; 3547 reload_treasures;
3503 3548
3504 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3505} 3550}
3506 3551
3507sub reload_config { 3552sub reload_config {
3508 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3509 3554
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3511 or return; 3556 or die "$CONFDIR/config: $!";
3512 3557
3513 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3514 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3515 3562
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3564
3518 $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};
3519 $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};
3520 3567
3521 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3572 };
3526 warn $@ if $@; 3573 warn $@ if $@;
3527 } 3574 }
3528
3529 warn "finished reloading resource files\n";
3530} 3575}
3531 3576
3532sub pidfile() { 3577sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3548 print $fh $$; 3593 print $fh $$;
3549} 3594}
3550 3595
3551sub main_loop { 3596sub main_loop {
3552 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3553 if (1) { 3598 if (1) {
3554 EV::loop; 3599 EV::loop;
3555 } 3600 }
3556 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3558} 3603}
3559 3604
3560sub main { 3605sub main {
3561 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3562 3607
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 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.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3612
3568 $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
3569 3614
… …
3577 }; 3622 };
3578 3623
3579 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3580 3625
3581 cf::sync_job { 3626 cf::sync_job {
3582 cf::init_experience; 3627 cf::incloader::init ();
3628
3583 cf::init_anim; 3629 cf::init_anim;
3584 cf::init_attackmess; 3630 cf::init_attackmess;
3585 cf::init_dynamic; 3631 cf::init_dynamic;
3586 3632
3587 cf::load_settings; 3633 cf::load_settings;
3588 cf::load_materials;
3589 3634
3590 reload_resources; 3635 reload_resources;
3591 reload_config; 3636 reload_config;
3592 db_init; 3637 db_init;
3593 3638
… …
3609 3654
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3611 }; 3656 };
3612 3657
3613 cf::object::thawer::errors_are_fatal 0; 3658 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3659 info "parse errors in files are no longer fatal from this point on.\n";
3615 3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3616 main_loop; 3666 goto &main_loop;
3617} 3667}
3618 3668
3619############################################################################# 3669#############################################################################
3620# initialisation and cleanup 3670# initialisation and cleanup
3621 3671
… …
3660 or return; 3710 or return;
3661 3711
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3713 and return;
3664 3714
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3716
3667 1 3717 1
3668} 3718}
3669 3719
3670our $uuid_lock; 3720our $uuid_lock;
… …
3682 or return; 3732 or return;
3683 3733
3684 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3685 3735
3686 unless ($value) { 3736 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3738 return;
3689 } 3739 }
3690 3740
3691 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3742 $uuid_skip = 0;
… …
3702 or return; 3752 or return;
3703 3753
3704 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3705 and return; 3755 and return;
3706 3756
3707 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3708 3758
3709 1 3759 1
3710 3760
3711} 3761}
3712 3762
… …
3718} 3768}
3719 3769
3720sub emergency_save() { 3770sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3722 3772
3723 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;
3724 3779
3725 cf::sync_job { 3780 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3782
3731 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3789 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3791 $pl->save;
3740 } 3792 }
3741 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3742 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3743 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3800 $map->valid or next;
3747 $map->save; 3801 $map->save;
3748 } 3802 }
3749 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3750 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3754 3810
3755 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3812 write_uuid_sync 1;
3757 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
3758 }; 3833 };
3759 3834
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3766} 3836}
3767 3837
3768sub post_cleanup { 3838sub post_cleanup {
3769 my ($make_core) = @_; 3839 my ($make_core) = @_;
3770 3840
3841 IO::AIO::flush;
3842
3771 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3844 if $make_core;
3773 3845
3774 my $fh = pidfile; 3846 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3776} 3848}
… …
3800 } 3872 }
3801} 3873}
3802 3874
3803sub do_reload_perl() { 3875sub do_reload_perl() {
3804 # can/must only be called in main 3876 # can/must only be called in main
3805 if (in_main) { 3877 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3807 return; 3879 return;
3808 } 3880 }
3809 3881
3810 return if $RELOAD++; 3882 return if $RELOAD++;
3811 3883
3812 my $t1 = AE::time; 3884 my $t1 = AE::time;
3813 3885
3814 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3815 warn "reloading..."; 3888 info "reloading...";
3816 3889
3817 warn "entering sync_job"; 3890 trace "entering sync_job";
3818 3891
3819 cf::sync_job { 3892 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3893 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3894
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3897 %EXT_CORO = ();
3837 3898
3838 warn "removing commands"; 3899 trace "removing commands";
3839 %COMMAND = (); 3900 %COMMAND = ();
3840 3901
3841 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3842 %EXTCMD = (); 3903 %EXTCMD = ();
3843 %EXTICMD = (); 3904 %EXTICMD = ();
3844 3905
3845 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3848 3909
3849 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3911 eval {
3851 $cb->($pkg); 3912 $cb->($pkg);
3852 1 3913 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3854 } 3915 }
3855 3916
3856 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3857 clear_package $pkg; 3918 clear_package $pkg;
3858 } 3919 }
3859 3920
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3924
3864 warn "... unloading $k"; 3925 trace "... unloading $k";
3865 delete $INC{$k}; 3926 delete $INC{$k};
3866 3927
3867 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3869 3930
… …
3872 } 3933 }
3873 3934
3874 clear_package $k; 3935 clear_package $k;
3875 } 3936 }
3876 3937
3877 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3939 clear_package "safe::$_"
3879 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);
3880 3941
3881 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3945
3885 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3947 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3888 3949
3889 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3890 3951
3891 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3892 require cf; 3953 require cf;
3893 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3894 3955
3895 warn "loading config and database again"; 3956 trace "loading config and database again";
3896 cf::reload_config; 3957 cf::reload_config;
3897 3958
3898 warn "loading extensions"; 3959 trace "loading extensions";
3899 cf::load_extensions; 3960 cf::load_extensions;
3900 3961
3901 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3905 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3908 } 3969 }
3909 3970
3910 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3912 3973
3913 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3914 3975
3915 1 3976 1
3916 } or do { 3977 } or do {
3917 warn $@; 3978 error $@;
3918 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3919 }; 3980 };
3920 3981
3921 warn "reloaded"; 3982 info "reloaded";
3922 --$RELOAD; 3983 --$RELOAD;
3923 } 3984 }
3924 3985
3925 $t1 = AE::time - $t1; 3986 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3927}; 3988};
3928 3989
3929our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3930 3991
3931sub reload_perl() { 3992sub reload_perl() {
… …
3952 reload_perl; 4013 reload_perl;
3953 }; 4014 };
3954 } 4015 }
3955}; 4016};
3956 4017
3957unshift @INC, $LIBDIR; 4018#############################################################################
3958 4019
3959my $bug_warning = 0; 4020my $bug_warning = 0;
3960 4021
3961our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3963 4024
3964sub wait_for_tick { 4025sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3966 4027
3967 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait; 4030 $signal->wait;
3970} 4031}
3971 4032
3972sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3974 4035
3975 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4038 $signal->wait;
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $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.;
3993 Coro::async_pool { 4054 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4056 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3997 }; 4058 };
3998 } 4059 }
3999 4060
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4062 $sig->send;
… …
4009 4070
4010 if (0) { 4071 if (0) {
4011 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
4015 } 4076 }
4016 } 4077 }
4017} 4078}
4018 4079
4019{ 4080{

Diff Legend

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