… | |
… | |
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 | |
23 | package cf; |
23 | package cf; |
24 | |
24 | |
25 | use 5.10.0; |
25 | use common::sense; |
26 | use utf8; |
|
|
27 | use strict qw(vars subs); |
|
|
28 | |
26 | |
29 | use Symbol; |
27 | use Symbol; |
30 | use List::Util; |
28 | use List::Util; |
31 | use Socket; |
29 | use Socket; |
32 | use EV; |
30 | use 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 | |
81 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
79 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
82 | |
80 | |
|
|
81 | our @ORIG_INC; |
|
|
82 | |
83 | our %COMMAND = (); |
83 | our %COMMAND = (); |
84 | our %COMMAND_TIME = (); |
84 | our %COMMAND_TIME = (); |
85 | |
85 | |
86 | our @EXTS = (); # list of extension package names |
86 | our @EXTS = (); # list of extension package names |
87 | our %EXTCMD = (); |
87 | our %EXTCMD = (); |
… | |
… | |
252 | |
252 | |
253 | =back |
253 | =back |
254 | |
254 | |
255 | =cut |
255 | =cut |
256 | |
256 | |
|
|
257 | sub error(@) { LOG llevError, join "", @_ } |
|
|
258 | sub warn (@) { LOG llevWarn , join "", @_ } |
|
|
259 | sub info (@) { LOG llevInfo , join "", @_ } |
|
|
260 | sub debug(@) { LOG llevDebug, join "", @_ } |
|
|
261 | sub trace(@) { LOG llevTrace, join "", @_ } |
|
|
262 | |
257 | $Coro::State::WARNHOOK = sub { |
263 | $Coro::State::WARNHOOK = sub { |
258 | my $msg = join "", @_; |
264 | my $msg = join "", @_; |
259 | |
265 | |
260 | $msg .= "\n" |
266 | $msg .= "\n" |
261 | unless $msg =~ /\n$/; |
267 | unless $msg =~ /\n$/; |
262 | |
268 | |
263 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
269 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
264 | |
270 | |
265 | LOG llevError, $msg; |
271 | LOG llevWarn, $msg; |
266 | }; |
272 | }; |
267 | |
273 | |
268 | $Coro::State::DIEHOOK = sub { |
274 | $Coro::State::DIEHOOK = sub { |
269 | return unless $^S eq 0; # "eq", not "==" |
275 | return unless $^S eq 0; # "eq", not "==" |
270 | |
276 | |
271 | warn Carp::longmess $_[0]; |
277 | error Carp::longmess $_[0]; |
272 | |
278 | |
273 | if (in_main) {#d# |
279 | if (in_main) {#d# |
274 | warn "DIEHOOK called in main context, Coro bug?\n";#d# |
280 | error "DIEHOOK called in main context, Coro bug?\n";#d# |
275 | return;#d# |
281 | return;#d# |
276 | }#d# |
282 | }#d# |
277 | |
283 | |
278 | # kill coroutine otherwise |
284 | # kill coroutine otherwise |
279 | Coro::terminate |
285 | Coro::terminate |
… | |
… | |
512 | =cut |
518 | =cut |
513 | |
519 | |
514 | sub sync_job(&) { |
520 | sub sync_job(&) { |
515 | my ($job) = @_; |
521 | my ($job) = @_; |
516 | |
522 | |
517 | if ($Coro::current == $Coro::main) { |
523 | if (in_main) { |
518 | my $time = AE::time; |
524 | my $time = AE::time; |
519 | |
525 | |
520 | # this is the main coro, too bad, we have to block |
526 | # this is the main coro, too bad, we have to block |
521 | # till the operation succeeds, freezing the server :/ |
527 | # till the operation succeeds, freezing the server :/ |
522 | |
528 | |
523 | LOG llevError, Carp::longmess "sync job";#d# |
529 | #LOG llevError, Carp::longmess "sync job";#d# |
524 | |
530 | |
525 | my $freeze_guard = freeze_mainloop; |
531 | my $freeze_guard = freeze_mainloop; |
526 | |
532 | |
527 | my $busy = 1; |
533 | my $busy = 1; |
528 | my @res; |
534 | my @res; |
529 | |
535 | |
530 | (async { |
536 | (async { |
531 | $Coro::current->desc ("sync job coro"); |
537 | $Coro::current->desc ("sync job coro"); |
532 | @res = eval { $job->() }; |
538 | @res = eval { $job->() }; |
533 | warn $@ if $@; |
539 | error $@ if $@; |
534 | undef $busy; |
540 | undef $busy; |
535 | })->prio (Coro::PRIO_MAX); |
541 | })->prio (Coro::PRIO_MAX); |
536 | |
542 | |
537 | while ($busy) { |
543 | while ($busy) { |
538 | if (Coro::nready) { |
544 | if (Coro::nready) { |
… | |
… | |
651 | within each server. |
657 | within each server. |
652 | |
658 | |
653 | =cut |
659 | =cut |
654 | |
660 | |
655 | sub db_table($) { |
661 | sub db_table($) { |
|
|
662 | cf::error "db_get called from main context" |
|
|
663 | if $Coro::current == $Coro::main; |
|
|
664 | |
656 | my ($name) = @_; |
665 | my ($name) = @_; |
657 | my $db = BDB::db_create $DB_ENV; |
666 | my $db = BDB::db_create $DB_ENV; |
658 | |
667 | |
659 | eval { |
668 | eval { |
660 | $db->set_flags (BDB::CHKSUM); |
669 | $db->set_flags (BDB::CHKSUM); |
… | |
… | |
670 | } |
679 | } |
671 | |
680 | |
672 | our $DB; |
681 | our $DB; |
673 | |
682 | |
674 | sub db_init { |
683 | sub db_init { |
675 | cf::sync_job { |
|
|
676 | $DB ||= db_table "db"; |
684 | $DB ||= db_table "db"; |
677 | }; |
|
|
678 | } |
685 | } |
679 | |
686 | |
680 | sub db_get($$) { |
687 | sub db_get($$) { |
681 | my $key = "$_[0]/$_[1]"; |
688 | my $key = "$_[0]/$_[1]"; |
682 | |
689 | |
683 | cf::sync_job { |
690 | cf::error "db_get called from main context" |
|
|
691 | if $Coro::current == $Coro::main; |
|
|
692 | |
684 | BDB::db_get $DB, undef, $key, my $data; |
693 | BDB::db_get $DB, undef, $key, my $data; |
685 | |
694 | |
686 | $! ? () |
695 | $! ? () |
687 | : $data |
696 | : $data |
688 | } |
|
|
689 | } |
697 | } |
690 | |
698 | |
691 | sub db_put($$$) { |
699 | sub db_put($$$) { |
692 | BDB::dbreq_pri 4; |
700 | BDB::dbreq_pri 4; |
693 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
701 | BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; |
… | |
… | |
749 | |
757 | |
750 | my $t1 = Time::HiRes::time; |
758 | my $t1 = Time::HiRes::time; |
751 | my $data = $process->(\@data); |
759 | my $data = $process->(\@data); |
752 | my $t2 = Time::HiRes::time; |
760 | my $t2 = Time::HiRes::time; |
753 | |
761 | |
754 | warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
762 | info "cache: '$id' processed in ", $t2 - $t1, "s\n"; |
755 | |
763 | |
756 | db_put cache => "$id/data", $data; |
764 | db_put cache => "$id/data", $data; |
757 | db_put cache => "$id/md5" , $md5; |
765 | db_put cache => "$id/md5" , $md5; |
758 | db_put cache => "$id/meta", $meta; |
766 | db_put cache => "$id/meta", $meta; |
759 | |
767 | |
… | |
… | |
769 | |
777 | |
770 | =cut |
778 | =cut |
771 | |
779 | |
772 | sub datalog($@) { |
780 | sub datalog($@) { |
773 | my ($type, %kv) = @_; |
781 | my ($type, %kv) = @_; |
774 | warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
782 | info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); |
775 | } |
783 | } |
776 | |
784 | |
777 | =back |
785 | =back |
778 | |
786 | |
779 | =cut |
787 | =cut |
… | |
… | |
974 | |
982 | |
975 | } elsif (exists $cb_id{$type}) { |
983 | } elsif (exists $cb_id{$type}) { |
976 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
984 | _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; |
977 | |
985 | |
978 | } elsif (ref $type) { |
986 | } elsif (ref $type) { |
979 | warn "attaching objects not supported, ignoring.\n"; |
987 | error "attaching objects not supported, ignoring.\n"; |
980 | |
988 | |
981 | } else { |
989 | } else { |
982 | shift @arg; |
990 | shift @arg; |
983 | warn "attach argument '$type' not supported, ignoring.\n"; |
991 | error "attach argument '$type' not supported, ignoring.\n"; |
984 | } |
992 | } |
985 | } |
993 | } |
986 | } |
994 | } |
987 | |
995 | |
988 | sub _object_attach { |
996 | sub _object_attach { |
… | |
… | |
998 | _attach $registry, $klass, @attach; |
1006 | _attach $registry, $klass, @attach; |
999 | } |
1007 | } |
1000 | |
1008 | |
1001 | $obj->{$name} = \%arg; |
1009 | $obj->{$name} = \%arg; |
1002 | } else { |
1010 | } else { |
1003 | warn "object uses attachment '$name' which is not available, postponing.\n"; |
1011 | info "object uses attachment '$name' which is not available, postponing.\n"; |
1004 | } |
1012 | } |
1005 | |
1013 | |
1006 | $obj->{_attachment}{$name} = undef; |
1014 | $obj->{_attachment}{$name} = undef; |
1007 | } |
1015 | } |
1008 | |
1016 | |
… | |
… | |
1067 | |
1075 | |
1068 | for (@$callbacks) { |
1076 | for (@$callbacks) { |
1069 | eval { &{$_->[1]} }; |
1077 | eval { &{$_->[1]} }; |
1070 | |
1078 | |
1071 | if ($@) { |
1079 | if ($@) { |
1072 | warn "$@"; |
|
|
1073 | warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1080 | error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; |
1074 | override; |
1081 | override; |
1075 | } |
1082 | } |
1076 | |
1083 | |
1077 | return 1 if $override; |
1084 | return 1 if $override; |
1078 | } |
1085 | } |
… | |
… | |
1157 | for (@$attach) { |
1164 | for (@$attach) { |
1158 | my ($klass, @attach) = @$_; |
1165 | my ($klass, @attach) = @$_; |
1159 | _attach $registry, $klass, @attach; |
1166 | _attach $registry, $klass, @attach; |
1160 | } |
1167 | } |
1161 | } else { |
1168 | } else { |
1162 | warn "object uses attachment '$name' that is not available, postponing.\n"; |
1169 | info "object uses attachment '$name' that is not available, postponing.\n"; |
1163 | } |
1170 | } |
1164 | } |
1171 | } |
1165 | } |
1172 | } |
1166 | |
1173 | |
1167 | cf::attachable->attach ( |
1174 | cf::attachable->attach ( |
… | |
… | |
1194 | my ($filename, $rdata, $objs) = @_; |
1201 | my ($filename, $rdata, $objs) = @_; |
1195 | |
1202 | |
1196 | sync_job { |
1203 | sync_job { |
1197 | if (length $$rdata) { |
1204 | if (length $$rdata) { |
1198 | utf8::decode (my $decname = $filename); |
1205 | utf8::decode (my $decname = $filename); |
1199 | warn sprintf "saving %s (%d,%d)\n", |
1206 | trace sprintf "saving %s (%d,%d)\n", |
1200 | $decname, length $$rdata, scalar @$objs |
1207 | $decname, length $$rdata, scalar @$objs |
1201 | if $VERBOSE_IO; |
1208 | if $VERBOSE_IO; |
1202 | |
1209 | |
1203 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1210 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1204 | aio_chmod $fh, SAVE_MODE; |
1211 | aio_chmod $fh, SAVE_MODE; |
1205 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1212 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
… | |
… | |
1228 | aio_rename "$filename~", $filename; |
1235 | aio_rename "$filename~", $filename; |
1229 | |
1236 | |
1230 | $filename =~ s%/[^/]+$%%; |
1237 | $filename =~ s%/[^/]+$%%; |
1231 | aio_pathsync $filename if $cf::USE_FSYNC; |
1238 | aio_pathsync $filename if $cf::USE_FSYNC; |
1232 | } else { |
1239 | } else { |
1233 | warn "unable to save objects: $filename~: $!\n"; |
1240 | error "unable to save objects: $filename~: $!\n"; |
1234 | } |
1241 | } |
1235 | } else { |
1242 | } else { |
1236 | aio_unlink $filename; |
1243 | aio_unlink $filename; |
1237 | aio_unlink "$filename.pst"; |
1244 | aio_unlink "$filename.pst"; |
1238 | } |
1245 | } |
… | |
… | |
1262 | my $st = eval { Coro::Storable::thaw $av }; |
1269 | my $st = eval { Coro::Storable::thaw $av }; |
1263 | $av = $st->{objs}; |
1270 | $av = $st->{objs}; |
1264 | } |
1271 | } |
1265 | |
1272 | |
1266 | utf8::decode (my $decname = $filename); |
1273 | utf8::decode (my $decname = $filename); |
1267 | warn sprintf "loading %s (%d,%d)\n", |
1274 | trace sprintf "loading %s (%d,%d)\n", |
1268 | $decname, length $data, scalar @{$av || []} |
1275 | $decname, length $data, scalar @{$av || []} |
1269 | if $VERBOSE_IO; |
1276 | if $VERBOSE_IO; |
1270 | |
1277 | |
1271 | ($data, $av) |
1278 | ($data, $av) |
1272 | } |
1279 | } |
1273 | |
1280 | |
… | |
… | |
1366 | |
1373 | |
1367 | $pl->ext_reply ($reply, @reply) |
1374 | $pl->ext_reply ($reply, @reply) |
1368 | if $reply; |
1375 | if $reply; |
1369 | |
1376 | |
1370 | } else { |
1377 | } else { |
1371 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1378 | error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1372 | } |
1379 | } |
1373 | |
1380 | |
1374 | cf::override; |
1381 | cf::override; |
1375 | }, |
1382 | }, |
1376 | ); |
1383 | ); |
… | |
… | |
1387 | |
1394 | |
1388 | $grp |
1395 | $grp |
1389 | } |
1396 | } |
1390 | |
1397 | |
1391 | sub load_extensions { |
1398 | sub load_extensions { |
|
|
1399 | info "loading extensions..."; |
|
|
1400 | |
1392 | cf::sync_job { |
1401 | cf::sync_job { |
1393 | my %todo; |
1402 | my %todo; |
1394 | |
1403 | |
1395 | for my $path (<$LIBDIR/*.ext>) { |
1404 | for my $path (<$LIBDIR/*.ext>) { |
1396 | next unless -r $path; |
1405 | next unless -r $path; |
… | |
… | |
1414 | |
1423 | |
1415 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1424 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1416 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1425 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1417 | |
1426 | |
1418 | $ext{source} = |
1427 | $ext{source} = |
1419 | "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" |
1428 | "package $pkg; use common::sense;\n" |
1420 | . "#line 1 \"$path\"\n{\n" |
1429 | . "#line 1 \"$path\"\n{\n" |
1421 | . $source |
1430 | . $source |
1422 | . "\n};\n1"; |
1431 | . "\n};\n1"; |
1423 | |
1432 | |
1424 | $todo{$base} = \%ext; |
1433 | $todo{$base} = \%ext; |
… | |
… | |
1436 | for (split /,\s*/, $v->{meta}{depends}) { |
1445 | for (split /,\s*/, $v->{meta}{depends}) { |
1437 | next ext |
1446 | next ext |
1438 | unless exists $done{$_}; |
1447 | unless exists $done{$_}; |
1439 | } |
1448 | } |
1440 | |
1449 | |
1441 | warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1450 | trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; |
1442 | |
1451 | |
1443 | my $active = eval $v->{source}; |
1452 | my $active = eval $v->{source}; |
1444 | |
1453 | |
1445 | if (length $@) { |
1454 | if (length $@) { |
1446 | warn "$v->{path}: $@\n"; |
1455 | error "$v->{path}: $@\n"; |
|
|
1456 | undef $@; # work around perl 5.10.0 utf-8 caching bug |
1447 | |
1457 | |
1448 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1458 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1449 | if exists $v->{meta}{mandatory}; |
1459 | if exists $v->{meta}{mandatory}; |
1450 | |
1460 | |
1451 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
1461 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
… | |
… | |
1453 | } else { |
1463 | } else { |
1454 | $done{$k} = delete $todo{$k}; |
1464 | $done{$k} = delete $todo{$k}; |
1455 | push @EXTS, $v->{pkg}; |
1465 | push @EXTS, $v->{pkg}; |
1456 | $progress = 1; |
1466 | $progress = 1; |
1457 | |
1467 | |
1458 | warn "$v->{base}: extension inactive.\n" |
1468 | info "$v->{base}: extension inactive.\n" |
1459 | unless $active; |
1469 | unless $active; |
1460 | } |
1470 | } |
1461 | } |
1471 | } |
1462 | |
1472 | |
1463 | unless ($progress) { |
1473 | unless ($progress) { |
… | |
… | |
1839 | |
1849 | |
1840 | sub register { |
1850 | sub register { |
1841 | my (undef, $regex, $prio) = @_; |
1851 | my (undef, $regex, $prio) = @_; |
1842 | my $pkg = caller; |
1852 | my $pkg = caller; |
1843 | |
1853 | |
1844 | no strict; |
|
|
1845 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1854 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1846 | |
1855 | |
1847 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1856 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1848 | } |
1857 | } |
1849 | |
1858 | |
… | |
… | |
2183 | } |
2192 | } |
2184 | |
2193 | |
2185 | sub find_sync { |
2194 | sub find_sync { |
2186 | my ($path, $origin) = @_; |
2195 | my ($path, $origin) = @_; |
2187 | |
2196 | |
2188 | cf::sync_job { find $path, $origin } |
2197 | return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" |
|
|
2198 | if $Coro::current == $Coro::main; |
|
|
2199 | |
|
|
2200 | find $path, $origin |
2189 | } |
2201 | } |
2190 | |
2202 | |
2191 | sub do_load_sync { |
2203 | sub do_load_sync { |
2192 | my ($map) = @_; |
2204 | my ($map) = @_; |
2193 | |
2205 | |
2194 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
2206 | return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" |
2195 | if $Coro::current == $Coro::main; |
2207 | if $Coro::current == $Coro::main; |
2196 | |
2208 | |
2197 | cf::sync_job { $map->load }; |
2209 | $map->load; |
2198 | } |
2210 | } |
2199 | |
2211 | |
2200 | our %MAP_PREFETCH; |
2212 | our %MAP_PREFETCH; |
2201 | our $MAP_PREFETCHER = undef; |
2213 | our $MAP_PREFETCHER = undef; |
2202 | |
2214 | |
… | |
… | |
2314 | |
2326 | |
2315 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2327 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2316 | |
2328 | |
2317 | return if $self->players; |
2329 | return if $self->players; |
2318 | |
2330 | |
2319 | warn "resetting map ", $self->path, "\n"; |
2331 | cf::trace "resetting map ", $self->path, "\n"; |
2320 | |
2332 | |
2321 | $self->in_memory (cf::MAP_SWAPPED); |
2333 | $self->in_memory (cf::MAP_SWAPPED); |
2322 | |
2334 | |
2323 | # need to save uniques path |
2335 | # need to save uniques path |
2324 | unless ($self->{deny_save}) { |
2336 | unless ($self->{deny_save}) { |
… | |
… | |
2689 | |
2701 | |
2690 | sub cf::object::player::goto { |
2702 | sub cf::object::player::goto { |
2691 | my ($self, $path, $x, $y, $check, $done) = @_; |
2703 | my ($self, $path, $x, $y, $check, $done) = @_; |
2692 | |
2704 | |
2693 | if ($self->{_link_recursion} >= $MAX_LINKS) { |
2705 | if ($self->{_link_recursion} >= $MAX_LINKS) { |
2694 | warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; |
2706 | 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!"); |
2707 | $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); |
2696 | ($path, $x, $y) = @$EMERGENCY_POSITION; |
2708 | ($path, $x, $y) = @$EMERGENCY_POSITION; |
2697 | } |
2709 | } |
2698 | |
2710 | |
2699 | # do generation counting so two concurrent goto's will be executed in-order |
2711 | # do generation counting so two concurrent goto's will be executed in-order |
… | |
… | |
2847 | $self->message ("Something went wrong deep within the deliantra server. " |
2859 | $self->message ("Something went wrong deep within the deliantra server. " |
2848 | . "I'll try to bring you back to the map you were before. " |
2860 | . "I'll try to bring you back to the map you were before. " |
2849 | . "Please report this to the dungeon master!", |
2861 | . "Please report this to the dungeon master!", |
2850 | cf::NDI_UNIQUE | cf::NDI_RED); |
2862 | cf::NDI_UNIQUE | cf::NDI_RED); |
2851 | |
2863 | |
2852 | warn "ERROR in enter_exit: $@"; |
2864 | error "ERROR in enter_exit: $@"; |
2853 | $self->leave_link; |
2865 | $self->leave_link; |
2854 | } |
2866 | } |
2855 | })->prio (1); |
2867 | })->prio (1); |
2856 | } |
2868 | } |
2857 | |
2869 | |
… | |
… | |
3170 | |
3182 | |
3171 | $ns->ext_reply ($reply, @reply) |
3183 | $ns->ext_reply ($reply, @reply) |
3172 | if $reply; |
3184 | if $reply; |
3173 | |
3185 | |
3174 | } else { |
3186 | } else { |
3175 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3187 | error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
3176 | } |
3188 | } |
3177 | |
3189 | |
3178 | cf::override; |
3190 | cf::override; |
3179 | }, |
3191 | }, |
3180 | ); |
3192 | ); |
… | |
… | |
3261 | decrease split destroy change_exp value msg lore send_msg)], |
3273 | decrease split destroy change_exp value msg lore send_msg)], |
3262 | ["cf::object::player" => qw(player)], |
3274 | ["cf::object::player" => qw(player)], |
3263 | ["cf::player" => qw(peaceful send_msg)], |
3275 | ["cf::player" => qw(peaceful send_msg)], |
3264 | ["cf::map" => qw(trigger)], |
3276 | ["cf::map" => qw(trigger)], |
3265 | ) { |
3277 | ) { |
3266 | no strict 'refs'; |
|
|
3267 | my ($pkg, @funs) = @$_; |
3278 | my ($pkg, @funs) = @$_; |
3268 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3279 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3269 | for @funs; |
3280 | for @funs; |
3270 | } |
3281 | } |
3271 | |
3282 | |
… | |
… | |
3310 | local @cf::_safe_eval_args = values %vars; |
3321 | local @cf::_safe_eval_args = values %vars; |
3311 | @res = wantarray ? eval eval : scalar eval $eval; |
3322 | @res = wantarray ? eval eval : scalar eval $eval; |
3312 | } |
3323 | } |
3313 | |
3324 | |
3314 | if ($@) { |
3325 | if ($@) { |
3315 | warn "$@"; |
3326 | warn "$@", |
3316 | warn "while executing safe code '$code'\n"; |
3327 | "while executing safe code '$code'\n", |
3317 | warn "with arguments " . (join " ", %vars) . "\n"; |
3328 | "with arguments " . (join " ", %vars) . "\n"; |
3318 | } |
3329 | } |
3319 | |
3330 | |
3320 | wantarray ? @res : $res[0] |
3331 | wantarray ? @res : $res[0] |
3321 | } |
3332 | } |
3322 | |
3333 | |
… | |
… | |
3347 | =cut |
3358 | =cut |
3348 | |
3359 | |
3349 | ############################################################################# |
3360 | ############################################################################# |
3350 | # the server's init and main functions |
3361 | # the server's init and main functions |
3351 | |
3362 | |
|
|
3363 | # async inc loader. yay. |
|
|
3364 | sub inc_loader { |
|
|
3365 | my $mod = $_[1]; |
|
|
3366 | |
|
|
3367 | if (in_main && !tick_inhibit) { |
|
|
3368 | Carp::cluck "ERROR: attempted synchronous perl module load ($mod)"; |
|
|
3369 | } else { |
|
|
3370 | debug "loading perl module $mod\n"; |
|
|
3371 | } |
|
|
3372 | |
|
|
3373 | # 1. find real file |
|
|
3374 | for my $dir (@ORIG_INC) { |
|
|
3375 | warn "$dir/$mod\n";#d# |
|
|
3376 | ref $dir and next; |
|
|
3377 | 0 <= Coro::AIO::aio_load "$dir/$mod", my $data |
|
|
3378 | or next; |
|
|
3379 | |
|
|
3380 | $data = "#line 1 $dir/$mod\n$data"; |
|
|
3381 | |
|
|
3382 | open my $fh, "<", \$data or die; |
|
|
3383 | |
|
|
3384 | return $fh; |
|
|
3385 | } |
|
|
3386 | |
|
|
3387 | () |
|
|
3388 | } |
|
|
3389 | |
|
|
3390 | sub init_inc { |
|
|
3391 | # save original @INC |
|
|
3392 | @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC; |
|
|
3393 | |
|
|
3394 | # make sure we can do scalar-opens |
|
|
3395 | open my $dummy, "<", \my $dummy2; |
|
|
3396 | |
|
|
3397 | # execute some stuff so perl load's some of the core modules |
|
|
3398 | /Ü/ =~ /ü/i; |
|
|
3399 | eval { &Storable::nstore_fd }; |
|
|
3400 | |
|
|
3401 | @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc. |
|
|
3402 | |
|
|
3403 | debug "module loading will be asynchronous from this point on."; |
|
|
3404 | } |
|
|
3405 | |
3352 | sub load_facedata($) { |
3406 | sub load_facedata($) { |
3353 | my ($path) = @_; |
3407 | my ($path) = @_; |
3354 | |
3408 | |
3355 | # HACK to clear player env face cache, we need some signal framework |
3409 | # HACK to clear player env face cache, we need some signal framework |
3356 | # for this (global event?) |
3410 | # for this (global event?) |
3357 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3411 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3358 | |
3412 | |
3359 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3413 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3360 | |
3414 | |
3361 | warn "loading facedata from $path\n"; |
3415 | trace "loading facedata from $path\n"; |
3362 | |
3416 | |
3363 | my $facedata; |
3417 | my $facedata; |
3364 | 0 < aio_load $path, $facedata |
3418 | 0 < aio_load $path, $facedata |
3365 | or die "$path: $!"; |
3419 | or die "$path: $!"; |
3366 | |
3420 | |
… | |
… | |
3400 | |
3454 | |
3401 | if (my $smooth = cf::face::find $info->{smooth}) { |
3455 | if (my $smooth = cf::face::find $info->{smooth}) { |
3402 | cf::face::set_smooth $idx, $smooth; |
3456 | cf::face::set_smooth $idx, $smooth; |
3403 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3457 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
3404 | } else { |
3458 | } else { |
3405 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
3459 | error "smooth face '$info->{smooth}' not found for face '$face'"; |
3406 | } |
3460 | } |
3407 | |
3461 | |
3408 | cf::cede_to_tick; |
3462 | cf::cede_to_tick; |
3409 | } |
3463 | } |
3410 | } |
3464 | } |
… | |
… | |
3488 | load_resource_file "$DATADIR/treasures" |
3542 | load_resource_file "$DATADIR/treasures" |
3489 | or die "unable to load treasurelists\n"; |
3543 | or die "unable to load treasurelists\n"; |
3490 | } |
3544 | } |
3491 | |
3545 | |
3492 | sub reload_sound { |
3546 | sub reload_sound { |
3493 | warn "loading sound config from $DATADIR/sound\n"; |
3547 | trace "loading sound config from $DATADIR/sound\n"; |
3494 | |
3548 | |
3495 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
3549 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
3496 | or die "$DATADIR/sound $!"; |
3550 | or die "$DATADIR/sound $!"; |
3497 | |
3551 | |
3498 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
3552 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
… | |
… | |
3511 | cf::sound::set $k => $face; |
3565 | cf::sound::set $k => $face; |
3512 | } |
3566 | } |
3513 | } |
3567 | } |
3514 | |
3568 | |
3515 | sub reload_resources { |
3569 | sub reload_resources { |
3516 | warn "reloading resource files...\n"; |
3570 | trace "reloading resource files...\n"; |
3517 | |
3571 | |
3518 | reload_facedata; |
3572 | reload_facedata; |
3519 | reload_sound; |
3573 | reload_sound; |
3520 | reload_archetypes; |
3574 | reload_archetypes; |
3521 | reload_regions; |
3575 | reload_regions; |
3522 | reload_treasures; |
3576 | reload_treasures; |
3523 | |
3577 | |
3524 | warn "finished reloading resource files\n"; |
3578 | trace "finished reloading resource files\n"; |
3525 | } |
3579 | } |
3526 | |
3580 | |
3527 | sub reload_config { |
3581 | sub reload_config { |
3528 | warn "reloading config file...\n"; |
3582 | trace "reloading config file...\n"; |
3529 | |
3583 | |
3530 | open my $fh, "<:utf8", "$CONFDIR/config" |
3584 | open my $fh, "<:utf8", "$CONFDIR/config" |
3531 | or return; |
3585 | or return; |
3532 | |
3586 | |
3533 | local $/; |
3587 | local $/; |
… | |
… | |
3544 | and die "WARNING: m(un)lockall failed: $!\n"; |
3598 | and die "WARNING: m(un)lockall failed: $!\n"; |
3545 | }; |
3599 | }; |
3546 | warn $@ if $@; |
3600 | warn $@ if $@; |
3547 | } |
3601 | } |
3548 | |
3602 | |
3549 | warn "finished reloading resource files\n"; |
3603 | trace "finished reloading resource files\n"; |
3550 | } |
3604 | } |
3551 | |
3605 | |
3552 | sub pidfile() { |
3606 | sub pidfile() { |
3553 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3607 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3554 | or die "$PIDFILE: $!"; |
3608 | or die "$PIDFILE: $!"; |
… | |
… | |
3567 | seek $fh, 0, 0; |
3621 | seek $fh, 0, 0; |
3568 | print $fh $$; |
3622 | print $fh $$; |
3569 | } |
3623 | } |
3570 | |
3624 | |
3571 | sub main_loop { |
3625 | sub main_loop { |
3572 | warn "EV::loop starting\n"; |
3626 | trace "EV::loop starting\n"; |
3573 | if (1) { |
3627 | if (1) { |
3574 | EV::loop; |
3628 | EV::loop; |
3575 | } |
3629 | } |
3576 | warn "EV::loop returned\n"; |
3630 | trace "EV::loop returned\n"; |
3577 | goto &main_loop unless $REALLY_UNLOOP; |
3631 | goto &main_loop unless $REALLY_UNLOOP; |
3578 | } |
3632 | } |
3579 | |
3633 | |
3580 | sub main { |
3634 | sub main { |
3581 | cf::init_globals; # initialise logging |
3635 | cf::init_globals; # initialise logging |
3582 | |
3636 | |
3583 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3637 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3584 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3638 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3585 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3639 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3586 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3640 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3587 | |
3641 | |
3588 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3642 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3589 | |
3643 | |
… | |
… | |
3597 | }; |
3651 | }; |
3598 | |
3652 | |
3599 | evthread_start IO::AIO::poll_fileno; |
3653 | evthread_start IO::AIO::poll_fileno; |
3600 | |
3654 | |
3601 | cf::sync_job { |
3655 | cf::sync_job { |
|
|
3656 | init_inc; |
|
|
3657 | |
3602 | cf::init_experience; |
3658 | cf::init_experience; |
3603 | cf::init_anim; |
3659 | cf::init_anim; |
3604 | cf::init_attackmess; |
3660 | cf::init_attackmess; |
3605 | cf::init_dynamic; |
3661 | cf::init_dynamic; |
3606 | |
3662 | |
… | |
… | |
3629 | |
3685 | |
3630 | (pop @POST_INIT)->(0) while @POST_INIT; |
3686 | (pop @POST_INIT)->(0) while @POST_INIT; |
3631 | }; |
3687 | }; |
3632 | |
3688 | |
3633 | cf::object::thawer::errors_are_fatal 0; |
3689 | cf::object::thawer::errors_are_fatal 0; |
3634 | warn "parse errors in files are no longer fatal from this point on.\n"; |
3690 | info "parse errors in files are no longer fatal from this point on.\n"; |
3635 | |
3691 | |
|
|
3692 | my $free_main; $free_main = EV::idle sub { |
|
|
3693 | undef $free_main; |
|
|
3694 | undef &main; # free gobs of memory :) |
|
|
3695 | }; |
|
|
3696 | |
3636 | main_loop; |
3697 | goto &main_loop; |
3637 | } |
3698 | } |
3638 | |
3699 | |
3639 | ############################################################################# |
3700 | ############################################################################# |
3640 | # initialisation and cleanup |
3701 | # initialisation and cleanup |
3641 | |
3702 | |
… | |
… | |
3680 | or return; |
3741 | or return; |
3681 | |
3742 | |
3682 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3743 | aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE |
3683 | and return; |
3744 | and return; |
3684 | |
3745 | |
3685 | warn sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3746 | trace sprintf "runtime file written (%gs).\n", AE::time - $t0; |
3686 | |
3747 | |
3687 | 1 |
3748 | 1 |
3688 | } |
3749 | } |
3689 | |
3750 | |
3690 | our $uuid_lock; |
3751 | our $uuid_lock; |
… | |
… | |
3702 | or return; |
3763 | or return; |
3703 | |
3764 | |
3704 | my $value = uuid_seq uuid_cur; |
3765 | my $value = uuid_seq uuid_cur; |
3705 | |
3766 | |
3706 | unless ($value) { |
3767 | unless ($value) { |
3707 | warn "cowardly refusing to write zero uuid value!\n"; |
3768 | info "cowardly refusing to write zero uuid value!\n"; |
3708 | return; |
3769 | return; |
3709 | } |
3770 | } |
3710 | |
3771 | |
3711 | my $value = uuid_str $value + $uuid_skip; |
3772 | my $value = uuid_str $value + $uuid_skip; |
3712 | $uuid_skip = 0; |
3773 | $uuid_skip = 0; |
… | |
… | |
3722 | or return; |
3783 | or return; |
3723 | |
3784 | |
3724 | aio_rename "$uuid~", $uuid |
3785 | aio_rename "$uuid~", $uuid |
3725 | and return; |
3786 | and return; |
3726 | |
3787 | |
3727 | warn "uuid file written ($value).\n"; |
3788 | trace "uuid file written ($value).\n"; |
3728 | |
3789 | |
3729 | 1 |
3790 | 1 |
3730 | |
3791 | |
3731 | } |
3792 | } |
3732 | |
3793 | |
… | |
… | |
3738 | } |
3799 | } |
3739 | |
3800 | |
3740 | sub emergency_save() { |
3801 | sub emergency_save() { |
3741 | my $freeze_guard = cf::freeze_mainloop; |
3802 | my $freeze_guard = cf::freeze_mainloop; |
3742 | |
3803 | |
3743 | warn "emergency_perl_save: enter\n"; |
3804 | info "emergency_perl_save: enter\n"; |
|
|
3805 | |
|
|
3806 | # this is a trade-off: we want to be very quick here, so |
|
|
3807 | # save all maps without fsync, and later call a global sync |
|
|
3808 | # (which in turn might be very very slow) |
|
|
3809 | local $USE_FSYNC = 0; |
3744 | |
3810 | |
3745 | cf::sync_job { |
3811 | cf::sync_job { |
3746 | # this is a trade-off: we want to be very quick here, so |
3812 | cf::write_runtime_sync; # external watchdog should not bark |
3747 | # save all maps without fsync, and later call a global sync |
|
|
3748 | # (which in turn might be very very slow) |
|
|
3749 | local $USE_FSYNC = 0; |
|
|
3750 | |
3813 | |
3751 | # use a peculiar iteration method to avoid tripping on perl |
3814 | # use a peculiar iteration method to avoid tripping on perl |
3752 | # refcount bugs in for. also avoids problems with players |
3815 | # refcount bugs in for. also avoids problems with players |
3753 | # and maps saved/destroyed asynchronously. |
3816 | # and maps saved/destroyed asynchronously. |
3754 | warn "emergency_perl_save: begin player save\n"; |
3817 | info "emergency_perl_save: begin player save\n"; |
3755 | for my $login (keys %cf::PLAYER) { |
3818 | for my $login (keys %cf::PLAYER) { |
3756 | my $pl = $cf::PLAYER{$login} or next; |
3819 | my $pl = $cf::PLAYER{$login} or next; |
3757 | $pl->valid or next; |
3820 | $pl->valid or next; |
3758 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3821 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3759 | $pl->save; |
3822 | $pl->save; |
3760 | } |
3823 | } |
3761 | warn "emergency_perl_save: end player save\n"; |
3824 | info "emergency_perl_save: end player save\n"; |
3762 | |
3825 | |
|
|
3826 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3827 | |
3763 | warn "emergency_perl_save: begin map save\n"; |
3828 | info "emergency_perl_save: begin map save\n"; |
3764 | for my $path (keys %cf::MAP) { |
3829 | for my $path (keys %cf::MAP) { |
3765 | my $map = $cf::MAP{$path} or next; |
3830 | my $map = $cf::MAP{$path} or next; |
3766 | $map->valid or next; |
3831 | $map->valid or next; |
3767 | $map->save; |
3832 | $map->save; |
3768 | } |
3833 | } |
3769 | warn "emergency_perl_save: end map save\n"; |
3834 | info "emergency_perl_save: end map save\n"; |
3770 | |
3835 | |
|
|
3836 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3837 | |
3771 | warn "emergency_perl_save: begin database checkpoint\n"; |
3838 | info "emergency_perl_save: begin database checkpoint\n"; |
3772 | BDB::db_env_txn_checkpoint $DB_ENV; |
3839 | BDB::db_env_txn_checkpoint $DB_ENV; |
3773 | warn "emergency_perl_save: end database checkpoint\n"; |
3840 | info "emergency_perl_save: end database checkpoint\n"; |
3774 | |
3841 | |
3775 | warn "emergency_perl_save: begin write uuid\n"; |
3842 | info "emergency_perl_save: begin write uuid\n"; |
3776 | write_uuid_sync 1; |
3843 | write_uuid_sync 1; |
3777 | warn "emergency_perl_save: end write uuid\n"; |
3844 | info "emergency_perl_save: end write uuid\n"; |
|
|
3845 | |
|
|
3846 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3847 | |
|
|
3848 | trace "emergency_perl_save: syncing database to disk"; |
|
|
3849 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3850 | |
|
|
3851 | info "emergency_perl_save: starting sync\n"; |
|
|
3852 | IO::AIO::aio_sync sub { |
|
|
3853 | info "emergency_perl_save: finished sync\n"; |
|
|
3854 | }; |
|
|
3855 | |
|
|
3856 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3857 | |
|
|
3858 | trace "emergency_perl_save: flushing outstanding aio requests"; |
|
|
3859 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3860 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3861 | } |
|
|
3862 | |
|
|
3863 | cf::write_runtime_sync; # external watchdog should not bark |
3778 | }; |
3864 | }; |
3779 | |
3865 | |
3780 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3781 | IO::AIO::aio_sync sub { |
|
|
3782 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3783 | }; |
|
|
3784 | |
|
|
3785 | warn "emergency_perl_save: leave\n"; |
3866 | info "emergency_perl_save: leave\n"; |
3786 | } |
3867 | } |
3787 | |
3868 | |
3788 | sub post_cleanup { |
3869 | sub post_cleanup { |
3789 | my ($make_core) = @_; |
3870 | my ($make_core) = @_; |
3790 | |
3871 | |
|
|
3872 | IO::AIO::flush; |
|
|
3873 | |
3791 | warn Carp::longmess "post_cleanup backtrace" |
3874 | error Carp::longmess "post_cleanup backtrace" |
3792 | if $make_core; |
3875 | if $make_core; |
3793 | |
3876 | |
3794 | my $fh = pidfile; |
3877 | my $fh = pidfile; |
3795 | unlink $PIDFILE if <$fh> == $$; |
3878 | unlink $PIDFILE if <$fh> == $$; |
3796 | } |
3879 | } |
… | |
… | |
3821 | } |
3904 | } |
3822 | |
3905 | |
3823 | sub do_reload_perl() { |
3906 | sub do_reload_perl() { |
3824 | # can/must only be called in main |
3907 | # can/must only be called in main |
3825 | if (in_main) { |
3908 | if (in_main) { |
3826 | warn "can only reload from main coroutine"; |
3909 | error "can only reload from main coroutine"; |
3827 | return; |
3910 | return; |
3828 | } |
3911 | } |
3829 | |
3912 | |
3830 | return if $RELOAD++; |
3913 | return if $RELOAD++; |
3831 | |
3914 | |
3832 | my $t1 = AE::time; |
3915 | my $t1 = AE::time; |
3833 | |
3916 | |
3834 | while ($RELOAD) { |
3917 | while ($RELOAD) { |
3835 | warn "reloading..."; |
3918 | info "reloading..."; |
3836 | |
3919 | |
3837 | warn "entering sync_job"; |
3920 | trace "entering sync_job"; |
3838 | |
3921 | |
3839 | cf::sync_job { |
3922 | cf::sync_job { |
3840 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3841 | cf::emergency_save; |
3923 | cf::emergency_save; |
3842 | cf::write_runtime_sync; # external watchdog should not bark |
|
|
3843 | |
3924 | |
3844 | warn "syncing database to disk"; |
|
|
3845 | BDB::db_env_txn_checkpoint $DB_ENV; |
|
|
3846 | |
|
|
3847 | # if anything goes wrong in here, we should simply crash as we already saved |
|
|
3848 | |
|
|
3849 | warn "flushing outstanding aio requests"; |
|
|
3850 | while (IO::AIO::nreqs || BDB::nreqs) { |
|
|
3851 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
|
|
3852 | } |
|
|
3853 | |
|
|
3854 | warn "cancelling all extension coros"; |
3925 | trace "cancelling all extension coros"; |
3855 | $_->cancel for values %EXT_CORO; |
3926 | $_->cancel for values %EXT_CORO; |
3856 | %EXT_CORO = (); |
3927 | %EXT_CORO = (); |
3857 | |
3928 | |
3858 | warn "removing commands"; |
3929 | trace "removing commands"; |
3859 | %COMMAND = (); |
3930 | %COMMAND = (); |
3860 | |
3931 | |
3861 | warn "removing ext/exti commands"; |
3932 | trace "removing ext/exti commands"; |
3862 | %EXTCMD = (); |
3933 | %EXTCMD = (); |
3863 | %EXTICMD = (); |
3934 | %EXTICMD = (); |
3864 | |
3935 | |
3865 | warn "unloading/nuking all extensions"; |
3936 | trace "unloading/nuking all extensions"; |
3866 | for my $pkg (@EXTS) { |
3937 | for my $pkg (@EXTS) { |
3867 | warn "... unloading $pkg"; |
3938 | trace "... unloading $pkg"; |
3868 | |
3939 | |
3869 | if (my $cb = $pkg->can ("unload")) { |
3940 | if (my $cb = $pkg->can ("unload")) { |
3870 | eval { |
3941 | eval { |
3871 | $cb->($pkg); |
3942 | $cb->($pkg); |
3872 | 1 |
3943 | 1 |
3873 | } or warn "$pkg unloaded, but with errors: $@"; |
3944 | } or error "$pkg unloaded, but with errors: $@"; |
3874 | } |
3945 | } |
3875 | |
3946 | |
3876 | warn "... clearing $pkg"; |
3947 | trace "... clearing $pkg"; |
3877 | clear_package $pkg; |
3948 | clear_package $pkg; |
3878 | } |
3949 | } |
3879 | |
3950 | |
3880 | warn "unloading all perl modules loaded from $LIBDIR"; |
3951 | trace "unloading all perl modules loaded from $LIBDIR"; |
3881 | while (my ($k, $v) = each %INC) { |
3952 | while (my ($k, $v) = each %INC) { |
3882 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3953 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3883 | |
3954 | |
3884 | warn "... unloading $k"; |
3955 | trace "... unloading $k"; |
3885 | delete $INC{$k}; |
3956 | delete $INC{$k}; |
3886 | |
3957 | |
3887 | $k =~ s/\.pm$//; |
3958 | $k =~ s/\.pm$//; |
3888 | $k =~ s/\//::/g; |
3959 | $k =~ s/\//::/g; |
3889 | |
3960 | |
… | |
… | |
3892 | } |
3963 | } |
3893 | |
3964 | |
3894 | clear_package $k; |
3965 | clear_package $k; |
3895 | } |
3966 | } |
3896 | |
3967 | |
3897 | warn "getting rid of safe::, as good as possible"; |
3968 | trace "getting rid of safe::, as good as possible"; |
3898 | clear_package "safe::$_" |
3969 | clear_package "safe::$_" |
3899 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3970 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3900 | |
3971 | |
3901 | warn "unloading cf.pm \"a bit\""; |
3972 | trace "unloading cf.pm \"a bit\""; |
3902 | delete $INC{"cf.pm"}; |
3973 | delete $INC{"cf.pm"}; |
3903 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3974 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3904 | |
3975 | |
3905 | # don't, removes xs symbols, too, |
3976 | # don't, removes xs symbols, too, |
3906 | # and global variables created in xs |
3977 | # and global variables created in xs |
3907 | #clear_package __PACKAGE__; |
3978 | #clear_package __PACKAGE__; |
3908 | |
3979 | |
3909 | warn "unload completed, starting to reload now"; |
3980 | info "unload completed, starting to reload now"; |
3910 | |
3981 | |
3911 | warn "reloading cf.pm"; |
3982 | trace "reloading cf.pm"; |
3912 | require cf; |
3983 | require cf; |
3913 | cf::_connect_to_perl_1; |
3984 | cf::_connect_to_perl_1; |
3914 | |
3985 | |
3915 | warn "loading config and database again"; |
3986 | trace "loading config and database again"; |
3916 | cf::reload_config; |
3987 | cf::reload_config; |
3917 | |
3988 | |
3918 | warn "loading extensions"; |
3989 | trace "loading extensions"; |
3919 | cf::load_extensions; |
3990 | cf::load_extensions; |
3920 | |
3991 | |
3921 | if ($REATTACH_ON_RELOAD) { |
3992 | if ($REATTACH_ON_RELOAD) { |
3922 | warn "reattaching attachments to objects/players"; |
3993 | trace "reattaching attachments to objects/players"; |
3923 | _global_reattach; # objects, sockets |
3994 | _global_reattach; # objects, sockets |
3924 | warn "reattaching attachments to maps"; |
3995 | trace "reattaching attachments to maps"; |
3925 | reattach $_ for values %MAP; |
3996 | reattach $_ for values %MAP; |
3926 | warn "reattaching attachments to players"; |
3997 | trace "reattaching attachments to players"; |
3927 | reattach $_ for values %PLAYER; |
3998 | reattach $_ for values %PLAYER; |
3928 | } |
3999 | } |
3929 | |
4000 | |
3930 | warn "running post_init jobs"; |
4001 | trace "running post_init jobs"; |
3931 | (pop @POST_INIT)->(1) while @POST_INIT; |
4002 | (pop @POST_INIT)->(1) while @POST_INIT; |
3932 | |
4003 | |
3933 | warn "leaving sync_job"; |
4004 | trace "leaving sync_job"; |
3934 | |
4005 | |
3935 | 1 |
4006 | 1 |
3936 | } or do { |
4007 | } or do { |
3937 | warn $@; |
4008 | error $@; |
3938 | cf::cleanup "error while reloading, exiting."; |
4009 | cf::cleanup "error while reloading, exiting."; |
3939 | }; |
4010 | }; |
3940 | |
4011 | |
3941 | warn "reloaded"; |
4012 | info "reloaded"; |
3942 | --$RELOAD; |
4013 | --$RELOAD; |
3943 | } |
4014 | } |
3944 | |
4015 | |
3945 | $t1 = AE::time - $t1; |
4016 | $t1 = AE::time - $t1; |
3946 | warn "reload completed in ${t1}s\n"; |
4017 | info "reload completed in ${t1}s\n"; |
3947 | }; |
4018 | }; |
3948 | |
4019 | |
3949 | our $RELOAD_WATCHER; # used only during reload |
4020 | our $RELOAD_WATCHER; # used only during reload |
3950 | |
4021 | |
3951 | sub reload_perl() { |
4022 | sub reload_perl() { |
… | |
… | |
3972 | reload_perl; |
4043 | reload_perl; |
3973 | }; |
4044 | }; |
3974 | } |
4045 | } |
3975 | }; |
4046 | }; |
3976 | |
4047 | |
3977 | unshift @INC, $LIBDIR; |
4048 | ############################################################################# |
3978 | |
4049 | |
3979 | my $bug_warning = 0; |
4050 | my $bug_warning = 0; |
3980 | |
4051 | |
3981 | our @WAIT_FOR_TICK; |
4052 | our @WAIT_FOR_TICK; |
3982 | our @WAIT_FOR_TICK_BEGIN; |
4053 | our @WAIT_FOR_TICK_BEGIN; |
… | |
… | |
4011 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
4082 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
4012 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
4083 | $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; |
4013 | Coro::async_pool { |
4084 | Coro::async_pool { |
4014 | $Coro::current->{desc} = "runtime saver"; |
4085 | $Coro::current->{desc} = "runtime saver"; |
4015 | write_runtime_sync |
4086 | write_runtime_sync |
4016 | or warn "ERROR: unable to write runtime file: $!"; |
4087 | or error "ERROR: unable to write runtime file: $!"; |
4017 | }; |
4088 | }; |
4018 | } |
4089 | } |
4019 | |
4090 | |
4020 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4091 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
4021 | $sig->send; |
4092 | $sig->send; |
… | |
… | |
4029 | |
4100 | |
4030 | if (0) { |
4101 | if (0) { |
4031 | if ($NEXT_TICK) { |
4102 | if ($NEXT_TICK) { |
4032 | my $jitter = $TICK_START - $NEXT_TICK; |
4103 | my $jitter = $TICK_START - $NEXT_TICK; |
4033 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4104 | $JITTER = $JITTER * 0.75 + $jitter * 0.25; |
4034 | warn "jitter $JITTER\n";#d# |
4105 | debug "jitter $JITTER\n";#d# |
4035 | } |
4106 | } |
4036 | } |
4107 | } |
4037 | } |
4108 | } |
4038 | |
4109 | |
4039 | { |
4110 | { |