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.422 by root, Tue Apr 15 20:46:55 2008 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 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: @_";
… …
427 } 430 }
428 } 431 }
429}; 432};
430 433
431sub get_slot($;$$) { 434sub get_slot($;$$) {
432 return if tick_inhibit; 435 return if tick_inhibit || $Coro::current == $Coro::main;
433 436
434 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
435 438
436 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
… …
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 }
… …
1518 my ($pl) = @_; 1523 my ($pl) = @_;
1519 1524
1520 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1521 1526
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 have 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
… …
1614} 1622}
1615 1623
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1617 1625
1618Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1619
1620=cut
1621
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 {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</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") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
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 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1627
1709=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1710 1629
1711Sends an ext reply to the player. 1630Sends an ext reply to the player.
1712 1631
… …
2029 1948
2030 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
2032 1951
2033 $cf::MAP{$path} || do { 1952 $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 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1955
2037 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
2038 or return; 1957 or return;
2039 1958
2040 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 1962 or return;
2044 1963
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
2048 undef $guard1; 1968 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1969 $map->reset;
2051 return find $path; 1970 return find $path;
2052 } 1971 }
2053 1972
2054 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2001 $f->skip_block;
2083 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
2084 or return; 2003 or return;
2085 2004
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
2087 if delete $self->{load_original}; 2006 if delete $self->{load_original};
2088 2007
2089 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2009 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2377dialogue with the given NPC character.
2459 2378
2460=cut 2379=cut
2461 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2462# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2396# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2412
2480 } else { 2413 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2416 }
2484 } 2417 }
2485} 2418}
2486 2419
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2594Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2529that 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 2530the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2599 2535
2600=cut 2536=cut
2601 2537
2602our $GOTOGEN; 2538our $GOTOGEN;
2603 2539
… …
2682} 2618}
2683 2619
2684sub prepare_random_map { 2620sub prepare_random_map {
2685 my ($exit) = @_; 2621 my ($exit) = @_;
2686 2622
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2625 # that depends on the exit object
2692 2626
2693 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2629 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2700 } 2636 }
2701 2637
2702 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2703 2639
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2646 undef $fh;
2711 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2712 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2715 } 2655 }
2716} 2656}
2717 2657
2718sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2720 2660
2721 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2722 2662
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; 2663 $self->enter_link;
2735 2664
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 { 2665 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2742 2667
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2745 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2746 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2747 1; 2689 1
2748 }) { 2690 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2750 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2832 id => "infobox", 2774 id => "infobox",
2833 title => "Map Info", 2775 title => "Map Info",
2834 reply => undef, 2776 reply => undef,
2835 tooltip => "Information related to the maps", 2777 tooltip => "Information related to the maps",
2836 }, 2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2837); 2785);
2838 2786
2839sub cf::client::send_msg { 2787sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2789
… …
2868 if ($self->can_msg) { 2816 if ($self->can_msg) {
2869 # default colour, mask it out 2817 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2872 2820
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2875 } else { 2837 } else {
2876 if ($color >= 0) { 2838 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2840 for ($msg) {
2879 1 while 2841 1 while
… …
3078 3040
3079The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
3080 3042
3081 cf::object 3043 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3044 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
3084 3046
3085 cf::object::player 3047 cf::object::player
3086 player 3048 player
3087 3049
3088 cf::player 3050 cf::player
… …
3093 3055
3094=cut 3056=cut
3095 3057
3096for ( 3058for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3061 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
3103) { 3065) {
3104 no strict 'refs'; 3066 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3314 } 3276 }
3315}; 3277};
3316 3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
3317sub reload_regions { 3289sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3291 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3293
… …
3334} 3306}
3335 3307
3336sub reload_archetypes { 3308sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3311}
3345 3312
3346sub reload_treasures { 3313sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3349} 3316}
3350 3317
3351sub reload_resources { 3318sub reload_resources {
3352 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3353 3320
3321 reload_facedata;
3322 reload_archetypes;
3354 reload_regions; 3323 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3324 reload_treasures;
3359 3325
3360 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3361} 3327}
3362 3328
3363sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3364 reload_resources; 3334 reload_resources;
3365} 3335}
3366 3336
3367sub reload_config { 3337sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3364 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3396 }; 3366 };
3397 3367
3368 {
3369 my $guard = freeze_mainloop;
3398 reload_config; 3370 reload_config;
3399 db_init; 3371 db_init;
3400 load_extensions; 3372 load_extensions;
3401 3373
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3375 }
3376
3404 EV::loop; 3377 EV::loop;
3405} 3378}
3406 3379
3407############################################################################# 3380#############################################################################
3408# initialisation and cleanup 3381# initialisation and cleanup
… …
3541 3514
3542 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3516 if $make_core;
3544} 3517}
3545 3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3546
3546sub do_reload_perl() { 3547sub do_reload_perl() {
3547 # can/must only be called in main 3548 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3550 return; 3551 return;
3551 } 3552 }
3552 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3553 warn "reloading..."; 3557 warn "reloading...";
3554 3558
3555 warn "entering sync_job"; 3559 warn "entering sync_job";
3556 3560
3557 cf::sync_job { 3561 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3563 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3561 3565
3562 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3568
3565 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3566 3570
3567 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3574 }
3599 3575
3600 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3602 } 3578 %EXT_CORO = ();
3603 3579
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3590
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3615 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3616 } 3600 }
3617 3601
3618 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3619 } 3617 }
3620 3618
3621 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3622
3625 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3628 3626
3629 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3628 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3632 3630
3633 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3634 3632
3635 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3636 require cf; 3634 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3636
3639 warn "loading config and database again"; 3637 warn "loading config and database again";
3640 cf::reload_config; 3638 cf::reload_config;
3641 3639
3642 warn "loading extensions"; 3640 warn "loading extensions";
3643 cf::load_extensions; 3641 cf::load_extensions;
3644 3642
3645 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3651 3649
3652 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3653 3651
3654 1 3652 1
3655 } or do { 3653 } or do {
3656 warn $@; 3654 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3658 }; 3656 };
3659 3657
3660 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3661}; 3661};
3662 3662
3663our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3664 3664
3665sub reload_perl() { 3665sub reload_perl() {
… …
3690 3690
3691our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3693 3693
3694sub wait_for_tick { 3694sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3696
3698 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3699 $signal->wait;
3701} 3700}
3702 3701
3703sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3704
3707 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3707 $signal->wait;
3710} 3708}
… …
3749{ 3747{
3750 # configure BDB 3748 # configure BDB
3751 3749
3752 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3752 $AnyEvent::BDB::WATCHER->priority (1);
3755 3753
3756 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3761
3763 cf::sync_job { 3762 cf::sync_job {
3764 eval { 3763 eval {
… …
3790{ 3789{
3791 # configure IO::AIO 3790 # configure IO::AIO
3792 3791
3793 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3794 undef $AnyEvent::AIO::WATCHER;
3796} 3795}
3797 3796
3798my $_log_backtrace; 3797my $_log_backtrace;
3799 3798
3800sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

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