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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
36use Coro 4.50 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 97our %RESOURCE;
93 98
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 101our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
99 103
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 107our $DB_ENV;
105 108
… …
242for my $pkg (qw( 245for my $pkg (qw(
243 cf::global cf::attachable 246 cf::global cf::attachable
244 cf::object cf::object::player 247 cf::object cf::object::player
245 cf::client cf::player 248 cf::client cf::player
246 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
247 cf::map cf::party cf::region 251 cf::party cf::region
248)) { 252)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 254}
252 255
253$EV::DIED = sub { 256$EV::DIED = sub {
254 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
… …
427 } 430 }
428 } 431 }
429}; 432};
430 433
431sub get_slot($;$$) { 434sub get_slot($;$$) {
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
… …
1584 1623
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1586 1625
1587Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1588 1627
1589=cut
1590
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 {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</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") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
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 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677
1678=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1679 1629
1680Sends an ext reply to the player. 1630Sends an ext reply to the player.
1681 1631
1682=cut 1632=cut
… …
1748our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1750 1700
1751sub generate_random_map { 1701sub generate_random_map {
1752 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1753 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1707 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1832
1880# the temporary/swap location 1833# the temporary/swap location
1881sub save_path { 1834sub save_path {
1882 my ($self) = @_; 1835 my ($self) = @_;
1883 1836
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1886} 1839}
1887 1840
1888# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1889sub uniq_path { 1842sub uniq_path {
1890 my ($self) = @_; 1843 my ($self) = @_;
1891 1844
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1894} 1847}
1895 1848
1896# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1897# all maps in C++... 1850# all maps in C++...
… …
1995 1948
1996 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1998 1951
1999 $cf::MAP{$path} || do { 1952 $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 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
2002 1955
2003 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
2004 or return; 1957 or return;
2005 1958
2006 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 1962 or return;
2010 1963
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
2014 undef $guard1; 1968 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1969 $map->reset;
2017 return find $path; 1970 return find $path;
2018 } 1971 }
2019 1972
2020 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2001 $f->skip_block;
2049 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
2050 or return; 2003 or return;
2051 2004
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
2053 if delete $self->{load_original}; 2006 if delete $self->{load_original};
2054 2007
2055 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2009 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
… …
2083 } 2036 }
2084 2037
2085 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
2087 2040
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2042 }
2090 2043
2091 $self->post_load; 2044 $self->post_load;
2092} 2045}
2093 2046
… …
2151 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2152 2105
2153 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2154 2107
2155 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2110 }
2158 2111
2159 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2160 2113
2161 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2151 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2152 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2201 }; 2154 };
2202 2155
2156 cf::get_slot 0.02;
2157
2203 if ($uniq) { 2158 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2161 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2170 $self->save;
2216 2171
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2173
2219 return if $self->players; 2174 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2222 2177
2223 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2224 2179
2225 $self->deactivate; 2180 $self->deactivate;
… …
2343 2298
2344sub unique_maps() { 2299sub unique_maps() {
2345 [ 2300 [
2346 map { 2301 map {
2347 utf8::decode $_; 2302 utf8::decode $_;
2348 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2349 ? normalise $_ 2306 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2308 ]
2353} 2309}
2354 2310
2355package cf;
2356
2357=back 2311=back
2358 2312
2359=head3 cf::object 2313=head3 cf::object
2360 2314
2361=cut 2315=cut
… …
2364 2318
2365=over 4 2319=over 4
2366 2320
2367=item $ob->inv_recursive 2321=item $ob->inv_recursive
2368 2322
2369Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2370 2325
2371=cut 2326=cut
2372 2327
2373sub inv_recursive_; 2328sub inv_recursive_;
2374sub inv_recursive_ { 2329sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2380} 2335}
2381 2336
2382=item $ref = $ob->ref 2337=item $ref = $ob->ref
2383 2338
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2339Creates and returns a persistent reference to an object that can be stored as a string.
2385 2340
2386=item $ob = cf::object::deref ($refstring) 2341=item $ob = cf::object::deref ($refstring)
2387 2342
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2344even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2377dialogue with the given NPC character.
2423 2378
2424=cut 2379=cut
2425 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2426# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2396# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2412
2444 } else { 2413 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2416 }
2448 } 2417 }
2449} 2418}
2450 2419
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2558Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2563 2535
2564=cut 2536=cut
2565 2537
2566our $GOTOGEN; 2538our $GOTOGEN;
2567 2539
… …
2646} 2618}
2647 2619
2648sub prepare_random_map { 2620sub prepare_random_map {
2649 my ($exit) = @_; 2621 my ($exit) = @_;
2650 2622
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2625 # that depends on the exit object
2656 2626
2657 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2629 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2664 } 2636 }
2665 2637
2666 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2667 2639
2668 my $data = cf::encode_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2671 2643
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2646 undef $fh;
2675 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2676 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2679 } 2655 }
2680} 2656}
2681 2657
2682sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2684 2660
2685 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2686 2662
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; 2663 $self->enter_link;
2699 2664
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 { 2665 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2706 2667
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2709 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2710 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2711 1; 2689 1
2712 }) { 2690 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2774 id => "infobox",
2797 title => "Map Info", 2775 title => "Map Info",
2798 reply => undef, 2776 reply => undef,
2799 tooltip => "Information related to the maps", 2777 tooltip => "Information related to the maps",
2800 }, 2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2801); 2785);
2802 2786
2803sub cf::client::send_msg { 2787sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2789
… …
2832 if ($self->can_msg) { 2816 if ($self->can_msg) {
2833 # default colour, mask it out 2817 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2836 2820
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2839 } else { 2837 } else {
2840 if ($color >= 0) { 2838 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2840 for ($msg) {
2843 1 while 2841 1 while
… …
3042 3040
3043The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
3044 3042
3045 cf::object 3043 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3044 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
3048 3046
3049 cf::object::player 3047 cf::object::player
3050 player 3048 player
3051 3049
3052 cf::player 3050 cf::player
… …
3057 3055
3058=cut 3056=cut
3059 3057
3060for ( 3058for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3061 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
3067) { 3065) {
3068 no strict 'refs'; 3066 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3278 } 3276 }
3279}; 3277};
3280 3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
3281sub reload_regions { 3289sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3291 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3293
… …
3298} 3306}
3299 3307
3300sub reload_archetypes { 3308sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3310 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} 3311}
3309 3312
3310sub reload_treasures { 3313sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3313} 3316}
3314 3317
3315sub reload_resources { 3318sub reload_resources {
3316 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3317 3320
3321 reload_facedata;
3322 reload_archetypes;
3318 reload_regions; 3323 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3324 reload_treasures;
3323 3325
3324 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3325} 3327}
3326 3328
3327sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3328 reload_resources; 3334 reload_resources;
3329} 3335}
3330 3336
3331sub reload_config { 3337sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3364 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3360 }; 3366 };
3361 3367
3368 {
3369 my $guard = freeze_mainloop;
3362 reload_config; 3370 reload_config;
3363 db_init; 3371 db_init;
3364 load_extensions; 3372 load_extensions;
3365 3373
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3375 }
3376
3368 EV::loop; 3377 EV::loop;
3369} 3378}
3370 3379
3371############################################################################# 3380#############################################################################
3372# initialisation and cleanup 3381# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3380 }; 3389 };
3381 } 3390 }
3382} 3391}
3383 3392
3384sub write_runtime { 3393sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3386 3395
3387 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3389 3398
… …
3415 and return; 3424 and return;
3416 3425
3417 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3418 3427
3419 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3420} 3472}
3421 3473
3422sub emergency_save() { 3474sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3424 3476
… …
3446 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3447 3499
3448 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3451 }; 3507 };
3452 3508
3453 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3454} 3510}
3455 3511
… …
3457 my ($make_core) = @_; 3513 my ($make_core) = @_;
3458 3514
3459 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3516 if $make_core;
3461} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3462 3546
3463sub do_reload_perl() { 3547sub do_reload_perl() {
3464 # can/must only be called in main 3548 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3467 return; 3551 return;
3468 } 3552 }
3469 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3470 warn "reloading..."; 3557 warn "reloading...";
3471 3558
3472 warn "entering sync_job"; 3559 warn "entering sync_job";
3473 3560
3474 cf::sync_job { 3561 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3563 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3478 3565
3479 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3568
3482 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3483 3570
3484 warn "flushing outstanding aio requests"; 3571 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; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3573 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 } 3574 }
3516 3575
3517 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3519 } 3578 %EXT_CORO = ();
3520 3579
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3590
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3532 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3533 } 3600 }
3534 3601
3535 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3536 } 3617 }
3537 3618
3538 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3622
3542 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3545 3626
3546 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3628 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3549 3630
3550 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3551 3632
3552 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3553 require cf; 3634 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3636
3556 warn "loading config and database again"; 3637 warn "loading config and database again";
3557 cf::reload_config; 3638 cf::reload_config;
3558 3639
3559 warn "loading extensions"; 3640 warn "loading extensions";
3560 cf::load_extensions; 3641 cf::load_extensions;
3561 3642
3562 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3568 3649
3569 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3570 3651
3571 1 3652 1
3572 } or do { 3653 } or do {
3573 warn $@; 3654 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3575 }; 3656 };
3576 3657
3577 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3578}; 3661};
3579 3662
3580our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3581 3664
3582sub reload_perl() { 3665sub reload_perl() {
… …
3607 3690
3608our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3610 3693
3611sub wait_for_tick { 3694sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3696
3615 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3699 $signal->wait;
3618} 3700}
3619 3701
3620sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3704
3624 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3707 $signal->wait;
3627} 3708}
… …
3637 3718
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3721 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3722 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3723 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3724 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3725 };
3645 } 3726 }
3646 3727
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3747{
3667 # configure BDB 3748 # configure BDB
3668 3749
3669 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3752 $AnyEvent::BDB::WATCHER->priority (1);
3672 3753
3673 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3761
3680 cf::sync_job { 3762 cf::sync_job {
3681 eval { 3763 eval {
… …
3707{ 3789{
3708 # configure IO::AIO 3790 # configure IO::AIO
3709 3791
3710 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3794 undef $AnyEvent::AIO::WATCHER;
3713} 3795}
3714 3796
3715my $_log_backtrace; 3797my $_log_backtrace;
3716 3798
3717sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

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