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.427 by root, Sat Apr 26 12:25:45 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) {
… …
2459can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2468dialogue with the given NPC character.
2461 2469
2462=cut 2470=cut
2463 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2464# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2487# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2479 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2503
2482 } else { 2504 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2507 }
2486 } 2508 }
2487} 2509}
2488 2510
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2596Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2598that 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
2599the 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
2600be called at the end of this process. 2622be called at the end of this process.
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 >>.
2601 2626
2602=cut 2627=cut
2603 2628
2604our $GOTOGEN; 2629our $GOTOGEN;
2605 2630
… …
2684} 2709}
2685 2710
2686sub prepare_random_map { 2711sub prepare_random_map {
2687 my ($exit) = @_; 2712 my ($exit) = @_;
2688 2713
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2716 # that depends on the exit object
2694 2717
2695 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2697 if ($exit->map) { 2720 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2702 } 2727 }
2703 2728
2704 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2705 2730
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2737 undef $fh;
2713 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2714 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2717 } 2746 }
2718} 2747}
2719 2748
2720sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2722 2751
2723 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2724 2753
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2754 $self->enter_link;
2737 2755
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2756 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2744 2758
2745 $self->deactivate_recursive; # just to be sure
2746 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
2747 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2748 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
2749 1; 2780 1
2750 }) { 2781 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2752 . "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. "
2753 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2876 if ($self->can_msg) { 2907 if ($self->can_msg) {
2877 # default colour, mask it out 2908 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2880 2911
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2882 [$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);
2883 } else { 2928 } else {
2884 if ($color >= 0) { 2929 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2886 for ($msg) { 2931 for ($msg) {
2887 1 while 2932 1 while
… …
3101 3146
3102=cut 3147=cut
3103 3148
3104for ( 3149for (
3105 ["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
3106 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3152 decrease split destroy change_exp)],
3108 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
3110 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
3111) { 3156) {
3112 no strict 'refs'; 3157 no strict 'refs';
… …
3372 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3373} 3418}
3374 3419
3375sub init { 3420sub init {
3376 my $guard = freeze_mainloop; 3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3377 3424
3378 reload_resources; 3425 reload_resources;
3379} 3426}
3380 3427
3381sub reload_config { 3428sub reload_config {
… …
3414 reload_config; 3461 reload_config;
3415 db_init; 3462 db_init;
3416 load_extensions; 3463 load_extensions;
3417 3464
3418 $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
3419 evthread_start IO::AIO::poll_fileno;
3420 } 3466 }
3421 3467
3422 EV::loop; 3468 EV::loop;
3423} 3469}
3424 3470
… …
3559 3605
3560 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3607 if $make_core;
3562} 3608}
3563 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
3564sub do_reload_perl() { 3638sub do_reload_perl() {
3565 # can/must only be called in main 3639 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3567 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3568 return; 3642 return;
3569 } 3643 }
3570 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3571 warn "reloading..."; 3648 warn "reloading...";
3572 3649
3573 warn "entering sync_job"; 3650 warn "entering sync_job";
3574 3651
3575 cf::sync_job { 3652 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3654 cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3579 3656
3580 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3582 3659
3583 # 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
3584 3661
3585 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3591 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = ();
3599
3600 warn "removing commands";
3601 %COMMAND = ();
3602
3603 warn "removing ext/exti commands";
3604 %EXTCMD = ();
3605 %EXTICMD = ();
3606
3607 warn "unloading/nuking all extensions";
3608 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg";
3610
3611 if (my $cb = $pkg->can ("unload")) {
3612 eval {
3613 $cb->($pkg);
3614 1
3615 } or warn "$pkg unloaded, but with errors: $@";
3616 } 3665 }
3617 3666
3618 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3619 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3620 } 3669 %EXT_CORO = ();
3621 3670
3622 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3623 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3626 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3627 delete $INC{$k};
3628 3681
3629 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g;
3631
3632 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3633 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3634 } 3691 }
3635 3692
3636 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;
3637 } 3708 }
3638 3709
3639 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3641 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);
3642 3713
3643 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3646 3717
3647 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3648 # and global variables created in xs 3719 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3650 3721
3651 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3652 3723
3653 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3654 require cf; 3725 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3656 3727
3657 warn "loading config and database again"; 3728 warn "loading config and database again";
3658 cf::reload_config; 3729 cf::reload_config;
3659 3730
3660 warn "loading extensions"; 3731 warn "loading extensions";
3661 cf::load_extensions; 3732 cf::load_extensions;
3662 3733
3663 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3666 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3669 3740
3670 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3671 3742
3672 1 3743 1
3673 } or do { 3744 } or do {
3674 warn $@; 3745 warn $@;
3675 cf::cleanup "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3676 }; 3747 };
3677 3748
3678 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3679}; 3752};
3680 3753
3681our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3682 3755
3683sub reload_perl() { 3756sub reload_perl() {
… …
3765{ 3838{
3766 # configure BDB 3839 # configure BDB
3767 3840
3768 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3769 BDB::max_poll_reqs $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 3843 $AnyEvent::BDB::WATCHER->priority (1);
3771 3844
3772 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | 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;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 3852
3779 cf::sync_job { 3853 cf::sync_job {
3780 eval { 3854 eval {
… …
3806{ 3880{
3807 # configure IO::AIO 3881 # configure IO::AIO
3808 3882
3809 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 3885 undef $AnyEvent::AIO::WATCHER;
3812} 3886}
3813 3887
3814my $_log_backtrace; 3888my $_log_backtrace;
3815 3889
3816sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

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