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.424 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 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
… …
1141 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1144 1148
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1153 aio_close $fh;
1150 1154
1151 if (@$objs) { 1155 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1161 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1163 }
1160 } else { 1164 } else {
1161 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1162 } 1166 }
… …
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;
… …
1456 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1461 or return;
1458 1462
1459 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1460 or return; 1464 or return;
1465
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1464 } 1469 }
1465 } 1470 }
… …
1522 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1524 1529
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1529 1536
1530 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1577
1571 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1572 my $path = path $login; 1579 my $path = path $login;
1573 1580
1574 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1587 }
1580 1588
… …
1617 1625
1618Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1619 1627
1620=cut 1628=cut
1621 1629
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod { 1630sub expand_cfpod {
1634 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1635 1632
1633 my @nest = [qr<\G$>, undef, ""];
1636 my $xml; 1634 my $xml;
1637 1635
1636 for ($pod) {
1638 while () { 1637 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group; 1639 $xml .= $1;
1646 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1647 ([BCGHITU]) 1641 $xml .= " ";
1648 < 1642 } elsif (/\G\n/xgcs) {
1649 (?: 1643 $xml .= "\n";
1650 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1651 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1652 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1653 > 1647 $delim = qr{\G\Q$delim};
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657 1648
1649 my $cb;
1650
1658 if ($code eq "B") { 1651 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1666 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1668 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1669 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1670 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1671 $xml .= expand_cfpod ($self, $data); 1661 };
1672 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1673 $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>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "") 1667 "",
1676 [$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 .= ">";
1677 } else { 1699 } else {
1678 $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 }
1679 } 1707 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 } 1708 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 } 1709 }
1698 1710
1699 $xml 1711 $xml
1700} 1712}
1701
1702no re 'eval';
1703 1713
1704sub hintmode { 1714sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode} 1716 $_[0]{hintmode}
1707} 1717}
… …
2029 2039
2030 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
2032 2042
2033 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 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";
2036 2046
2037 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
2038 or return; 2048 or return;
2039 2049
2040 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 2053 or return;
2044 2054
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2048 undef $guard1; 2059 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2060 $map->reset;
2051 return find $path; 2061 return find $path;
2052 } 2062 }
2053 2063
2054 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2092 $f->skip_block;
2083 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2084 or return; 2094 or return;
2085 2095
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2087 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2088 2098
2089 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2100 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2457can 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
2458dialogue with the given NPC character. 2468dialogue with the given NPC character.
2459 2469
2460=cut 2470=cut
2461 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
2462# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2487# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2503
2480 } else { 2504 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2507 }
2484 } 2508 }
2485} 2509}
2486 2510
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2626
2600=cut 2627=cut
2601 2628
2602our $GOTOGEN; 2629our $GOTOGEN;
2603 2630
… …
2682} 2709}
2683 2710
2684sub prepare_random_map { 2711sub prepare_random_map {
2685 my ($exit) = @_; 2712 my ($exit) = @_;
2686 2713
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2716 # that depends on the exit object
2692 2717
2693 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2720 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2700 } 2727 }
2701 2728
2702 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2703 2730
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2737 undef $fh;
2711 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2712 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2715 } 2746 }
2716} 2747}
2717 2748
2718sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2720 2751
2721 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2722 2753
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2754 $self->enter_link;
2735 2755
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2756 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2742 2758
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2746 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
2747 1; 2780 1
2748 }) { 2781 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2832 id => "infobox", 2865 id => "infobox",
2833 title => "Map Info", 2866 title => "Map Info",
2834 reply => undef, 2867 reply => undef,
2835 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2836 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2837); 2876);
2838 2877
2839sub cf::client::send_msg { 2878sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2880
… …
3078 3117
3079The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
3080 3119
3081 cf::object 3120 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3121 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
3084 3123
3085 cf::object::player 3124 cf::object::player
3086 player 3125 player
3087 3126
3088 cf::player 3127 cf::player
… …
3093 3132
3094=cut 3133=cut
3095 3134
3096for ( 3135for (
3097 ["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
3098 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3138 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
3103) { 3142) {
3104 no strict 'refs'; 3143 no strict 'refs';
… …
3364 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3365} 3404}
3366 3405
3367sub init { 3406sub init {
3368 my $guard = freeze_mainloop; 3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3369 3410
3370 reload_resources; 3411 reload_resources;
3371} 3412}
3372 3413
3373sub reload_config { 3414sub reload_config {
… …
3406 reload_config; 3447 reload_config;
3407 db_init; 3448 db_init;
3408 load_extensions; 3449 load_extensions;
3409 3450
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 } 3452 }
3413 3453
3414 EV::loop; 3454 EV::loop;
3415} 3455}
3416 3456
… …
3551 3591
3552 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 3593 if $make_core;
3554} 3594}
3555 3595
3596# a safer delete_package, copied from Symbol
3597sub 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
3622our $RELOAD; # how many times to reload
3623
3556sub do_reload_perl() { 3624sub do_reload_perl() {
3557 # can/must only be called in main 3625 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3559 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3560 return; 3628 return;
3561 } 3629 }
3562 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3563 warn "reloading..."; 3634 warn "reloading...";
3564 3635
3565 warn "entering sync_job"; 3636 warn "entering sync_job";
3566 3637
3567 cf::sync_job { 3638 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3640 cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3571 3642
3572 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3574 3645
3575 # 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
3576 3647
3577 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3583 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = ();
3591
3592 warn "removing commands";
3593 %COMMAND = ();
3594
3595 warn "removing ext/exti commands";
3596 %EXTCMD = ();
3597 %EXTICMD = ();
3598
3599 warn "unloading/nuking all extensions";
3600 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg";
3602
3603 if (my $cb = $pkg->can ("unload")) {
3604 eval {
3605 $cb->($pkg);
3606 1
3607 } or warn "$pkg unloaded, but with errors: $@";
3608 } 3651 }
3609 3652
3610 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3611 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3612 } 3655 %EXT_CORO = ();
3613 3656
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3615 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3618 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3619 delete $INC{$k};
3620 3667
3621 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g;
3623
3624 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3625 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3626 } 3677 }
3627 3678
3628 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;
3629 } 3694 }
3630 3695
3631 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3633 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);
3634 3699
3635 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3638 3703
3639 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3705 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3642 3707
3643 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3644 3709
3645 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3646 require cf; 3711 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3648 3713
3649 warn "loading config and database again"; 3714 warn "loading config and database again";
3650 cf::reload_config; 3715 cf::reload_config;
3651 3716
3652 warn "loading extensions"; 3717 warn "loading extensions";
3653 cf::load_extensions; 3718 cf::load_extensions;
3654 3719
3655 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3661 3726
3662 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3663 3728
3664 1 3729 1
3665 } or do { 3730 } or do {
3666 warn $@; 3731 warn $@;
3667 cf::cleanup "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3668 }; 3733 };
3669 3734
3670 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3671}; 3738};
3672 3739
3673our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3674 3741
3675sub reload_perl() { 3742sub reload_perl() {
… …
3757{ 3824{
3758 # configure BDB 3825 # configure BDB
3759 3826
3760 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3761 BDB::max_poll_reqs $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 3829 $AnyEvent::BDB::WATCHER->priority (1);
3763 3830
3764 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | 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;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 3838
3771 cf::sync_job { 3839 cf::sync_job {
3772 eval { 3840 eval {
… …
3798{ 3866{
3799 # configure IO::AIO 3867 # configure IO::AIO
3800 3868
3801 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 3871 undef $AnyEvent::AIO::WATCHER;
3804} 3872}
3805 3873
3806my $_log_backtrace; 3874my $_log_backtrace;
3807 3875
3808sub _log_backtrace { 3876sub _log_backtrace {

Diff Legend

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