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.413 by root, Sun Apr 6 16:13:20 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.32 (); 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($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
432 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
433 438
434 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
436 441
… …
547 reset_signals; 552 reset_signals;
548 &$cb 553 &$cb
549 }, @args; 554 }, @args;
550 555
551 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
552} 584}
553 585
554=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
555 587
556Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
1056 1088
1057sub reattach { 1089sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1091 my ($obj) = @_;
1060 1092
1093 # no longer needed after getting rid of delete_package?
1061 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
1062 1095
1063 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1064 1097
1065 @$registry = (); 1098 @$registry = ();
1066 1099
… …
1112 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1115 1148
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1153 aio_close $fh;
1121 1154
1122 if (@$objs) { 1155 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1161 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1163 }
1131 } else { 1164 } else {
1132 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1133 } 1166 }
… …
1302 1335
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1338
1306 $ext{source} = 1339 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1309 . $source 1342 . $source
1310 . "\n};\n1"; 1343 . "\n};\n1";
1311 1344
1312 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1427 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1461 or return;
1429 1462
1430 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1431 or return; 1464 or return;
1465
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1435 } 1469 }
1436 } 1470 }
… …
1446 1480
1447 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1448 1482
1449 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1451 1487
1452 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1489 cf::cede_to_tick;
1454} 1490}
1455 1491
… …
1487 my ($pl) = @_; 1523 my ($pl) = @_;
1488 1524
1489 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1490 1526
1491 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1492 $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
1493 1529
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1498 1536
1499 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1577
1540 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1541 my $path = path $login; 1579 my $path = path $login;
1542 1580
1543 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1587 }
1549 1588
… …
1586 1625
1587Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1588 1627
1589=cut 1628=cut
1590 1629
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod { 1630sub expand_cfpod {
1603 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1604 1632
1633 my @nest = [qr<\G$>, undef, ""];
1605 my $xml; 1634 my $xml;
1606 1635
1636 for ($pod) {
1607 while () { 1637 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group; 1639 $xml .= $1;
1615 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1616 ([BCGHITU]) 1641 $xml .= " ";
1617 < 1642 } elsif (/\G\n/xgcs) {
1618 (?: 1643 $xml .= "\n";
1619 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1620 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1621 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1622 > 1647 $delim = qr{\G\Q$delim};
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626 1648
1649 my $cb;
1650
1627 if ($code eq "B") { 1651 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1635 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1637 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1638 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1639 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1640 $xml .= expand_cfpod ($self, $data); 1661 };
1641 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1642 $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>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "") 1667 "",
1645 [$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 .= ">";
1646 } else { 1699 } else {
1647 $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 }
1648 } 1707 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 } 1708 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 } 1709 }
1667 1710
1668 $xml 1711 $xml
1669} 1712}
1670
1671no re 'eval';
1672 1713
1673sub hintmode { 1714sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode} 1716 $_[0]{hintmode}
1676} 1717}
… …
1748our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1750 1791
1751sub generate_random_map { 1792sub generate_random_map {
1752 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1753 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1798 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1923
1880# the temporary/swap location 1924# the temporary/swap location
1881sub save_path { 1925sub save_path {
1882 my ($self) = @_; 1926 my ($self) = @_;
1883 1927
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1886} 1930}
1887 1931
1888# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1889sub uniq_path { 1933sub uniq_path {
1890 my ($self) = @_; 1934 my ($self) = @_;
1891 1935
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1894} 1938}
1895 1939
1896# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1897# all maps in C++... 1941# all maps in C++...
… …
1995 2039
1996 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1998 2042
1999 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 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";
2002 2046
2003 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
2004 or return; 2048 or return;
2005 2049
2006 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 2053 or return;
2010 2054
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2014 undef $guard1; 2059 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2060 $map->reset;
2017 return find $path; 2061 return find $path;
2018 } 2062 }
2019 2063
2020 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2092 $f->skip_block;
2049 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2050 or return; 2094 or return;
2051 2095
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2053 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2054 2098
2055 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2100 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2083 } 2127 }
2084 2128
2085 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2087 2131
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2133 }
2090 2134
2091 $self->post_load; 2135 $self->post_load;
2092} 2136}
2093 2137
… …
2151 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2152 2196
2153 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2154 2198
2155 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2201 }
2158 2202
2159 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2160 2204
2161 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2242 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2201 }; 2245 };
2202 2246
2247 cf::get_slot 0.02;
2248
2203 if ($uniq) { 2249 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2252 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2261 $self->save;
2216 2262
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2264
2219 return if $self->players; 2265 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2222 2268
2223 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2224 2270
2225 $self->deactivate; 2271 $self->deactivate;
… …
2343 2389
2344sub unique_maps() { 2390sub unique_maps() {
2345 [ 2391 [
2346 map { 2392 map {
2347 utf8::decode $_; 2393 utf8::decode $_;
2348 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2349 ? normalise $_ 2397 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2399 ]
2353} 2400}
2354 2401
2355package cf;
2356
2357=back 2402=back
2358 2403
2359=head3 cf::object 2404=head3 cf::object
2360 2405
2361=cut 2406=cut
… …
2364 2409
2365=over 4 2410=over 4
2366 2411
2367=item $ob->inv_recursive 2412=item $ob->inv_recursive
2368 2413
2369Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2370 2416
2371=cut 2417=cut
2372 2418
2373sub inv_recursive_; 2419sub inv_recursive_;
2374sub inv_recursive_ { 2420sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2380} 2426}
2381 2427
2382=item $ref = $ob->ref 2428=item $ref = $ob->ref
2383 2429
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2385 2431
2386=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2387 2433
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2435even if the object actually exists. May block.
… …
2421can 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
2422dialogue with the given NPC character. 2468dialogue with the given NPC character.
2423 2469
2424=cut 2470=cut
2425 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
2426# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2487# with dialog boxes.
2428#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
2429sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2442 $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));
2443 2503
2444 } else { 2504 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2507 }
2448 } 2508 }
2449} 2509}
2450 2510
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2558Moves 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
2559her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2560that 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
2561the 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
2562be 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 >>.
2563 2626
2564=cut 2627=cut
2565 2628
2566our $GOTOGEN; 2629our $GOTOGEN;
2567 2630
… …
2646} 2709}
2647 2710
2648sub prepare_random_map { 2711sub prepare_random_map {
2649 my ($exit) = @_; 2712 my ($exit) = @_;
2650 2713
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2716 # that depends on the exit object
2656 2717
2657 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2720 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2664 } 2727 }
2665 2728
2666 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2667 2730
2668 my $data = cf::encode_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2671 2734
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2737 undef $fh;
2675 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2676 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2679 } 2746 }
2680} 2747}
2681 2748
2682sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2684 2751
2685 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2686 2753
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2754 $self->enter_link;
2699 2755
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2756 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2706 2758
2707 $self->deactivate_recursive; # just to be sure
2708 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
2709 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2710 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
2711 1; 2780 1
2712 }) { 2781 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2865 id => "infobox",
2797 title => "Map Info", 2866 title => "Map Info",
2798 reply => undef, 2867 reply => undef,
2799 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2800 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2801); 2876);
2802 2877
2803sub cf::client::send_msg { 2878sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2880
… …
2832 if ($self->can_msg) { 2907 if ($self->can_msg) {
2833 # default colour, mask it out 2908 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2836 2911
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2838 [$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);
2839 } else { 2928 } else {
2840 if ($color >= 0) { 2929 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2931 for ($msg) {
2843 1 while 2932 1 while
… …
3042 3131
3043The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
3044 3133
3045 cf::object 3134 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3135 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3136 insert remove name archname title slaying race decrease split
3048 3137
3049 cf::object::player 3138 cf::object::player
3050 player 3139 player
3051 3140
3052 cf::player 3141 cf::player
… …
3057 3146
3058=cut 3147=cut
3059 3148
3060for ( 3149for (
3061 ["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
3062 insert remove inv name archname title slaying race 3151 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3152 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
3067) { 3156) {
3068 no strict 'refs'; 3157 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
3278 } 3367 }
3279}; 3368};
3280 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
3281sub reload_regions { 3380sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3381 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3382 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3384
… …
3298} 3397}
3299 3398
3300sub reload_archetypes { 3399sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3402}
3309 3403
3310sub reload_treasures { 3404sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
3313} 3407}
3314 3408
3315sub reload_resources { 3409sub reload_resources {
3316 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
3317 3411
3412 reload_facedata;
3413 reload_archetypes;
3318 reload_regions; 3414 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3415 reload_treasures;
3323 3416
3324 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
3325} 3418}
3326 3419
3327sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3328 reload_resources; 3425 reload_resources;
3329} 3426}
3330 3427
3331sub reload_config { 3428sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3360 }; 3457 };
3361 3458
3459 {
3460 my $guard = freeze_mainloop;
3362 reload_config; 3461 reload_config;
3363 db_init; 3462 db_init;
3364 load_extensions; 3463 load_extensions;
3365 3464
3366 $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
3367 evthread_start IO::AIO::poll_fileno; 3466 }
3467
3368 EV::loop; 3468 EV::loop;
3369} 3469}
3370 3470
3371############################################################################# 3471#############################################################################
3372# initialisation and cleanup 3472# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3380 }; 3480 };
3381 } 3481 }
3382} 3482}
3383 3483
3384sub write_runtime { 3484sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3386 3486
3387 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3389 3489
… …
3415 and return; 3515 and return;
3416 3516
3417 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3418 3518
3419 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3420} 3563}
3421 3564
3422sub emergency_save() { 3565sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3424 3567
… …
3446 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3447 3590
3448 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3451 }; 3598 };
3452 3599
3453 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3454} 3601}
3455 3602
… …
3457 my ($make_core) = @_; 3604 my ($make_core) = @_;
3458 3605
3459 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3607 if $make_core;
3461} 3608}
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
3462 3637
3463sub do_reload_perl() { 3638sub do_reload_perl() {
3464 # can/must only be called in main 3639 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3467 return; 3642 return;
3468 } 3643 }
3469 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3470 warn "reloading..."; 3648 warn "reloading...";
3471 3649
3472 warn "entering sync_job"; 3650 warn "entering sync_job";
3473 3651
3474 cf::sync_job { 3652 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3654 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3478 3656
3479 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3659
3482 # 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
3483 3661
3484 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3665 }
3516 3666
3517 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3519 } 3669 %EXT_CORO = ();
3520 3670
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3681
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3532 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3533 } 3691 }
3534 3692
3535 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;
3536 } 3708 }
3537 3709
3538 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3540 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);
3541 3713
3542 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3545 3717
3546 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3719 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3549 3721
3550 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3551 3723
3552 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3553 require cf; 3725 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3727
3556 warn "loading config and database again"; 3728 warn "loading config and database again";
3557 cf::reload_config; 3729 cf::reload_config;
3558 3730
3559 warn "loading extensions"; 3731 warn "loading extensions";
3560 cf::load_extensions; 3732 cf::load_extensions;
3561 3733
3562 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3568 3740
3569 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3570 3742
3571 1 3743 1
3572 } or do { 3744 } or do {
3573 warn $@; 3745 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3575 }; 3747 };
3576 3748
3577 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3578}; 3752};
3579 3753
3580our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3581 3755
3582sub reload_perl() { 3756sub reload_perl() {
… …
3607 3781
3608our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3610 3784
3611sub wait_for_tick { 3785sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3787
3615 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3790 $signal->wait;
3618} 3791}
3619 3792
3620sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3795
3624 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3798 $signal->wait;
3627} 3799}
… …
3637 3809
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3812 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3813 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3814 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3815 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3816 };
3645 } 3817 }
3646 3818
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3838{
3667 # configure BDB 3839 # configure BDB
3668 3840
3669 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3842 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3843 $AnyEvent::BDB::WATCHER->priority (1);
3672 3844
3673 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | 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;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3852
3680 cf::sync_job { 3853 cf::sync_job {
3681 eval { 3854 eval {
… …
3707{ 3880{
3708 # configure IO::AIO 3881 # configure IO::AIO
3709 3882
3710 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3885 undef $AnyEvent::AIO::WATCHER;
3713} 3886}
3714 3887
3715my $_log_backtrace; 3888my $_log_backtrace;
3716 3889
3717sub _log_backtrace { 3890sub _log_backtrace {

Diff Legend

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