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.530 by root, Wed Apr 28 21:05:33 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 = ();
… …
124our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 127our $DB_ENV;
128 128
129our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 130
131our %CFG; 131our %CFG;
132 132
133our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 134our $RUNTIME;
… …
233from wherever your confdir points to. 233from wherever your confdir points to.
234 234
235=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
236 236
237These 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
238returns 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
239per 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();
240 245
241=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
242 247
243This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
244C<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
… …
252 257
253=back 258=back
254 259
255=cut 260=cut
256 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
257$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 269 my $msg = join "", @_;
259 270
260 $msg .= "\n" 271 $msg .= "\n"
261 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
262 273
263 $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;
264 275
265 LOG llevError, $msg; 276 LOG llevWarn, $msg;
266}; 277};
267 278
268$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
270 281
271 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
272 283
273 if (in_main) {#d# 284 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 286 return;#d#
276 }#d# 287 }#d#
277 288
278 # kill coroutine otherwise 289 # kill coroutine otherwise
279 Coro::terminate 290 Coro::terminate
… …
512=cut 523=cut
513 524
514sub sync_job(&) { 525sub sync_job(&) {
515 my ($job) = @_; 526 my ($job) = @_;
516 527
517 if ($Coro::current == $Coro::main) { 528 if (in_main) {
518 my $time = AE::time; 529 my $time = AE::time;
519 530
520 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
522 533
523 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
524 535
525 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
526 537
527 my $busy = 1; 538 my $busy = 1;
528 my @res; 539 my @res;
529 540
530 (async { 541 (async {
531 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 543 @res = eval { $job->() };
533 warn $@ if $@; 544 error $@ if $@;
534 undef $busy; 545 undef $busy;
535 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
536 547
537 while ($busy) { 548 while ($busy) {
538 if (Coro::nready) { 549 if (Coro::nready) {
… …
581Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 593never block itself or use any form of event handling.
583 594
584=cut 595=cut
585 596
597sub post_fork {
598 reset_signals;
599}
600
586sub fork_call(&@) { 601sub fork_call(&@) {
587 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
588 603
589 # 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,
590 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
592 607
593 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
594 reset_signals; 609 cf::post_fork;
595 &$cb 610 &$cb
596 }, @args; 611 }, @args;
597 612
598 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
599} 614}
… …
651within each server. 666within each server.
652 667
653=cut 668=cut
654 669
655sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
656 my ($name) = @_; 674 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
658 676
659 eval { 677 eval {
660 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
670} 688}
671 689
672our $DB; 690our $DB;
673 691
674sub db_init { 692sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
677 };
678} 694}
679 695
680sub db_get($$) { 696sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
682 698
683 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
684 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
685 703
686 $! ? () 704 $! ? ()
687 : $data 705 : $data
688 }
689} 706}
690 707
691sub db_put($$$) { 708sub db_put($$$) {
692 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
749 766
750 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 768 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
753 770
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 772
756 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
759 776
… …
769 786
770=cut 787=cut
771 788
772sub datalog($@) { 789sub datalog($@) {
773 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 792}
776 793
777=back 794=back
778 795
779=cut 796=cut
… …
974 991
975 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 994
978 } elsif (ref $type) { 995 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
980 997
981 } else { 998 } else {
982 shift @arg; 999 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
984 } 1001 }
985 } 1002 }
986} 1003}
987 1004
988sub _object_attach { 1005sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
999 } 1016 }
1000 1017
1001 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
1002 } else { 1019 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1021 }
1005 1022
1006 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
1007} 1024}
1008 1025
… …
1067 1084
1068 for (@$callbacks) { 1085 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1070 1087
1071 if ($@) { 1088 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1090 override;
1075 } 1091 }
1076 1092
1077 return 1 if $override; 1093 return 1 if $override;
1078 } 1094 }
… …
1157 for (@$attach) { 1173 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1160 } 1176 }
1161 } else { 1177 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1179 }
1164 } 1180 }
1165} 1181}
1166 1182
1167cf::attachable->attach ( 1183cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1195 1211
1196 sync_job { 1212 sync_job {
1197 if (length $$rdata) { 1213 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1216 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1217 if $VERBOSE_IO;
1202 1218
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1229 1245
1230 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1248 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1234 } 1250 }
1235 } else { 1251 } else {
1236 aio_unlink $filename; 1252 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1238 } 1254 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1279 $av = $st->{objs};
1264 } 1280 }
1265 1281
1266 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1284 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1285 if $VERBOSE_IO;
1270 1286
1271 ($data, $av) 1287 ($data, $av)
1272} 1288}
1273 1289
… …
1366 1382
1367 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1384 if $reply;
1369 1385
1370 } else { 1386 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1388 }
1373 1389
1374 cf::override; 1390 cf::override;
1375 }, 1391 },
1376); 1392);
… …
1387 1403
1388 $grp 1404 $grp
1389} 1405}
1390 1406
1391sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1392 cf::sync_job { 1410 cf::sync_job {
1393 my %todo; 1411 my %todo;
1394 1412
1395 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1414 next unless -r $path;
… …
1414 1432
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1435
1418 $ext{source} = 1436 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1421 . $source 1439 . $source
1422 . "\n};\n1"; 1440 . "\n};\n1";
1423 1441
1424 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1455 next ext
1438 unless exists $done{$_}; 1456 unless exists $done{$_};
1439 } 1457 }
1440 1458
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1460
1443 my $active = eval $v->{source}; 1461 my $active = eval $v->{source};
1444 1462
1445 if (length $@) { 1463 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1464 error "$v->{path}: $@\n";
1447 1465
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1467 if exists $v->{meta}{mandatory};
1450 1468
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1471 } else {
1454 $done{$k} = delete $todo{$k}; 1472 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1473 push @EXTS, $v->{pkg};
1456 $progress = 1; 1474 $progress = 1;
1457 1475
1458 warn "$v->{base}: extension inactive.\n" 1476 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1477 unless $active;
1460 } 1478 }
1461 } 1479 }
1462 1480
1463 unless ($progress) { 1481 unless ($progress) {
… …
1634 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1635 $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
1636 1654
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1638 $pl->deactivate; 1656 $pl->deactivate;
1657
1639 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;
1659 ext::highscore::check ($pl->ob);
1660
1640 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1641 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1642 1663
1643 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1644 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1839 1860
1840sub register { 1861sub register {
1841 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1863 my $pkg = caller;
1843 1864
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1866
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1868}
1849 1869
… …
1861} 1881}
1862 1882
1863sub normalise { 1883sub normalise {
1864 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1865 1885
1866 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1867 1887
1868 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1869 1889
1870 # map plan: 1890 # map plan:
1871 # 1891 #
… …
1910 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1911 return $self; 1931 return $self;
1912 } 1932 }
1913 } 1933 }
1914 1934
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 1936 ()
1917} 1937}
1918 1938
1919sub init { 1939sub init {
1920 my ($self) = @_; 1940 my ($self) = @_;
… …
2042} 2062}
2043 2063
2044sub find; 2064sub find;
2045sub find { 2065sub find {
2046 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
2047 2069
2048 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2049 2071
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2183} 2205}
2184 2206
2185sub find_sync { 2207sub find_sync {
2186 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2187 2209
2188 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
2189} 2214}
2190 2215
2191sub do_load_sync { 2216sub do_load_sync {
2192 my ($map) = @_; 2217 my ($map) = @_;
2193 2218
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2196 2221
2197 cf::sync_job { $map->load }; 2222 $map->load;
2198} 2223}
2199 2224
2200our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2202 2227
… …
2314 2339
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2341
2317 return if $self->players; 2342 return if $self->players;
2318 2343
2319 warn "resetting map ", $self->path, "\n"; 2344 cf::trace "resetting map ", $self->path, "\n";
2320 2345
2321 $self->in_memory (cf::MAP_SWAPPED); 2346 $self->in_memory (cf::MAP_SWAPPED);
2322 2347
2323 # need to save uniques path 2348 # need to save uniques path
2324 unless ($self->{deny_save}) { 2349 unless ($self->{deny_save}) {
… …
2689 2714
2690sub cf::object::player::goto { 2715sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2717
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2722 }
2698 2723
2699 # 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
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "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. "
2849 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2876
2852 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2878 $self->leave_link;
2854 } 2879 }
2855 })->prio (1); 2880 })->prio (1);
2856} 2881}
2857 2882
… …
3170 3195
3171 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3197 if $reply;
3173 3198
3174 } else { 3199 } else {
3175 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";
3176 } 3201 }
3177 3202
3178 cf::override; 3203 cf::override;
3179 }, 3204 },
3180); 3205);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3265) { 3290) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3293 for @funs;
3270} 3294}
3271 3295
… …
3310 local @cf::_safe_eval_args = values %vars; 3334 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3335 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3336 }
3313 3337
3314 if ($@) { 3338 if ($@) {
3315 warn "$@"; 3339 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3318 } 3342 }
3319 3343
3320 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3321} 3345}
3322 3346
… …
3356 # for this (global event?) 3380 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3382
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3384
3361 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3362 3386
3363 my $facedata;
3364 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3365 or die "$path: $!"; 3388 or die "$path: $!";
3366 3389
3367 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3368 3391
3369 $facedata->{version} == 2 3392 $facedata->{version} == 2
… …
3400 3423
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3427 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3429 }
3407 3430
3408 cf::cede_to_tick; 3431 cf::cede_to_tick;
3409 } 3432 }
3410 } 3433 }
… …
3488 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3490} 3513}
3491 3514
3492sub reload_sound { 3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data 3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3494 or die "$DATADIR/sound $!"; 3519 or die "$DATADIR/sound $!";
3495 3520
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3497 3522
… …
3509 cf::sound::set $k => $face; 3534 cf::sound::set $k => $face;
3510 } 3535 }
3511} 3536}
3512 3537
3513sub reload_resources { 3538sub reload_resources {
3514 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3515 3540
3541 reload_exp_table;
3542 reload_materials;
3516 reload_facedata; 3543 reload_facedata;
3517 reload_sound; 3544 reload_sound;
3518 reload_archetypes; 3545 reload_archetypes;
3519 reload_regions; 3546 reload_regions;
3520 reload_treasures; 3547 reload_treasures;
3521 3548
3522 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3523} 3550}
3524 3551
3525sub reload_config { 3552sub reload_config {
3526 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3527 3554
3528 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3529 or return; 3556 or die "$CONFDIR/config: $!";
3530 3557
3531 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3532 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3533 3562
3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3535 3564
3536 $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};
3537 $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};
… …
3541 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3542 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3543 }; 3572 };
3544 warn $@ if $@; 3573 warn $@ if $@;
3545 } 3574 }
3546
3547 warn "finished reloading resource files\n";
3548} 3575}
3549 3576
3550sub pidfile() { 3577sub pidfile() {
3551 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3552 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
… …
3565 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3566 print $fh $$; 3593 print $fh $$;
3567} 3594}
3568 3595
3569sub main_loop { 3596sub main_loop {
3570 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3571 if (1) { 3598 if (1) {
3572 EV::loop; 3599 EV::loop;
3573 } 3600 }
3574 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3575 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3576} 3603}
3577 3604
3578sub main { 3605sub main {
3579 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3580 3607
3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3582 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.";
3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3585 3612
3586 $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
3587 3614
… …
3595 }; 3622 };
3596 3623
3597 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3598 3625
3599 cf::sync_job { 3626 cf::sync_job {
3600 cf::init_experience; 3627 cf::incloader::init ();
3628
3601 cf::init_anim; 3629 cf::init_anim;
3602 cf::init_attackmess; 3630 cf::init_attackmess;
3603 cf::init_dynamic; 3631 cf::init_dynamic;
3604 3632
3605 cf::load_settings; 3633 cf::load_settings;
3606 cf::load_materials;
3607 3634
3608 reload_resources; 3635 reload_resources;
3609 reload_config; 3636 reload_config;
3610 db_init; 3637 db_init;
3611 3638
… …
3627 3654
3628 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3629 }; 3656 };
3630 3657
3631 cf::object::thawer::errors_are_fatal 0; 3658 cf::object::thawer::errors_are_fatal 0;
3632 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";
3633 3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3634 main_loop; 3666 goto &main_loop;
3635} 3667}
3636 3668
3637############################################################################# 3669#############################################################################
3638# initialisation and cleanup 3670# initialisation and cleanup
3639 3671
… …
3678 or return; 3710 or return;
3679 3711
3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3681 and return; 3713 and return;
3682 3714
3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3684 3716
3685 1 3717 1
3686} 3718}
3687 3719
3688our $uuid_lock; 3720our $uuid_lock;
… …
3700 or return; 3732 or return;
3701 3733
3702 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3703 3735
3704 unless ($value) { 3736 unless ($value) {
3705 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3706 return; 3738 return;
3707 } 3739 }
3708 3740
3709 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3710 $uuid_skip = 0; 3742 $uuid_skip = 0;
… …
3720 or return; 3752 or return;
3721 3753
3722 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3723 and return; 3755 and return;
3724 3756
3725 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3726 3758
3727 1 3759 1
3728 3760
3729} 3761}
3730 3762
… …
3736} 3768}
3737 3769
3738sub emergency_save() { 3770sub emergency_save() {
3739 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3740 3772
3741 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;
3742 3779
3743 cf::sync_job { 3780 cf::sync_job {
3744 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3745 # save all maps without fsync, and later call a global sync
3746 # (which in turn might be very very slow)
3747 local $USE_FSYNC = 0;
3748 3782
3749 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3750 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3751 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3752 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3753 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3754 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3755 $pl->valid or next; 3789 $pl->valid or next;
3756 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3757 $pl->save; 3791 $pl->save;
3758 } 3792 }
3759 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3760 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3761 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3762 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3763 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3764 $map->valid or next; 3800 $map->valid or next;
3765 $map->save; 3801 $map->save;
3766 } 3802 }
3767 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3768 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3769 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3770 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3771 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3772 3810
3773 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3774 write_uuid_sync 1; 3812 write_uuid_sync 1;
3775 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
3776 }; 3833 };
3777 3834
3778 warn "emergency_perl_save: starting sync()\n";
3779 IO::AIO::aio_sync sub {
3780 warn "emergency_perl_save: finished sync()\n";
3781 };
3782
3783 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3784} 3836}
3785 3837
3786sub post_cleanup { 3838sub post_cleanup {
3787 my ($make_core) = @_; 3839 my ($make_core) = @_;
3788 3840
3841 IO::AIO::flush;
3842
3789 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3790 if $make_core; 3844 if $make_core;
3791 3845
3792 my $fh = pidfile; 3846 my $fh = pidfile;
3793 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3794} 3848}
… …
3818 } 3872 }
3819} 3873}
3820 3874
3821sub do_reload_perl() { 3875sub do_reload_perl() {
3822 # can/must only be called in main 3876 # can/must only be called in main
3823 if (in_main) { 3877 unless (in_main) {
3824 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3825 return; 3879 return;
3826 } 3880 }
3827 3881
3828 return if $RELOAD++; 3882 return if $RELOAD++;
3829 3883
3830 my $t1 = AE::time; 3884 my $t1 = AE::time;
3831 3885
3832 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3833 warn "reloading..."; 3888 info "reloading...";
3834 3889
3835 warn "entering sync_job"; 3890 trace "entering sync_job";
3836 3891
3837 cf::sync_job { 3892 cf::sync_job {
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 cf::emergency_save; 3893 #cf::emergency_save;
3840 cf::write_runtime_sync; # external watchdog should not bark
3841 3894
3842 warn "syncing database to disk";
3843 BDB::db_env_txn_checkpoint $DB_ENV;
3844
3845 # if anything goes wrong in here, we should simply crash as we already saved
3846
3847 warn "flushing outstanding aio requests";
3848 while (IO::AIO::nreqs || BDB::nreqs) {
3849 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3850 }
3851
3852 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3853 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3854 %EXT_CORO = (); 3897 %EXT_CORO = ();
3855 3898
3856 warn "removing commands"; 3899 trace "removing commands";
3857 %COMMAND = (); 3900 %COMMAND = ();
3858 3901
3859 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3860 %EXTCMD = (); 3903 %EXTCMD = ();
3861 %EXTICMD = (); 3904 %EXTICMD = ();
3862 3905
3863 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3864 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3865 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3866 3909
3867 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3868 eval { 3911 eval {
3869 $cb->($pkg); 3912 $cb->($pkg);
3870 1 3913 1
3871 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3872 } 3915 }
3873 3916
3874 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3875 clear_package $pkg; 3918 clear_package $pkg;
3876 } 3919 }
3877 3920
3878 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3879 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3880 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3881 3924
3882 warn "... unloading $k"; 3925 trace "... unloading $k";
3883 delete $INC{$k}; 3926 delete $INC{$k};
3884 3927
3885 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3886 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3887 3930
… …
3890 } 3933 }
3891 3934
3892 clear_package $k; 3935 clear_package $k;
3893 } 3936 }
3894 3937
3895 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3896 clear_package "safe::$_" 3939 clear_package "safe::$_"
3897 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);
3898 3941
3899 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3900 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3901 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3902 3945
3903 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3904 # and global variables created in xs 3947 # and global variables created in xs
3905 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3906 3949
3907 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3908 3951
3909 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3910 require cf; 3953 require cf;
3911 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3912 3955
3913 warn "loading config and database again"; 3956 trace "loading config and database again";
3914 cf::reload_config; 3957 cf::reload_config;
3915 3958
3916 warn "loading extensions"; 3959 trace "loading extensions";
3917 cf::load_extensions; 3960 cf::load_extensions;
3918 3961
3919 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3920 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3921 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3922 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3923 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3924 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3925 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3926 } 3969 }
3927 3970
3928 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3929 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3930 3973
3931 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3932 3975
3933 1 3976 1
3934 } or do { 3977 } or do {
3935 warn $@; 3978 error $@;
3936 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3937 }; 3980 };
3938 3981
3939 warn "reloaded"; 3982 info "reloaded";
3940 --$RELOAD; 3983 --$RELOAD;
3941 } 3984 }
3942 3985
3943 $t1 = AE::time - $t1; 3986 $t1 = AE::time - $t1;
3944 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3945}; 3988};
3946 3989
3947our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3948 3991
3949sub reload_perl() { 3992sub reload_perl() {
… …
3970 reload_perl; 4013 reload_perl;
3971 }; 4014 };
3972 } 4015 }
3973}; 4016};
3974 4017
3975unshift @INC, $LIBDIR; 4018#############################################################################
3976 4019
3977my $bug_warning = 0; 4020my $bug_warning = 0;
3978 4021
3979our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3980our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3981 4024
3982sub wait_for_tick { 4025sub wait_for_tick() {
3983 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3984 4027
3985 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3986 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3987 $signal->wait; 4030 $signal->wait;
3988} 4031}
3989 4032
3990sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3991 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3992 4035
3993 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3994 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3995 $signal->wait; 4038 $signal->wait;
… …
4009 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4010 $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.;
4011 Coro::async_pool { 4054 Coro::async_pool {
4012 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
4013 write_runtime_sync 4056 write_runtime_sync
4014 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
4015 }; 4058 };
4016 } 4059 }
4017 4060
4018 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4019 $sig->send; 4062 $sig->send;
… …
4027 4070
4028 if (0) { 4071 if (0) {
4029 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
4030 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
4031 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4032 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
4033 } 4076 }
4034 } 4077 }
4035} 4078}
4036 4079
4037{ 4080{

Diff Legend

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