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.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 2008 UTC

… …
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
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
36use Coro 4.50 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 97our %RESOURCE;
93 98
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 101our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
99 103
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 107our $DB_ENV;
105 108
… …
242for my $pkg (qw( 245for my $pkg (qw(
243 cf::global cf::attachable 246 cf::global cf::attachable
244 cf::object cf::object::player 247 cf::object cf::object::player
245 cf::client cf::player 248 cf::client cf::player
246 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
247 cf::map cf::party cf::region 251 cf::party cf::region
248)) { 252)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 254}
252 255
253$EV::DIED = sub { 256$EV::DIED = sub {
254 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
1085 1088
1086sub reattach { 1089sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1091 my ($obj) = @_;
1089 1092
1093 # no longer needed after getting rid of delete_package?
1090 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
1091 1095
1092 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1093 1097
1094 @$registry = (); 1098 @$registry = ();
1095 1099
… …
1331 1335
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1338
1335 $ext{source} = 1339 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1338 . $source 1342 . $source
1339 . "\n};\n1"; 1343 . "\n};\n1";
1340 1344
1341 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1519 my ($pl) = @_; 1523 my ($pl) = @_;
1520 1524
1521 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1522 1526
1523 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1529
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1530 1536
1531 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1619 1625
1620Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1621 1627
1622=cut 1628=cut
1623 1629
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod { 1630sub expand_cfpod {
1636 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1637 1632
1633 my @nest = [qr<\G$>, undef, ""];
1638 my $xml; 1634 my $xml;
1639 1635
1636 for ($pod) {
1640 while () { 1637 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group; 1639 $xml .= $1;
1648 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1649 ([BCGHITU]) 1641 $xml .= " ";
1650 < 1642 } elsif (/\G\n/xgcs) {
1651 (?: 1643 $xml .= "\n";
1652 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1653 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1654 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1655 > 1647 $delim = qr{\G\Q$delim};
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659 1648
1649 my $cb;
1650
1660 if ($code eq "B") { 1651 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1668 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1670 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1671 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1672 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1673 $xml .= expand_cfpod ($self, $data); 1661 };
1674 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1675 $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>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "") 1667 "",
1678 [$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 .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1679 } else { 1699 } else {
1680 $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 }
1681 } 1707 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 } 1708 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 } 1709 }
1700 1710
1701 $xml 1711 $xml
1702} 1712}
1703
1704no re 'eval';
1705 1713
1706sub hintmode { 1714sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode} 1716 $_[0]{hintmode}
1709} 1717}
… …
2031 2039
2032 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
2034 2042
2035 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2046
2039 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
2040 or return; 2048 or return;
2041 2049
2042 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
2045 or return; 2053 or return;
2046 2054
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2050 undef $guard1; 2059 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2060 $map->reset;
2053 return find $path; 2061 return find $path;
2054 } 2062 }
2055 2063
2056 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2092 $f->skip_block;
2085 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2086 or return; 2094 or return;
2087 2095
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2089 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2090 2098
2091 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2100 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2611her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2622be called at the end of this process.
2615 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2616=cut 2627=cut
2617 2628
2618our $GOTOGEN; 2629our $GOTOGEN;
2619 2630
2620sub cf::object::player::goto { 2631sub cf::object::player::goto {
… …
2698} 2709}
2699 2710
2700sub prepare_random_map { 2711sub prepare_random_map {
2701 my ($exit) = @_; 2712 my ($exit) = @_;
2702 2713
2703 my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2706 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2707 # that depends on the exit object 2716 # that depends on the exit object
2708 2717
2709 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2711 if ($exit->map) { 2720 if ($exit->map) {
2712 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2713 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2714 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2715 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2716 } 2727 }
2717 2728
2718 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2719 2730
2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2725 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2726 undef $fh; 2737 undef $fh;
2727 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2728 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2729 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2730 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2731 } 2746 }
2732} 2747}
2733 2748
2734sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2735 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2736 2751
2737 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2738 2753
2739 if ($exit->slaying eq "/!") {
2740 #TODO: this should de-fi-ni-te-ly not be a sync-job
2741 # the problem is that $exit might not survive long enough
2742 # so it needs to be done right now, right here
2743 cf::sync_job { prepare_random_map $exit };
2744 }
2745
2746 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747 my $hp = $exit->stats->hp;
2748 my $sp = $exit->stats->sp;
2749
2750 $self->enter_link; 2754 $self->enter_link;
2751 2755
2752 # if exit is damned, update players death & WoR home-position
2753 $self->contr->savebed ($slaying, $hp, $sp)
2754 if $exit->flag (FLAG_DAMNED);
2755
2756 (async { 2756 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2758 2758
2759 $self->deactivate_recursive; # just to be sure
2760 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2761 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2762 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2763 1; 2780 1
2764 }) { 2781 }) {
2765 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2766 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2767 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2768 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2890 if ($self->can_msg) { 2907 if ($self->can_msg) {
2891 # default colour, mask it out 2908 # default colour, mask it out
2892 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2893 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2894 2911
2895 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2896 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2897 } else { 2928 } else {
2898 if ($color >= 0) { 2929 if ($color >= 0) {
2899 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2900 for ($msg) { 2931 for ($msg) {
2901 1 while 2932 1 while
… …
3115 3146
3116=cut 3147=cut
3117 3148
3118for ( 3149for (
3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
3121 decrease split destroy)], 3152 decrease split destroy change_exp)],
3122 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
3123 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
3124 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
3125) { 3156) {
3126 no strict 'refs'; 3157 no strict 'refs';
… …
3386 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3387} 3418}
3388 3419
3389sub init { 3420sub init {
3390 my $guard = freeze_mainloop; 3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3391 3424
3392 reload_resources; 3425 reload_resources;
3393} 3426}
3394 3427
3395sub reload_config { 3428sub reload_config {
… …
3428 reload_config; 3461 reload_config;
3429 db_init; 3462 db_init;
3430 load_extensions; 3463 load_extensions;
3431 3464
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 } 3466 }
3435 3467
3436 EV::loop; 3468 EV::loop;
3437} 3469}
3438 3470
… …
3573 3605
3574 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3575 if $make_core; 3607 if $make_core;
3576} 3608}
3577 3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3637
3578sub do_reload_perl() { 3638sub do_reload_perl() {
3579 # can/must only be called in main 3639 # can/must only be called in main
3580 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3581 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3582 return; 3642 return;
3583 } 3643 }
3584 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3585 warn "reloading..."; 3648 warn "reloading...";
3586 3649
3587 warn "entering sync_job"; 3650 warn "entering sync_job";
3588 3651
3589 cf::sync_job { 3652 cf::sync_job {
3590 cf::write_runtime_sync; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3591 cf::emergency_save; 3654 cf::emergency_save;
3592 cf::write_runtime_sync; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3593 3656
3594 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3595 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3596 3659
3597 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3598 3661
3599 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3600 for (;;) {
3601 BDB::flush;
3602 IO::AIO::flush;
3603 Coro::cede_notself;
3604 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3605 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3606 }
3607
3608 ++$RELOAD;
3609
3610 warn "cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = ();
3613
3614 warn "removing commands";
3615 %COMMAND = ();
3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg";
3624
3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 } 3665 }
3631 3666
3632 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3633 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3634 } 3669 %EXT_CORO = ();
3635 3670
3636 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3637 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3640 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3641 delete $INC{$k};
3642 3681
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3647 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3648 } 3691 }
3649 3692
3650 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3651 } 3708 }
3652 3709
3653 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3654 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 3713
3657 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3660 3717
3661 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3662 # and global variables created in xs 3719 # and global variables created in xs
3663 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3664 3721
3665 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3666 3723
3667 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3668 require cf; 3725 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3670 3727
3671 warn "loading config and database again"; 3728 warn "loading config and database again";
3672 cf::reload_config; 3729 cf::reload_config;
3673 3730
3674 warn "loading extensions"; 3731 warn "loading extensions";
3675 cf::load_extensions; 3732 cf::load_extensions;
3676 3733
3677 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3683 3740
3684 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3685 3742
3686 1 3743 1
3687 } or do { 3744 } or do {
3688 warn $@; 3745 warn $@;
3689 cf::cleanup "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3690 }; 3747 };
3691 3748
3692 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3693}; 3752};
3694 3753
3695our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3696 3755
3697sub reload_perl() { 3756sub reload_perl() {
… …
3779{ 3838{
3780 # configure BDB 3839 # configure BDB
3781 3840
3782 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3783 BDB::max_poll_reqs $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3784 $Coro::BDB::WATCHER->priority (1); 3843 $AnyEvent::BDB::WATCHER->priority (1);
3785 3844
3786 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3787 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3789 | BDB::LOG_AUTOREMOVE, 1); 3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3792 3852
3793 cf::sync_job { 3853 cf::sync_job {
3794 eval { 3854 eval {
… …
3820{ 3880{
3821 # configure IO::AIO 3881 # configure IO::AIO
3822 3882
3823 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3824 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3825 $Coro::AIO::WATCHER->priority (1); 3885 undef $AnyEvent::AIO::WATCHER;
3826} 3886}
3827 3887
3828my $_log_backtrace; 3888my $_log_backtrace;
3829 3889
3830sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

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