… | |
… | |
19 | # The authors can be reached via e-mail to <support@deliantra.net> |
19 | # The authors can be reached via e-mail to <support@deliantra.net> |
20 | # |
20 | # |
21 | |
21 | |
22 | package cf; |
22 | package cf; |
23 | |
23 | |
|
|
24 | use 5.10.0; |
24 | use utf8; |
25 | use utf8; |
25 | use strict; |
26 | use strict "vars", "subs"; |
26 | |
27 | |
27 | use Symbol; |
28 | use Symbol; |
28 | use List::Util; |
29 | use List::Util; |
29 | use Socket; |
30 | use Socket; |
30 | use EV; |
31 | use EV; |
… | |
… | |
34 | use Storable (); |
35 | use Storable (); |
35 | |
36 | |
36 | use Coro (); |
37 | use Coro (); |
37 | use Coro::State; |
38 | use Coro::State; |
38 | use Coro::Handle; |
39 | use Coro::Handle; |
|
|
40 | use Coro::EV; |
39 | use Coro::AnyEvent; |
41 | use Coro::AnyEvent; |
40 | use Coro::Timer; |
42 | use Coro::Timer; |
41 | use Coro::Signal; |
43 | use Coro::Signal; |
42 | use Coro::Semaphore; |
44 | use Coro::Semaphore; |
43 | use Coro::AnyEvent; |
45 | use Coro::AnyEvent; |
44 | use Coro::AIO; |
46 | use Coro::AIO; |
45 | use Coro::BDB; |
47 | use Coro::BDB 1.6; |
46 | use Coro::Storable; |
48 | use Coro::Storable; |
47 | use Coro::Util (); |
49 | use Coro::Util (); |
48 | |
50 | |
49 | use JSON::XS 2.01 (); |
51 | use JSON::XS 2.01 (); |
50 | use BDB (); |
52 | use BDB (); |
… | |
… | |
56 | use Time::HiRes; |
58 | use Time::HiRes; |
57 | use Compress::LZF; |
59 | use Compress::LZF; |
58 | use Digest::MD5 (); |
60 | use Digest::MD5 (); |
59 | |
61 | |
60 | AnyEvent::detect; |
62 | AnyEvent::detect; |
61 | |
|
|
62 | IO::AIO::max_poll_reqs 1;#d# |
|
|
63 | |
63 | |
64 | # configure various modules to our taste |
64 | # configure various modules to our taste |
65 | # |
65 | # |
66 | $Storable::canonical = 1; # reduce rsync transfers |
66 | $Storable::canonical = 1; # reduce rsync transfers |
67 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
67 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
… | |
… | |
245 | for my $pkg (qw( |
245 | for my $pkg (qw( |
246 | cf::global cf::attachable |
246 | cf::global cf::attachable |
247 | cf::object cf::object::player |
247 | cf::object cf::object::player |
248 | cf::client cf::player |
248 | cf::client cf::player |
249 | cf::arch cf::living |
249 | cf::arch cf::living |
|
|
250 | cf::map cf::mapspace |
250 | cf::map cf::party cf::region |
251 | cf::party cf::region |
251 | )) { |
252 | )) { |
252 | no strict 'refs'; |
|
|
253 | @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
253 | @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
254 | } |
254 | } |
255 | |
255 | |
256 | $EV::DIED = sub { |
256 | $EV::DIED = sub { |
257 | warn "error in event callback: @_"; |
257 | warn "error in event callback: @_"; |
… | |
… | |
1088 | |
1088 | |
1089 | sub reattach { |
1089 | sub reattach { |
1090 | # basically do the same as instantiate, without calling instantiate |
1090 | # basically do the same as instantiate, without calling instantiate |
1091 | my ($obj) = @_; |
1091 | my ($obj) = @_; |
1092 | |
1092 | |
|
|
1093 | # no longer needed after getting rid of delete_package? |
1093 | bless $obj, ref $obj; # re-bless in case extensions have been reloaded |
1094 | #bless $obj, ref $obj; # re-bless in case extensions have been reloaded |
1094 | |
1095 | |
1095 | my $registry = $obj->registry; |
1096 | my $registry = $obj->registry; |
1096 | |
1097 | |
1097 | @$registry = (); |
1098 | @$registry = (); |
1098 | |
1099 | |
… | |
… | |
1334 | |
1335 | |
1335 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1336 | $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } |
1336 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1337 | if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; |
1337 | |
1338 | |
1338 | $ext{source} = |
1339 | $ext{source} = |
1339 | "package $pkg; use strict; use utf8;\n" |
1340 | "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" |
1340 | . "#line 1 \"$path\"\n{\n" |
1341 | . "#line 1 \"$path\"\n{\n" |
1341 | . $source |
1342 | . $source |
1342 | . "\n};\n1"; |
1343 | . "\n};\n1"; |
1343 | |
1344 | |
1344 | $todo{$base} = \%ext; |
1345 | $todo{$base} = \%ext; |
… | |
… | |
1624 | |
1625 | |
1625 | Expand crossfire pod fragments into protocol xml. |
1626 | Expand crossfire pod fragments into protocol xml. |
1626 | |
1627 | |
1627 | =cut |
1628 | =cut |
1628 | |
1629 | |
1629 | use re 'eval'; |
|
|
1630 | |
|
|
1631 | my $group; |
|
|
1632 | my $interior; $interior = qr{ |
|
|
1633 | # match a pod interior sequence sans C<< >> |
|
|
1634 | (?: |
|
|
1635 | \ (.*?)\ (?{ $group = $^N }) |
|
|
1636 | | < (??{$interior}) > |
|
|
1637 | ) |
|
|
1638 | }x; |
|
|
1639 | |
|
|
1640 | sub expand_cfpod { |
1630 | sub expand_cfpod { |
1641 | my ($self, $pod) = @_; |
1631 | my ($self, $pod) = @_; |
1642 | |
1632 | |
|
|
1633 | my @nest = [qr<\G$>, undef, ""]; |
1643 | my $xml; |
1634 | my $xml; |
1644 | |
1635 | |
|
|
1636 | for ($pod) { |
1645 | while () { |
1637 | while () { |
1646 | if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { |
1638 | if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) { |
1647 | $group = $1; |
|
|
1648 | |
|
|
1649 | $group =~ s/&/&/g; |
|
|
1650 | $group =~ s/</</g; |
|
|
1651 | |
|
|
1652 | $xml .= $group; |
1639 | $xml .= $1; |
1653 | } elsif ($pod =~ m%\G |
1640 | } elsif (/\G\n(?=\S)/xgcs) { |
1654 | ([BCGHITU]) |
1641 | $xml .= " "; |
1655 | < |
1642 | } elsif (/\G\n/xgcs) { |
1656 | (?: |
1643 | $xml .= "\n"; |
1657 | ([^<>]*) (?{ $group = $^N }) |
1644 | } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) { |
1658 | | < $interior > |
1645 | my ($code, $delim) = ($1, scalar reverse $2); |
1659 | ) |
1646 | $delim =~ y/</>/; # delim now contains the stop sequence |
1660 | > |
1647 | $delim = qr{\G\Q$delim}; |
1661 | %gcsx |
|
|
1662 | ) { |
|
|
1663 | my ($code, $data) = ($1, $group); |
|
|
1664 | |
1648 | |
|
|
1649 | my $cb; |
|
|
1650 | |
1665 | if ($code eq "B") { |
1651 | if ($code eq "B") { |
1666 | $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; |
1652 | $cb = sub { "<b>$_[0]</b>" }; |
1667 | } elsif ($code eq "I") { |
|
|
1668 | $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>"; |
|
|
1669 | } elsif ($code eq "U") { |
|
|
1670 | $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>"; |
|
|
1671 | } elsif ($code eq "C") { |
1653 | } elsif ($code eq "C") { |
1672 | $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; |
1654 | $cb = sub { "<tt>$_[0]</tt>" }; |
1673 | } elsif ($code eq "T") { |
1655 | } elsif ($code eq "E") { |
1674 | $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; |
1656 | $cb = sub { warn "E<$_[0]>\n";"&$_[0];" }; |
1675 | } elsif ($code eq "G") { |
1657 | } elsif ($code eq "G") { |
|
|
1658 | $cb = sub { |
1676 | my ($male, $female) = split /\|/, $data; |
1659 | my ($male, $female) = split /\|/, $_[0]; |
1677 | $data = $self->gender ? $female : $male; |
1660 | $self->gender ? $female : $male |
1678 | $xml .= expand_cfpod ($self, $data); |
1661 | }; |
1679 | } elsif ($code eq "H") { |
1662 | } elsif ($code eq "H") { |
1680 | $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", |
1663 | $cb = sub { |
|
|
1664 | ( |
|
|
1665 | "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>", |
1681 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
1666 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
1682 | "") |
1667 | "", |
1683 | [$self->{hintmode}]; |
1668 | )[$self->{hintmode}]; |
|
|
1669 | }; |
|
|
1670 | } elsif ($code eq "I") { |
|
|
1671 | $cb = sub { "<i>$_[0]</i>" }; |
|
|
1672 | } elsif ($code eq "T") { |
|
|
1673 | $cb = sub { "<big><b>$_[0]</b></big>" }; |
|
|
1674 | } elsif ($code eq "U") { |
|
|
1675 | $cb = sub { "<u>$_[0]</u>" }; |
|
|
1676 | } elsif ($code eq "Z") { |
|
|
1677 | $cb = sub { }; |
|
|
1678 | } else { |
|
|
1679 | die "FATAL error in expand_cfpod"; |
|
|
1680 | } |
|
|
1681 | |
|
|
1682 | push @nest, [$delim, $cb, $xml]; |
|
|
1683 | undef $xml; |
|
|
1684 | |
|
|
1685 | } elsif ($_ =~ /$nest[-1][0]/gcs) { |
|
|
1686 | my $nest = pop @nest; |
|
|
1687 | |
|
|
1688 | if ($nest->[1]) { |
|
|
1689 | $xml = $nest->[2] . $nest->[1]->($xml); |
|
|
1690 | } else { |
|
|
1691 | last; |
|
|
1692 | } |
|
|
1693 | } elsif (/\G</xgcs) { |
|
|
1694 | $xml .= "<"; |
|
|
1695 | } elsif (/\G&/xgcs) { |
|
|
1696 | $xml .= "&"; |
|
|
1697 | } elsif (/\G>/xgcs) { |
|
|
1698 | $xml .= ">"; |
1684 | } else { |
1699 | } else { |
1685 | $xml .= "error processing '$code($data)' directive"; |
1700 | if ($pod =~ /\G(.+)/xgcs) { |
|
|
1701 | warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod"; |
|
|
1702 | last; |
|
|
1703 | } else { |
|
|
1704 | warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod"; |
|
|
1705 | return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>"; |
|
|
1706 | } |
1686 | } |
1707 | } |
1687 | } else { |
|
|
1688 | if ($pod =~ /\G(.+)/) { |
|
|
1689 | warn "parse error while expanding $pod (at $1)"; |
|
|
1690 | } |
1708 | } |
1691 | last; |
|
|
1692 | } |
|
|
1693 | } |
|
|
1694 | |
|
|
1695 | for ($xml) { |
|
|
1696 | # create single paragraphs (very hackish) |
|
|
1697 | s/(?<=\S)\n(?=\w)/ /g; |
|
|
1698 | |
|
|
1699 | # compress some whitespace |
|
|
1700 | s/\s+\n/\n/g; # ws line-ends |
|
|
1701 | s/\n\n+/\n/g; # double lines |
|
|
1702 | s/^\n+//; # beginning lines |
|
|
1703 | s/\n+$//; # ending lines |
|
|
1704 | } |
1709 | } |
1705 | |
1710 | |
1706 | $xml |
1711 | $xml |
1707 | } |
1712 | } |
1708 | |
|
|
1709 | no re 'eval'; |
|
|
1710 | |
1713 | |
1711 | sub hintmode { |
1714 | sub hintmode { |
1712 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1715 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1713 | $_[0]{hintmode} |
1716 | $_[0]{hintmode} |
1714 | } |
1717 | } |
… | |
… | |
2088 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2091 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2089 | $f->skip_block; |
2092 | $f->skip_block; |
2090 | $self->_load_objects ($f) |
2093 | $self->_load_objects ($f) |
2091 | or return; |
2094 | or return; |
2092 | |
2095 | |
2093 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
2096 | $self->post_load_original |
2094 | if delete $self->{load_original}; |
2097 | if delete $self->{load_original}; |
2095 | |
2098 | |
2096 | if (my $uniq = $self->uniq_path) { |
2099 | if (my $uniq = $self->uniq_path) { |
2097 | utf8::encode $uniq; |
2100 | utf8::encode $uniq; |
2098 | unless (aio_stat $uniq) { |
2101 | unless (aio_stat $uniq) { |
… | |
… | |
2615 | Moves the player to the given map-path and coordinates by first freezing |
2618 | Moves the player to the given map-path and coordinates by first freezing |
2616 | her, loading and preparing them map, calling the provided $check callback |
2619 | her, loading and preparing them map, calling the provided $check callback |
2617 | that has to return the map if sucecssful, and then unfreezes the player on |
2620 | that has to return the map if sucecssful, and then unfreezes the player on |
2618 | the new (success) or old (failed) map position. In either case, $done will |
2621 | the new (success) or old (failed) map position. In either case, $done will |
2619 | be called at the end of this process. |
2622 | be called at the end of this process. |
|
|
2623 | |
|
|
2624 | Note that $check will be called with a potentially non-loaded map, so if |
|
|
2625 | it needs a loaded map it has to call C<< ->load >>. |
2620 | |
2626 | |
2621 | =cut |
2627 | =cut |
2622 | |
2628 | |
2623 | our $GOTOGEN; |
2629 | our $GOTOGEN; |
2624 | |
2630 | |
… | |
… | |
3127 | =cut |
3133 | =cut |
3128 | |
3134 | |
3129 | for ( |
3135 | for ( |
3130 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3136 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3131 | insert remove inv nrof name archname title slaying race |
3137 | insert remove inv nrof name archname title slaying race |
3132 | decrease split destroy)], |
3138 | decrease split destroy change_exp)], |
3133 | ["cf::object::player" => qw(player)], |
3139 | ["cf::object::player" => qw(player)], |
3134 | ["cf::player" => qw(peaceful)], |
3140 | ["cf::player" => qw(peaceful)], |
3135 | ["cf::map" => qw(trigger)], |
3141 | ["cf::map" => qw(trigger)], |
3136 | ) { |
3142 | ) { |
3137 | no strict 'refs'; |
3143 | no strict 'refs'; |
… | |
… | |
3397 | warn "finished reloading resource files\n"; |
3403 | warn "finished reloading resource files\n"; |
3398 | } |
3404 | } |
3399 | |
3405 | |
3400 | sub init { |
3406 | sub init { |
3401 | my $guard = freeze_mainloop; |
3407 | my $guard = freeze_mainloop; |
|
|
3408 | |
|
|
3409 | evthread_start IO::AIO::poll_fileno; |
3402 | |
3410 | |
3403 | reload_resources; |
3411 | reload_resources; |
3404 | } |
3412 | } |
3405 | |
3413 | |
3406 | sub reload_config { |
3414 | sub reload_config { |
… | |
… | |
3583 | |
3591 | |
3584 | warn Carp::longmess "post_cleanup backtrace" |
3592 | warn Carp::longmess "post_cleanup backtrace" |
3585 | if $make_core; |
3593 | if $make_core; |
3586 | } |
3594 | } |
3587 | |
3595 | |
|
|
3596 | # a safer delete_package, copied from Symbol |
|
|
3597 | sub clear_package($) { |
|
|
3598 | my $pkg = shift; |
|
|
3599 | |
|
|
3600 | # expand to full symbol table name if needed |
|
|
3601 | unless ($pkg =~ /^main::.*::$/) { |
|
|
3602 | $pkg = "main$pkg" if $pkg =~ /^::/; |
|
|
3603 | $pkg = "main::$pkg" unless $pkg =~ /^main::/; |
|
|
3604 | $pkg .= '::' unless $pkg =~ /::$/; |
|
|
3605 | } |
|
|
3606 | |
|
|
3607 | my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/; |
|
|
3608 | my $stem_symtab = *{$stem}{HASH}; |
|
|
3609 | |
|
|
3610 | defined $stem_symtab and exists $stem_symtab->{$leaf} |
|
|
3611 | or return; |
|
|
3612 | |
|
|
3613 | # clear all symbols |
|
|
3614 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
|
|
3615 | for my $name (keys %$leaf_symtab) { |
|
|
3616 | _gv_clear *{"$pkg$name"}; |
|
|
3617 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
|
|
3618 | } |
|
|
3619 | warn "cleared package #$pkg\n";#d# |
|
|
3620 | } |
|
|
3621 | |
|
|
3622 | our $RELOAD; # how many times to reload |
|
|
3623 | |
3588 | sub do_reload_perl() { |
3624 | sub do_reload_perl() { |
3589 | # can/must only be called in main |
3625 | # can/must only be called in main |
3590 | if ($Coro::current != $Coro::main) { |
3626 | if ($Coro::current != $Coro::main) { |
3591 | warn "can only reload from main coroutine"; |
3627 | warn "can only reload from main coroutine"; |
3592 | return; |
3628 | return; |
3593 | } |
3629 | } |
3594 | |
3630 | |
|
|
3631 | return if $RELOAD++; |
|
|
3632 | |
|
|
3633 | while ($RELOAD) { |
3595 | warn "reloading..."; |
3634 | warn "reloading..."; |
3596 | |
3635 | |
3597 | warn "entering sync_job"; |
3636 | warn "entering sync_job"; |
3598 | |
3637 | |
3599 | cf::sync_job { |
3638 | cf::sync_job { |
3600 | cf::write_runtime_sync; # external watchdog should not bark |
3639 | cf::write_runtime_sync; # external watchdog should not bark |
3601 | cf::emergency_save; |
3640 | cf::emergency_save; |
3602 | cf::write_runtime_sync; # external watchdog should not bark |
3641 | cf::write_runtime_sync; # external watchdog should not bark |
3603 | |
3642 | |
3604 | warn "syncing database to disk"; |
3643 | warn "syncing database to disk"; |
3605 | BDB::db_env_txn_checkpoint $DB_ENV; |
3644 | BDB::db_env_txn_checkpoint $DB_ENV; |
3606 | |
3645 | |
3607 | # if anything goes wrong in here, we should simply crash as we already saved |
3646 | # if anything goes wrong in here, we should simply crash as we already saved |
3608 | |
3647 | |
3609 | warn "flushing outstanding aio requests"; |
3648 | warn "flushing outstanding aio requests"; |
3610 | for (;;) { |
|
|
3611 | BDB::flush; |
|
|
3612 | IO::AIO::flush; |
|
|
3613 | Coro::cede_notself; |
|
|
3614 | last unless IO::AIO::nreqs || BDB::nreqs; |
3649 | while (IO::AIO::nreqs || BDB::nreqs) { |
3615 | warn "iterate..."; |
3650 | Coro::EV::timer_once 0.01; # let the sync_job do it's thing |
3616 | } |
|
|
3617 | |
|
|
3618 | ++$RELOAD; |
|
|
3619 | |
|
|
3620 | warn "cancelling all extension coros"; |
|
|
3621 | $_->cancel for values %EXT_CORO; |
|
|
3622 | %EXT_CORO = (); |
|
|
3623 | |
|
|
3624 | warn "removing commands"; |
|
|
3625 | %COMMAND = (); |
|
|
3626 | |
|
|
3627 | warn "removing ext/exti commands"; |
|
|
3628 | %EXTCMD = (); |
|
|
3629 | %EXTICMD = (); |
|
|
3630 | |
|
|
3631 | warn "unloading/nuking all extensions"; |
|
|
3632 | for my $pkg (@EXTS) { |
|
|
3633 | warn "... unloading $pkg"; |
|
|
3634 | |
|
|
3635 | if (my $cb = $pkg->can ("unload")) { |
|
|
3636 | eval { |
|
|
3637 | $cb->($pkg); |
|
|
3638 | 1 |
|
|
3639 | } or warn "$pkg unloaded, but with errors: $@"; |
|
|
3640 | } |
3651 | } |
3641 | |
3652 | |
3642 | warn "... nuking $pkg"; |
3653 | warn "cancelling all extension coros"; |
3643 | Symbol::delete_package $pkg; |
3654 | $_->cancel for values %EXT_CORO; |
3644 | } |
3655 | %EXT_CORO = (); |
3645 | |
3656 | |
3646 | warn "unloading all perl modules loaded from $LIBDIR"; |
3657 | warn "removing commands"; |
3647 | while (my ($k, $v) = each %INC) { |
3658 | %COMMAND = (); |
3648 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
|
|
3649 | |
3659 | |
|
|
3660 | warn "removing ext/exti commands"; |
|
|
3661 | %EXTCMD = (); |
|
|
3662 | %EXTICMD = (); |
|
|
3663 | |
|
|
3664 | warn "unloading/nuking all extensions"; |
|
|
3665 | for my $pkg (@EXTS) { |
3650 | warn "... unloading $k"; |
3666 | warn "... unloading $pkg"; |
3651 | delete $INC{$k}; |
|
|
3652 | |
3667 | |
3653 | $k =~ s/\.pm$//; |
|
|
3654 | $k =~ s/\//::/g; |
|
|
3655 | |
|
|
3656 | if (my $cb = $k->can ("unload_module")) { |
3668 | if (my $cb = $pkg->can ("unload")) { |
|
|
3669 | eval { |
3657 | $cb->(); |
3670 | $cb->($pkg); |
|
|
3671 | 1 |
|
|
3672 | } or warn "$pkg unloaded, but with errors: $@"; |
|
|
3673 | } |
|
|
3674 | |
|
|
3675 | warn "... clearing $pkg"; |
|
|
3676 | clear_package $pkg; |
3658 | } |
3677 | } |
3659 | |
3678 | |
3660 | Symbol::delete_package $k; |
3679 | warn "unloading all perl modules loaded from $LIBDIR"; |
|
|
3680 | while (my ($k, $v) = each %INC) { |
|
|
3681 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
|
|
3682 | |
|
|
3683 | warn "... unloading $k"; |
|
|
3684 | delete $INC{$k}; |
|
|
3685 | |
|
|
3686 | $k =~ s/\.pm$//; |
|
|
3687 | $k =~ s/\//::/g; |
|
|
3688 | |
|
|
3689 | if (my $cb = $k->can ("unload_module")) { |
|
|
3690 | $cb->(); |
|
|
3691 | } |
|
|
3692 | |
|
|
3693 | clear_package $k; |
3661 | } |
3694 | } |
3662 | |
3695 | |
3663 | warn "getting rid of safe::, as good as possible"; |
3696 | warn "getting rid of safe::, as good as possible"; |
3664 | Symbol::delete_package "safe::$_" |
3697 | clear_package "safe::$_" |
3665 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3698 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3666 | |
3699 | |
3667 | warn "unloading cf.pm \"a bit\""; |
3700 | warn "unloading cf.pm \"a bit\""; |
3668 | delete $INC{"cf.pm"}; |
3701 | delete $INC{"cf.pm"}; |
3669 | delete $INC{"cf/pod.pm"}; |
3702 | delete $INC{"cf/pod.pm"}; |
3670 | |
3703 | |
3671 | # don't, removes xs symbols, too, |
3704 | # don't, removes xs symbols, too, |
3672 | # and global variables created in xs |
3705 | # and global variables created in xs |
3673 | #Symbol::delete_package __PACKAGE__; |
3706 | #clear_package __PACKAGE__; |
3674 | |
3707 | |
3675 | warn "unload completed, starting to reload now"; |
3708 | warn "unload completed, starting to reload now"; |
3676 | |
3709 | |
3677 | warn "reloading cf.pm"; |
3710 | warn "reloading cf.pm"; |
3678 | require cf; |
3711 | require cf; |
3679 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3712 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3680 | |
3713 | |
3681 | warn "loading config and database again"; |
3714 | warn "loading config and database again"; |
3682 | cf::reload_config; |
3715 | cf::reload_config; |
3683 | |
3716 | |
3684 | warn "loading extensions"; |
3717 | warn "loading extensions"; |
3685 | cf::load_extensions; |
3718 | cf::load_extensions; |
3686 | |
3719 | |
3687 | warn "reattaching attachments to objects/players"; |
3720 | warn "reattaching attachments to objects/players"; |
3688 | _global_reattach; # objects, sockets |
3721 | _global_reattach; # objects, sockets |
3689 | warn "reattaching attachments to maps"; |
3722 | warn "reattaching attachments to maps"; |
3690 | reattach $_ for values %MAP; |
3723 | reattach $_ for values %MAP; |
3691 | warn "reattaching attachments to players"; |
3724 | warn "reattaching attachments to players"; |
3692 | reattach $_ for values %PLAYER; |
3725 | reattach $_ for values %PLAYER; |
3693 | |
3726 | |
3694 | warn "leaving sync_job"; |
3727 | warn "leaving sync_job"; |
3695 | |
3728 | |
3696 | 1 |
3729 | 1 |
3697 | } or do { |
3730 | } or do { |
3698 | warn $@; |
3731 | warn $@; |
3699 | cf::cleanup "error while reloading, exiting."; |
3732 | cf::cleanup "error while reloading, exiting."; |
3700 | }; |
3733 | }; |
3701 | |
3734 | |
3702 | warn "reloaded"; |
3735 | warn "reloaded"; |
|
|
3736 | --$RELOAD; |
|
|
3737 | } |
3703 | }; |
3738 | }; |
3704 | |
3739 | |
3705 | our $RELOAD_WATCHER; # used only during reload |
3740 | our $RELOAD_WATCHER; # used only during reload |
3706 | |
3741 | |
3707 | sub reload_perl() { |
3742 | sub reload_perl() { |
… | |
… | |
3793 | BDB::max_poll_reqs $TICK * 0.1; |
3828 | BDB::max_poll_reqs $TICK * 0.1; |
3794 | $AnyEvent::BDB::WATCHER->priority (1); |
3829 | $AnyEvent::BDB::WATCHER->priority (1); |
3795 | |
3830 | |
3796 | unless ($DB_ENV) { |
3831 | unless ($DB_ENV) { |
3797 | $DB_ENV = BDB::db_env_create; |
3832 | $DB_ENV = BDB::db_env_create; |
3798 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
3833 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); |
3799 | | BDB::LOG_AUTOREMOVE, 1); |
3834 | $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; |
|
|
3835 | $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7; |
3800 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
3836 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
3801 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3837 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3802 | |
3838 | |
3803 | cf::sync_job { |
3839 | cf::sync_job { |
3804 | eval { |
3840 | eval { |
… | |
… | |
3830 | { |
3866 | { |
3831 | # configure IO::AIO |
3867 | # configure IO::AIO |
3832 | |
3868 | |
3833 | IO::AIO::min_parallel 8; |
3869 | IO::AIO::min_parallel 8; |
3834 | IO::AIO::max_poll_time $TICK * 0.1; |
3870 | IO::AIO::max_poll_time $TICK * 0.1; |
3835 | #undef $AnyEvent::AIO::WATCHER; |
3871 | undef $AnyEvent::AIO::WATCHER; |
3836 | } |
3872 | } |
3837 | |
3873 | |
3838 | my $_log_backtrace; |
3874 | my $_log_backtrace; |
3839 | |
3875 | |
3840 | sub _log_backtrace { |
3876 | sub _log_backtrace { |
… | |
… | |
3878 | # load additional modules |
3914 | # load additional modules |
3879 | use cf::pod; |
3915 | use cf::pod; |
3880 | |
3916 | |
3881 | END { cf::emergency_save } |
3917 | END { cf::emergency_save } |
3882 | |
3918 | |
3883 | evthread_start IO::AIO::poll_fileno; |
|
|
3884 | |
|
|
3885 | 1 |
3919 | 1 |
3886 | |
3920 | |