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.416 by root, Fri Apr 11 13:59:06 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: @_";
… …
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
… …
1083 1088
1084sub reattach { 1089sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1091 my ($obj) = @_;
1087 1092
1093 # no longer needed after getting rid of delete_package?
1088 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
1089 1095
1090 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1091 1097
1092 @$registry = (); 1098 @$registry = ();
1093 1099
… …
1139 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1142 1148
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1153 aio_close $fh;
1148 1154
1149 if (@$objs) { 1155 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1161 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1163 }
1158 } else { 1164 } else {
1159 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1160 } 1166 }
… …
1329 1335
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1338
1333 $ext{source} = 1339 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1336 . $source 1342 . $source
1337 . "\n};\n1"; 1343 . "\n};\n1";
1338 1344
1339 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1454 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1461 or return;
1456 1462
1457 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1458 or return; 1464 or return;
1465
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1462 } 1469 }
1463 } 1470 }
… …
1473 1480
1474 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1475 1482
1476 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1478 1487
1479 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1489 cf::cede_to_tick;
1481} 1490}
1482 1491
… …
1518 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1519 $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
1520 1529
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1525 1536
1526 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1577
1567 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1568 my $path = path $login; 1579 my $path = path $login;
1569 1580
1570 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1587 }
1576 1588
… …
1613 1625
1614Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1615 1627
1616=cut 1628=cut
1617 1629
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod { 1630sub expand_cfpod {
1630 my ($self, $pod) = @_; 1631 my ($self, $pod) = @_;
1631 1632
1633 my @nest = [qr<\G$>, undef, ""];
1632 my $xml; 1634 my $xml;
1633 1635
1636 for ($pod) {
1634 while () { 1637 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) { 1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group; 1639 $xml .= $1;
1642 } elsif ($pod =~ m%\G 1640 } elsif (/\G\n(?=\S)/xgcs) {
1643 ([BCGHITU]) 1641 $xml .= " ";
1644 < 1642 } elsif (/\G\n/xgcs) {
1645 (?: 1643 $xml .= "\n";
1646 ([^<>]*) (?{ $group = $^N }) 1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1647 | < $interior > 1645 my ($code, $delim) = ($1, scalar reverse $2);
1648 ) 1646 $delim =~ y/</>/; # delim now contains the stop sequence
1649 > 1647 $delim = qr{\G\Q$delim};
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653 1648
1649 my $cb;
1650
1654 if ($code eq "B") { 1651 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; 1652 $cb = sub { "<b>$_[0]</b>" };
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") { 1653 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; 1654 $cb = sub { "<tt>$_[0]</tt>" };
1662 } elsif ($code eq "T") { 1655 } elsif ($code eq "E") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1664 } elsif ($code eq "G") { 1657 } elsif ($code eq "G") {
1658 $cb = sub {
1665 my ($male, $female) = split /\|/, $data; 1659 my ($male, $female) = split /\|/, $_[0];
1666 $data = $self->gender ? $female : $male; 1660 $self->gender ? $female : $male
1667 $xml .= expand_cfpod ($self, $data); 1661 };
1668 } elsif ($code eq "H") { 1662 } elsif ($code eq "H") {
1669 $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>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "") 1667 "",
1672 [$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 .= ">";
1673 } else { 1699 } else {
1674 $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 }
1675 } 1707 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 } 1708 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 } 1709 }
1694 1710
1695 $xml 1711 $xml
1696} 1712}
1697
1698no re 'eval';
1699 1713
1700sub hintmode { 1714sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode} 1716 $_[0]{hintmode}
1703} 1717}
… …
1775our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1777 1791
1778sub generate_random_map { 1792sub generate_random_map {
1779 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
1780 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1798 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1923
1907# the temporary/swap location 1924# the temporary/swap location
1908sub save_path { 1925sub save_path {
1909 my ($self) = @_; 1926 my ($self) = @_;
1910 1927
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1913} 1930}
1914 1931
1915# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1916sub uniq_path { 1933sub uniq_path {
1917 my ($self) = @_; 1934 my ($self) = @_;
1918 1935
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1921} 1938}
1922 1939
1923# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1924# all maps in C++... 1941# all maps in C++...
… …
2022 2039
2023 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
2025 2042
2026 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 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";
2029 2046
2030 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
2031 or return; 2048 or return;
2032 2049
2033 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 2053 or return;
2037 2054
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2041 undef $guard1; 2059 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2060 $map->reset;
2044 return find $path; 2061 return find $path;
2045 } 2062 }
2046 2063
2047 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2092 $f->skip_block;
2076 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
2077 or return; 2094 or return;
2078 2095
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
2080 if delete $self->{load_original}; 2097 if delete $self->{load_original};
2081 2098
2082 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2100 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
2110 } 2127 }
2111 2128
2112 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2114 2131
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2133 }
2117 2134
2118 $self->post_load; 2135 $self->post_load;
2119} 2136}
2120 2137
… …
2178 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2179 2196
2180 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2181 2198
2182 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2201 }
2185 2202
2186 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2187 2204
2188 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2242 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2228 }; 2245 };
2229 2246
2247 cf::get_slot 0.02;
2248
2230 if ($uniq) { 2249 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2252 } else {
2234 $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);
… …
2242 $self->save; 2261 $self->save;
2243 2262
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2264
2246 return if $self->players; 2265 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2249 2268
2250 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2251 2270
2252 $self->deactivate; 2271 $self->deactivate;
… …
2370 2389
2371sub unique_maps() { 2390sub unique_maps() {
2372 [ 2391 [
2373 map { 2392 map {
2374 utf8::decode $_; 2393 utf8::decode $_;
2375 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2376 ? normalise $_ 2397 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2399 ]
2380} 2400}
2381 2401
2382=back 2402=back
… …
2389 2409
2390=over 4 2410=over 4
2391 2411
2392=item $ob->inv_recursive 2412=item $ob->inv_recursive
2393 2413
2394Returns 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.
2395 2416
2396=cut 2417=cut
2397 2418
2398sub inv_recursive_; 2419sub inv_recursive_;
2399sub inv_recursive_ { 2420sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2405} 2426}
2406 2427
2407=item $ref = $ob->ref 2428=item $ref = $ob->ref
2408 2429
2409creates 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.
2410 2431
2411=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2412 2433
2413returns 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,
2414even if the object actually exists. May block. 2435even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2468dialogue with the given NPC character.
2448 2469
2449=cut 2470=cut
2450 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
2451# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2487# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2503
2469 } else { 2504 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2507 }
2473 } 2508 }
2474} 2509}
2475 2510
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2626
2589=cut 2627=cut
2590 2628
2591our $GOTOGEN; 2629our $GOTOGEN;
2592 2630
… …
2671} 2709}
2672 2710
2673sub prepare_random_map { 2711sub prepare_random_map {
2674 my ($exit) = @_; 2712 my ($exit) = @_;
2675 2713
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2716 # that depends on the exit object
2681 2717
2682 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2720 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2689 } 2727 }
2690 2728
2691 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2692 2730
2693 my $data = cf::encode_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2696 2734
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2737 undef $fh;
2700 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2701 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2704 } 2746 }
2705} 2747}
2706 2748
2707sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2709 2751
2710 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2711 2753
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2754 $self->enter_link;
2724 2755
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2756 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2731 2758
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2735 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
2736 1; 2780 1
2737 }) { 2781 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2821 id => "infobox", 2865 id => "infobox",
2822 title => "Map Info", 2866 title => "Map Info",
2823 reply => undef, 2867 reply => undef,
2824 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2825 }, 2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2826); 2876);
2827 2877
2828sub cf::client::send_msg { 2878sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2880
… …
3067 3117
3068The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
3069 3119
3070 cf::object 3120 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
3073 3123
3074 cf::object::player 3124 cf::object::player
3075 player 3125 player
3076 3126
3077 cf::player 3127 cf::player
… …
3082 3132
3083=cut 3133=cut
3084 3134
3085for ( 3135for (
3086 ["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
3087 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3138 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
3092) { 3142) {
3093 no strict 'refs'; 3143 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3303 } 3353 }
3304}; 3354};
3305 3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3365
3306sub reload_regions { 3366sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3368 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3370
… …
3323} 3383}
3324 3384
3325sub reload_archetypes { 3385sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3388}
3334 3389
3335sub reload_treasures { 3390sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3338} 3393}
3339 3394
3340sub reload_resources { 3395sub reload_resources {
3341 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3342 3397
3398 reload_facedata;
3399 reload_archetypes;
3343 reload_regions; 3400 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3401 reload_treasures;
3348 3402
3349 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3350} 3404}
3351 3405
3352sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3353 reload_resources; 3411 reload_resources;
3354} 3412}
3355 3413
3356sub reload_config { 3414sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3441 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3385 }; 3443 };
3386 3444
3445 {
3446 my $guard = freeze_mainloop;
3387 reload_config; 3447 reload_config;
3388 db_init; 3448 db_init;
3389 load_extensions; 3449 load_extensions;
3390 3450
3391 $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
3392 evthread_start IO::AIO::poll_fileno; 3452 }
3453
3393 EV::loop; 3454 EV::loop;
3394} 3455}
3395 3456
3396############################################################################# 3457#############################################################################
3397# initialisation and cleanup 3458# initialisation and cleanup
… …
3404 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3405 }; 3466 };
3406 } 3467 }
3407} 3468}
3408 3469
3409sub write_runtime { 3470sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3411 3472
3412 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3414 3475
… …
3530 3591
3531 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3593 if $make_core;
3533} 3594}
3534 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
3535sub do_reload_perl() { 3624sub do_reload_perl() {
3536 # can/must only be called in main 3625 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3539 return; 3628 return;
3540 } 3629 }
3541 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3542 warn "reloading..."; 3634 warn "reloading...";
3543 3635
3544 warn "entering sync_job"; 3636 warn "entering sync_job";
3545 3637
3546 cf::sync_job { 3638 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3640 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3550 3642
3551 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3645
3554 # 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
3555 3647
3556 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3651 }
3588 3652
3589 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3591 } 3655 %EXT_CORO = ();
3592 3656
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3667
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3604 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3605 } 3677 }
3606 3678
3607 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;
3608 } 3694 }
3609 3695
3610 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3612 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);
3613 3699
3614 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3617 3703
3618 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3705 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3621 3707
3622 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3623 3709
3624 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3625 require cf; 3711 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3713
3628 warn "loading config and database again"; 3714 warn "loading config and database again";
3629 cf::reload_config; 3715 cf::reload_config;
3630 3716
3631 warn "loading extensions"; 3717 warn "loading extensions";
3632 cf::load_extensions; 3718 cf::load_extensions;
3633 3719
3634 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3640 3726
3641 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3642 3728
3643 1 3729 1
3644 } or do { 3730 } or do {
3645 warn $@; 3731 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3647 }; 3733 };
3648 3734
3649 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3650}; 3738};
3651 3739
3652our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3653 3741
3654sub reload_perl() { 3742sub reload_perl() {
… …
3679 3767
3680our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3682 3770
3683sub wait_for_tick { 3771sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3773
3687 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3776 $signal->wait;
3690} 3777}
3691 3778
3692sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3781
3696 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3784 $signal->wait;
3699} 3785}
… …
3709 3795
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 3798 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3799 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3800 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3801 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3802 };
3717 } 3803 }
3718 3804
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3738{ 3824{
3739 # configure BDB 3825 # configure BDB
3740 3826
3741 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3829 $AnyEvent::BDB::WATCHER->priority (1);
3744 3830
3745 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3838
3752 cf::sync_job { 3839 cf::sync_job {
3753 eval { 3840 eval {
… …
3779{ 3866{
3780 # configure IO::AIO 3867 # configure IO::AIO
3781 3868
3782 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3871 undef $AnyEvent::AIO::WATCHER;
3785} 3872}
3786 3873
3787my $_log_backtrace; 3874my $_log_backtrace;
3788 3875
3789sub _log_backtrace { 3876sub _log_backtrace {

Diff Legend

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