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.445 by root, Wed Sep 10 18:18:10 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
… …
76our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
77 82
78our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
79our @EVENT; 84our @EVENT;
80 85
81our $CONFDIR = confdir; 86our $CONFDIR = confdir;
82our $DATADIR = datadir; 87our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
92our %RESOURCE; 100our %RESOURCE;
93 101
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 104our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
99 106
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 110our $DB_ENV;
105 111
… …
123 129
124binmode STDOUT; 130binmode STDOUT;
125binmode STDERR; 131binmode STDERR;
126 132
127# read virtual server time, if available 133# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
132} 138}
133 139
134mkdir $_ 140mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 248for my $pkg (qw(
243 cf::global cf::attachable 249 cf::global cf::attachable
244 cf::object cf::object::player 250 cf::object cf::object::player
245 cf::client cf::player 251 cf::client cf::player
246 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
247 cf::map cf::party cf::region 254 cf::party cf::region
248)) { 255)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 257}
252 258
253$EV::DIED = sub { 259$EV::DIED = sub {
254 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
… …
427 } 433 }
428 } 434 }
429}; 435};
430 436
431sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
432 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
433 441
434 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
436 444
… …
547 reset_signals; 555 reset_signals;
548 &$cb 556 &$cb
549 }, @args; 557 }, @args;
550 558
551 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
552} 587}
553 588
554=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
555 590
556Returns a single value from the environment database. 591Returns a single value from the environment database.
… …
1056 1091
1057sub reattach { 1092sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1094 my ($obj) = @_;
1060 1095
1096 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1098
1063 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1064 1100
1065 @$registry = (); 1101 @$registry = ();
1066 1102
… …
1112 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1115 1151
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1156 aio_close $fh;
1121 1157
1122 if (@$objs) { 1158 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1164 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1166 }
1131 } else { 1167 } else {
1132 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1133 } 1169 }
… …
1302 1338
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1341
1306 $ext{source} = 1342 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1309 . $source 1345 . $source
1310 . "\n};\n1"; 1346 . "\n};\n1";
1311 1347
1312 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
… …
1427 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1464 or return;
1429 1465
1430 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1431 or return; 1467 or return;
1468
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1435 } 1472 }
1436 } 1473 }
… …
1446 1483
1447 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1448 1485
1449 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1451 1490
1452 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1492 cf::cede_to_tick;
1454} 1493}
1455 1494
… …
1487 my ($pl) = @_; 1526 my ($pl) = @_;
1488 1527
1489 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1490 1529
1491 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1532
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1498 1539
1499 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1539 1580
1540 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1541 my $path = path $login; 1582 my $path = path $login;
1542 1583
1543 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1590 }
1549 1591
… …
1584 1626
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1586 1628
1587Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1588 1630
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) 1631=item $player->ext_reply ($msgid, @msg)
1679 1632
1680Sends an ext reply to the player. 1633Sends an ext reply to the player.
1681 1634
1682=cut 1635=cut
… …
1748our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1750 1703
1751sub generate_random_map { 1704sub generate_random_map {
1752 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1753 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1710 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1879 1835
1880# the temporary/swap location 1836# the temporary/swap location
1881sub save_path { 1837sub save_path {
1882 my ($self) = @_; 1838 my ($self) = @_;
1883 1839
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1886} 1842}
1887 1843
1888# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1889sub uniq_path { 1845sub uniq_path {
1890 my ($self) = @_; 1846 my ($self) = @_;
1891 1847
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1894} 1850}
1895 1851
1896# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1897# all maps in C++... 1853# all maps in C++...
… …
1995 1951
1996 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1998 1954
1999 $cf::MAP{$path} || do { 1955 $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 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
2002 1958
2003 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
2004 or return; 1960 or return;
2005 1961
2006 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
… …
2009 or return; 1965 or return;
2010 1966
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
2014 undef $guard1; 1971 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1972 $map->reset;
2017 return find $path; 1973 return find $path;
2018 } 1974 }
2019 1975
2020 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
… …
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2004 $f->skip_block;
2049 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2050 or return; 2006 or return;
2051 2007
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2053 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2054 2010
2055 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2012 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
… …
2083 } 2039 }
2084 2040
2085 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2087 2043
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2045 }
2090 2046
2091 $self->post_load; 2047 $self->post_load;
2092} 2048}
2093 2049
… …
2151 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2152 2108
2153 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2154 2110
2155 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2113 }
2158 2114
2159 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2160 2116
2161 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
… …
2198 cf::async { 2154 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2201 }; 2157 };
2202 2158
2159 cf::get_slot 0.02;
2160
2203 if ($uniq) { 2161 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2164 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2215 $self->save; 2173 $self->save;
2216 2174
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2176
2219 return if $self->players; 2177 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2222 2180
2223 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2224 2182
2225 $self->deactivate; 2183 $self->deactivate;
… …
2343 2301
2344sub unique_maps() { 2302sub unique_maps() {
2345 [ 2303 [
2346 map { 2304 map {
2347 utf8::decode $_; 2305 utf8::decode $_;
2348 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2349 ? normalise $_ 2309 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2311 ]
2353} 2312}
2354 2313
2355package cf;
2356
2357=back 2314=back
2358 2315
2359=head3 cf::object 2316=head3 cf::object
2360 2317
2361=cut 2318=cut
… …
2364 2321
2365=over 4 2322=over 4
2366 2323
2367=item $ob->inv_recursive 2324=item $ob->inv_recursive
2368 2325
2369Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2370 2328
2371=cut 2329=cut
2372 2330
2373sub inv_recursive_; 2331sub inv_recursive_;
2374sub inv_recursive_ { 2332sub inv_recursive_ {
… …
2379 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2380} 2338}
2381 2339
2382=item $ref = $ob->ref 2340=item $ref = $ob->ref
2383 2341
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2385 2343
2386=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2387 2345
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2347even if the object actually exists. May block.
… …
2421can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2380dialogue with the given NPC character.
2423 2381
2424=cut 2382=cut
2425 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2426# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2399# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
… …
2441 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2415
2444 } else { 2416 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2419 }
2448 } 2420 }
2449} 2421}
2450 2422
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2558Moves the player to the given map-path and coordinates by first freezing 2530Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2531her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2532that 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 2533the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2534be called at the end of this process.
2535
2536Note that $check will be called with a potentially non-loaded map, so if
2537it needs a loaded map it has to call C<< ->load >>.
2563 2538
2564=cut 2539=cut
2565 2540
2566our $GOTOGEN; 2541our $GOTOGEN;
2567 2542
… …
2646} 2621}
2647 2622
2648sub prepare_random_map { 2623sub prepare_random_map {
2649 my ($exit) = @_; 2624 my ($exit) = @_;
2650 2625
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2626 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2627 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2628 # that depends on the exit object
2656 2629
2657 my $rmp = parse_random_map_params $exit->msg; 2630 my $rmp = parse_random_map_params $exit->msg;
… …
2659 if ($exit->map) { 2632 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2633 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2634 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2635 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2636 $rmp->{origin_y} = $exit->y;
2637
2638 $exit->map->touch;
2664 } 2639 }
2665 2640
2666 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2667 2642
2668 my $data = cf::encode_json $rmp; 2643 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2671 2646
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2649 undef $fh;
2675 aio_rename "$meta~", $meta; 2650 aio_rename "$meta~", $meta;
2676 2651
2652 my $slaying = "?random/$md5";
2653
2654 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2655 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2656 $exit->msg (undef);
2657 }
2679 } 2658 }
2680} 2659}
2681 2660
2682sub cf::object::player::enter_exit { 2661sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2662 my ($self, $exit) = @_;
2684 2663
2685 return unless $self->type == cf::PLAYER; 2664 return unless $self->type == cf::PLAYER;
2686 2665
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; 2666 $self->enter_link;
2699 2667
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 { 2668 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2669 $Coro::current->{desc} = "enter_exit";
2706 2670
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2671 unless (eval {
2672 $self->deactivate_recursive; # just to be sure
2673
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp;
2685
2709 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($map, $x, $y);
2710 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED);
2691
2711 1; 2692 1
2712 }) { 2693 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2694 $self->message ("Something went wrong deep within the crossfire server. "
2714 . "I'll try to bring you back to the map you were before. " 2695 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2696 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2697 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2796 id => "infobox", 2777 id => "infobox",
2797 title => "Map Info", 2778 title => "Map Info",
2798 reply => undef, 2779 reply => undef,
2799 tooltip => "Information related to the maps", 2780 tooltip => "Information related to the maps",
2800 }, 2781 },
2782 "c/party" => {
2783 id => "party",
2784 title => "Party",
2785 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party",
2787 },
2801); 2788);
2802 2789
2803sub cf::client::send_msg { 2790sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2791 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2792
… …
2832 if ($self->can_msg) { 2819 if ($self->can_msg) {
2833 # default colour, mask it out 2820 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2822 if $color & cf::NDI_DEF;
2836 2823
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2824 my $pkt = "msg "
2825 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 );
2828
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt);
2839 } else { 2840 } else {
2840 if ($color >= 0) { 2841 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2842 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2843 for ($msg) {
2843 1 while 2844 1 while
… …
3042 3043
3043The following functions and methods are available within a safe environment: 3044The following functions and methods are available within a safe environment:
3044 3045
3045 cf::object 3046 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3047 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3048 insert remove name archname title slaying race decrease split
3048 3049
3049 cf::object::player 3050 cf::object::player
3050 player 3051 player
3051 3052
3052 cf::player 3053 cf::player
… …
3057 3058
3058=cut 3059=cut
3059 3060
3060for ( 3061for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3063 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3064 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3065 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3066 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3067 ["cf::map" => qw(trigger)],
3067) { 3068) {
3068 no strict 'refs'; 3069 no strict 'refs';
… …
3276 while (my ($k, $v) = each %$want) { 3277 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3278 $ns->fx_want ($k, $v);
3278 } 3279 }
3279}; 3280};
3280 3281
3282sub load_resource_file($) {
3283 my $guard = lock_acquire "load_resource_file";
3284
3285 my $status = load_resource_file_ $_[0];
3286 get_slot 0.1, 100;
3287 cf::arch::commit_load;
3288
3289 $status
3290}
3291
3281sub reload_regions { 3292sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3293 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3294 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3295 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3296
… …
3298} 3309}
3299 3310
3300sub reload_archetypes { 3311sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3312 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3313 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} 3314}
3309 3315
3310sub reload_treasures { 3316sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3317 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3318 or die "unable to load treasurelists\n";
3313} 3319}
3314 3320
3315sub reload_resources { 3321sub reload_resources {
3316 warn "reloading resource files...\n"; 3322 warn "reloading resource files...\n";
3317 3323
3324 reload_facedata;
3325 reload_archetypes;
3318 reload_regions; 3326 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3327 reload_treasures;
3323 3328
3324 warn "finished reloading resource files\n"; 3329 warn "finished reloading resource files\n";
3325} 3330}
3326 3331
3327sub init { 3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3328 reload_resources; 3337 reload_resources;
3329} 3338}
3330 3339
3331sub reload_config { 3340sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3347 }; 3356 };
3348 warn $@ if $@; 3357 warn $@ if $@;
3349 } 3358 }
3350} 3359}
3351 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3352sub main { 3380sub main {
3381 atomic;
3382
3353 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3386 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3388 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3360 }; 3390 };
3361 3391
3392 {
3393 my $guard = freeze_mainloop;
3362 reload_config; 3394 reload_config;
3363 db_init; 3395 db_init;
3364 load_extensions; 3396 load_extensions;
3365 3397
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3399 }
3400
3401 utime time, time, $RUNTIMEFILE;
3402
3403 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405
3368 EV::loop; 3406 EV::loop;
3369} 3407}
3370 3408
3371############################################################################# 3409#############################################################################
3372# initialisation and cleanup 3410# initialisation and cleanup
… …
3379 cf::cleanup "SIG$signal"; 3417 cf::cleanup "SIG$signal";
3380 }; 3418 };
3381 } 3419 }
3382} 3420}
3383 3421
3384sub write_runtime { 3422sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3389 3425
3390 IO::AIO::aio_utime $runtime, undef, undef; 3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3427
3392 my $guard = cf::lock_acquire "write_runtime"; 3428 my $guard = cf::lock_acquire "write_runtime";
3393 3429
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3431 or return;
3396 3432
3397 my $value = $cf::RUNTIME + 90 + 10; 3433 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3434 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3435 # 60 allows for the watchdog to kill the server.
… …
3409 aio_utime $fh, undef, undef; 3445 aio_utime $fh, undef, undef;
3410 3446
3411 close $fh 3447 close $fh
3412 or return; 3448 or return;
3413 3449
3414 aio_rename "$runtime~", $runtime 3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3451 and return;
3416 3452
3417 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3418 3454
3419 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3420} 3499}
3421 3500
3422sub emergency_save() { 3501sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3424 3503
… …
3446 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3447 3526
3448 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3451 }; 3534 };
3452 3535
3453 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3454} 3537}
3455 3538
3456sub post_cleanup { 3539sub post_cleanup {
3457 my ($make_core) = @_; 3540 my ($make_core) = @_;
3458 3541
3459 warn Carp::longmess "post_cleanup backtrace" 3542 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3543 if $make_core;
3544
3545 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$;
3461} 3547}
3548
3549# a safer delete_package, copied from Symbol
3550sub clear_package($) {
3551 my $pkg = shift;
3552
3553 # expand to full symbol table name if needed
3554 unless ($pkg =~ /^main::.*::$/) {
3555 $pkg = "main$pkg" if $pkg =~ /^::/;
3556 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3557 $pkg .= '::' unless $pkg =~ /::$/;
3558 }
3559
3560 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3561 my $stem_symtab = *{$stem}{HASH};
3562
3563 defined $stem_symtab and exists $stem_symtab->{$leaf}
3564 or return;
3565
3566 # clear all symbols
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 }
3572 warn "cleared package #$pkg\n";#d#
3573}
3574
3575our $RELOAD; # how many times to reload
3462 3576
3463sub do_reload_perl() { 3577sub do_reload_perl() {
3464 # can/must only be called in main 3578 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3579 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3580 warn "can only reload from main coroutine";
3467 return; 3581 return;
3468 } 3582 }
3469 3583
3584 return if $RELOAD++;
3585
3586 while ($RELOAD) {
3470 warn "reloading..."; 3587 warn "reloading...";
3471 3588
3472 warn "entering sync_job"; 3589 warn "entering sync_job";
3473 3590
3474 cf::sync_job { 3591 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3593 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3594 cf::write_runtime_sync; # external watchdog should not bark
3478 3595
3479 warn "syncing database to disk"; 3596 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3597 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3598
3482 # if anything goes wrong in here, we should simply crash as we already saved 3599 # if anything goes wrong in here, we should simply crash as we already saved
3483 3600
3484 warn "flushing outstanding aio requests"; 3601 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; 3602 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3603 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 } 3604 }
3516 3605
3517 warn "... nuking $pkg"; 3606 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3607 $_->cancel for values %EXT_CORO;
3519 } 3608 %EXT_CORO = ();
3520 3609
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3610 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3611 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3612
3613 warn "removing ext/exti commands";
3614 %EXTCMD = ();
3615 %EXTICMD = ();
3616
3617 warn "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3619 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3620
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3621 if (my $cb = $pkg->can ("unload")) {
3622 eval {
3532 $cb->(); 3623 $cb->($pkg);
3624 1
3625 } or warn "$pkg unloaded, but with errors: $@";
3626 }
3627
3628 warn "... clearing $pkg";
3629 clear_package $pkg;
3533 } 3630 }
3534 3631
3535 Symbol::delete_package $k; 3632 warn "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635
3636 warn "... unloading $k";
3637 delete $INC{$k};
3638
3639 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g;
3641
3642 if (my $cb = $k->can ("unload_module")) {
3643 $cb->();
3644 }
3645
3646 clear_package $k;
3536 } 3647 }
3537 3648
3538 warn "getting rid of safe::, as good as possible"; 3649 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3650 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3652
3542 warn "unloading cf.pm \"a bit\""; 3653 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3654 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3655 delete $INC{"cf/pod.pm"};
3545 3656
3546 # don't, removes xs symbols, too, 3657 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3658 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3659 #clear_package __PACKAGE__;
3549 3660
3550 warn "unload completed, starting to reload now"; 3661 warn "unload completed, starting to reload now";
3551 3662
3552 warn "reloading cf.pm"; 3663 warn "reloading cf.pm";
3553 require cf; 3664 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3666
3556 warn "loading config and database again"; 3667 warn "loading config and database again";
3557 cf::reload_config; 3668 cf::reload_config;
3558 3669
3559 warn "loading extensions"; 3670 warn "loading extensions";
3560 cf::load_extensions; 3671 cf::load_extensions;
3561 3672
3562 warn "reattaching attachments to objects/players"; 3673 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3674 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3675 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3676 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3677 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3678 reattach $_ for values %PLAYER;
3568 3679
3569 warn "leaving sync_job"; 3680 warn "leaving sync_job";
3570 3681
3571 1 3682 1
3572 } or do { 3683 } or do {
3573 warn $@; 3684 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3685 cf::cleanup "error while reloading, exiting.";
3575 }; 3686 };
3576 3687
3577 warn "reloaded"; 3688 warn "reloaded";
3689 --$RELOAD;
3690 }
3578}; 3691};
3579 3692
3580our $RELOAD_WATCHER; # used only during reload 3693our $RELOAD_WATCHER; # used only during reload
3581 3694
3582sub reload_perl() { 3695sub reload_perl() {
… …
3607 3720
3608our @WAIT_FOR_TICK; 3721our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3722our @WAIT_FOR_TICK_BEGIN;
3610 3723
3611sub wait_for_tick { 3724sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3725 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3726
3615 my $signal = new Coro::Signal; 3727 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3728 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3729 $signal->wait;
3618} 3730}
3619 3731
3620sub wait_for_tick_begin { 3732sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3734
3624 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3736 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3737 $signal->wait;
3627} 3738}
… …
3637 3748
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3749 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3751 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3752 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3753 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3754 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3755 };
3645 } 3756 }
3646 3757
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3666{ 3777{
3667 # configure BDB 3778 # configure BDB
3668 3779
3669 BDB::min_parallel 8; 3780 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3781 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3782 $AnyEvent::BDB::WATCHER->priority (1);
3672 3783
3673 unless ($DB_ENV) { 3784 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3785 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3786 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3787 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3788 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3789 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3790 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3791
3680 cf::sync_job { 3792 cf::sync_job {
3681 eval { 3793 eval {
… …
3707{ 3819{
3708 # configure IO::AIO 3820 # configure IO::AIO
3709 3821
3710 IO::AIO::min_parallel 8; 3822 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3823 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3824 undef $AnyEvent::AIO::WATCHER;
3713} 3825}
3714 3826
3715my $_log_backtrace; 3827my $_log_backtrace;
3716 3828
3717sub _log_backtrace { 3829sub _log_backtrace {

Diff Legend

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