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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
… …
123 132
124binmode STDOUT; 133binmode STDOUT;
125binmode STDERR; 134binmode STDERR;
126 135
127# read virtual server time, if available 136# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
132} 141}
133 142
134mkdir $_ 143mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 251for my $pkg (qw(
243 cf::global cf::attachable 252 cf::global cf::attachable
244 cf::object cf::object::player 253 cf::object cf::object::player
245 cf::client cf::player 254 cf::client cf::player
246 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
247 cf::map cf::party cf::region 257 cf::party cf::region
248)) { 258)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 260}
252 261
253$EV::DIED = sub { 262$EV::DIED = sub {
254 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
… …
427 } 436 }
428 } 437 }
429}; 438};
430 439
431sub get_slot($;$$) { 440sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main;
442
432 my ($time, $pri, $name) = @_; 443 my ($time, $pri, $name) = @_;
433 444
434 $time = $TICK * .6 if $time > $TICK * .6; 445 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 446 my $sig = new Coro::Signal;
436 447
… …
722 733
723############################################################################# 734#############################################################################
724 735
725=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
726 737
727Many objects in crossfire are so-called attachable objects. That means you can 738Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
730 741
731In the following description, CLASS can be any of C<global>, C<object> 742In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 743C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
783 794
784Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
786 797
787Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 799that are attached at load/instantiate time, thus the need for a name.
789 800
790These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
791 802
792=over 4 803=over 4
… …
1083 1094
1084sub reattach { 1095sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1097 my ($obj) = @_;
1087 1098
1099 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1100 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1101
1090 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
1091 1103
1092 @$registry = (); 1104 @$registry = ();
1093 1105
… …
1139 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
1142 1154
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1159 aio_close $fh;
1148 1160
1149 if (@$objs) { 1161 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1167 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1169 }
1158 } else { 1170 } else {
1159 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1160 } 1172 }
… …
1329 1341
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1344
1333 $ext{source} = 1345 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1336 . $source 1348 . $source
1337 . "\n};\n1"; 1349 . "\n};\n1";
1338 1350
1339 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
… …
1379 1391
1380=back 1392=back
1381 1393
1382=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1383 1395
1384Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1385 1397
1386=cut 1398=cut
1387 1399
1388package cf::player; 1400package cf::player;
1389 1401
… …
1454 my $f = new_from_file cf::object::thawer path $login 1466 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1467 or return;
1456 1468
1457 my $pl = cf::player::load_pl $f 1469 my $pl = cf::player::load_pl $f
1458 or return; 1470 or return;
1471
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1472 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1473 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1462 } 1475 }
1463 } 1476 }
… …
1473 1486
1474 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1475 1488
1476 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1491
1492 cf::get_slot 0.01;
1478 1493
1479 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1495 cf::cede_to_tick;
1481} 1496}
1482 1497
… …
1514 my ($pl) = @_; 1529 my ($pl) = @_;
1515 1530
1516 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1517 1532
1518 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1535
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1525 1542
1526 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1583
1567 for my $login (@$dirs) { 1584 for my $login (@$dirs) {
1568 my $path = path $login; 1585 my $path = path $login;
1569 1586
1570 # a .pst is a dead give-away for a valid player 1587 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1588 # if no pst file found, open and chekc for blocked users
1589 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1593 }
1576 1594
… …
1607 } 1625 }
1608 1626
1609 \@paths 1627 \@paths
1610} 1628}
1611 1629
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1631
1614Expand crossfire pod fragments into protocol xml. 1632Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1633
1705=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1706 1635
1707Sends an ext reply to the player. 1636Sends an ext reply to the player.
1708 1637
… …
1909 1838
1910# the temporary/swap location 1839# the temporary/swap location
1911sub save_path { 1840sub save_path {
1912 my ($self) = @_; 1841 my ($self) = @_;
1913 1842
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1916} 1845}
1917 1846
1918# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1919sub uniq_path { 1848sub uniq_path {
1920 my ($self) = @_; 1849 my ($self) = @_;
1921 1850
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1924} 1853}
1925 1854
1926# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1927# all maps in C++... 1856# all maps in C++...
… …
2025 1954
2026 cf::lock_wait "map_data:$path";#d#remove 1955 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
2028 1957
2029 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1961
2033 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2034 or return; 1963 or return;
2035 1964
2036 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 1968 or return;
2040 1969
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2044 undef $guard1; 1974 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 1975 $map->reset;
2047 return find $path; 1976 return find $path;
2048 } 1977 }
2049 1978
2050 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2007 $f->skip_block;
2079 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2080 or return; 2009 or return;
2081 2010
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2083 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2084 2013
2085 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2015 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2113 } 2042 }
2114 2043
2115 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2117 2046
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2048 }
2120 2049
2121 $self->post_load; 2050 $self->post_load;
2122} 2051}
2123 2052
… …
2181 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2182 2111
2183 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2184 2113
2185 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2116 }
2188 2117
2189 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2190 2119
2191 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2157 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2231 }; 2160 };
2232 2161
2162 cf::get_slot 0.02;
2163
2233 if ($uniq) { 2164 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2167 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2176 $self->save;
2246 2177
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2179
2249 return if $self->players; 2180 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2252 2183
2253 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2254 2185
2255 $self->deactivate; 2186 $self->deactivate;
… …
2373 2304
2374sub unique_maps() { 2305sub unique_maps() {
2375 [ 2306 [
2376 map { 2307 map {
2377 utf8::decode $_; 2308 utf8::decode $_;
2378 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2379 ? normalise $_ 2312 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2314 ]
2383} 2315}
2384 2316
2385=back 2317=back
… …
2392 2324
2393=over 4 2325=over 4
2394 2326
2395=item $ob->inv_recursive 2327=item $ob->inv_recursive
2396 2328
2397Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
2398 2331
2399=cut 2332=cut
2400 2333
2401sub inv_recursive_; 2334sub inv_recursive_;
2402sub inv_recursive_ { 2335sub inv_recursive_ {
… …
2407 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2408} 2341}
2409 2342
2410=item $ref = $ob->ref 2343=item $ref = $ob->ref
2411 2344
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2345Creates and returns a persistent reference to an object that can be stored as a string.
2413 2346
2414=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2415 2348
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2350even if the object actually exists. May block.
… …
2449can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2383dialogue with the given NPC character.
2451 2384
2452=cut 2385=cut
2453 2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
2400
2454# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2402# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
… …
2469 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2418
2472 } else { 2419 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2422 }
2476 } 2423 }
2477} 2424}
2478 2425
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2504 2451
2505=item $player_object->enter_link 2452=item $player_object->enter_link
2506 2453
2507Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2508 2455
2509The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2511 2460
2512Will never block. 2461Will never block.
2513 2462
2514=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2515 2464
… …
2573 2522
2574 $map->load; 2523 $map->load;
2575 $map->load_neighbours; 2524 $map->load_neighbours;
2576 2525
2577 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2578 $self->activate_recursive; 2528 $self->activate_recursive;
2579 2529
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2582} 2532}
… …
2586Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2538that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2539the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2591 2544
2592=cut 2545=cut
2593 2546
2594our $GOTOGEN; 2547our $GOTOGEN;
2595 2548
… …
2674} 2627}
2675 2628
2676sub prepare_random_map { 2629sub prepare_random_map {
2677 my ($exit) = @_; 2630 my ($exit) = @_;
2678 2631
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2634 # that depends on the exit object
2684 2635
2685 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2687 if ($exit->map) { 2638 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2692 } 2645 }
2693 2646
2694 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2695 2648
2696 my $data = cf::encode_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2699 2652
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2655 undef $fh;
2703 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2704 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2707 } 2664 }
2708} 2665}
2709 2666
2710sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2712 2669
2713 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2714 2671
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2672 $self->enter_link;
2727 2673
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2674 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2734 2676
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2737 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2738 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2739 1; 2698 1
2740 }) { 2699 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2704
2746 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2812 id => "infobox", 2771 id => "infobox",
2813 title => "Body Parts", 2772 title => "Body Parts",
2814 reply => undef, 2773 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2816 }, 2775 },
2776 "c/skills" => {
2777 id => "infobox",
2778 title => "Skills",
2779 reply => undef,
2780 tooltip => "Shows your experience per skill and item power",
2781 },
2817 "c/uptime" => { 2782 "c/uptime" => {
2818 id => "infobox", 2783 id => "infobox",
2819 title => "Uptime", 2784 title => "Uptime",
2820 reply => undef, 2785 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2786 tooltip => "How long the server has been running since last restart",
… …
2824 id => "infobox", 2789 id => "infobox",
2825 title => "Map Info", 2790 title => "Map Info",
2826 reply => undef, 2791 reply => undef,
2827 tooltip => "Information related to the maps", 2792 tooltip => "Information related to the maps",
2828 }, 2793 },
2794 "c/party" => {
2795 id => "party",
2796 title => "Party",
2797 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party",
2799 },
2829); 2800);
2830 2801
2831sub cf::client::send_msg { 2802sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2804
2834 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2835 2807
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2809
2838 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2860 if ($self->can_msg) { 2832 if ($self->can_msg) {
2861 # default colour, mask it out 2833 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2864 2836
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2867 } else { 2853 } else {
2868 if ($color >= 0) { 2854 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2870 for ($msg) { 2856 for ($msg) {
2871 1 while 2857 1 while
… …
3070 3056
3071The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
3072 3058
3073 cf::object 3059 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3060 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3061 insert remove name archname title slaying race decrease split
3076 3062
3077 cf::object::player 3063 cf::object::player
3078 player 3064 player
3079 3065
3080 cf::player 3066 cf::player
… …
3085 3071
3086=cut 3072=cut
3087 3073
3088for ( 3074for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3077 decrease split destroy change_exp)],
3092 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
3094 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3095) { 3081) {
3096 no strict 'refs'; 3082 no strict 'refs';
… …
3304 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3306 } 3292 }
3307}; 3293};
3308 3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3304
3309sub reload_regions { 3305sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3306 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3307 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3309
… …
3326} 3322}
3327 3323
3328sub reload_archetypes { 3324sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3327}
3337 3328
3338sub reload_treasures { 3329sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3341} 3332}
3342 3333
3343sub reload_resources { 3334sub reload_resources {
3344 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3345 3336
3337 reload_facedata;
3338 reload_archetypes;
3346 reload_regions; 3339 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3340 reload_treasures;
3351 3341
3352 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3353} 3343}
3354 3344
3355sub init { 3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3356 reload_resources; 3350 reload_resources;
3357} 3351}
3358 3352
3359sub reload_config { 3353sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3375 }; 3369 };
3376 warn $@ if $@; 3370 warn $@ if $@;
3377 } 3371 }
3378} 3372}
3379 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
3380sub main { 3393sub main {
3394 atomic;
3395
3381 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3399 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3401 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3402 })->prio (Coro::PRIO_MAX);
3388 }; 3403 };
3389 3404
3405 {
3406 my $guard = freeze_mainloop;
3390 reload_config; 3407 reload_config;
3391 db_init; 3408 db_init;
3392 load_extensions; 3409 load_extensions;
3393 3410
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3412 }
3413
3414 utime time, time, $RUNTIMEFILE;
3415
3416 # no (long-running) fork's whatsoever before this point(!)
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418
3396 EV::loop; 3419 EV::loop;
3397} 3420}
3398 3421
3399############################################################################# 3422#############################################################################
3400# initialisation and cleanup 3423# initialisation and cleanup
… …
3408 }; 3431 };
3409 } 3432 }
3410} 3433}
3411 3434
3412sub write_runtime_sync { 3435sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime";
3414
3415 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
3417 3438
3418 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3440
3420 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
3421 3442
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3423 or return; 3444 or return;
3424 3445
3425 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
… …
3437 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
3438 3459
3439 close $fh 3460 close $fh
3440 or return; 3461 or return;
3441 3462
3442 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3464 and return;
3444 3465
3445 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
3446 3467
3447 1 3468 1
… …
3531sub post_cleanup { 3552sub post_cleanup {
3532 my ($make_core) = @_; 3553 my ($make_core) = @_;
3533 3554
3534 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
3536} 3560}
3561
3562# a safer delete_package, copied from Symbol
3563sub clear_package($) {
3564 my $pkg = shift;
3565
3566 # expand to full symbol table name if needed
3567 unless ($pkg =~ /^main::.*::$/) {
3568 $pkg = "main$pkg" if $pkg =~ /^::/;
3569 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3570 $pkg .= '::' unless $pkg =~ /::$/;
3571 }
3572
3573 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3574 my $stem_symtab = *{$stem}{HASH};
3575
3576 defined $stem_symtab and exists $stem_symtab->{$leaf}
3577 or return;
3578
3579 # clear all symbols
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 }
3585 warn "cleared package #$pkg\n";#d#
3586}
3587
3588our $RELOAD; # how many times to reload
3537 3589
3538sub do_reload_perl() { 3590sub do_reload_perl() {
3539 # can/must only be called in main 3591 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
3542 return; 3594 return;
3543 } 3595 }
3544 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
3545 warn "reloading..."; 3600 warn "reloading...";
3546 3601
3547 warn "entering sync_job"; 3602 warn "entering sync_job";
3548 3603
3549 cf::sync_job { 3604 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3606 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
3553 3608
3554 warn "syncing database to disk"; 3609 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3611
3557 # if anything goes wrong in here, we should simply crash as we already saved 3612 # if anything goes wrong in here, we should simply crash as we already saved
3558 3613
3559 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3617 }
3591 3618
3592 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
3594 } 3621 %EXT_CORO = ();
3595 3622
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3632 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3633
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3607 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
3608 } 3643 }
3609 3644
3610 Symbol::delete_package $k; 3645 warn "unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648
3649 warn "... unloading $k";
3650 delete $INC{$k};
3651
3652 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g;
3654
3655 if (my $cb = $k->can ("unload_module")) {
3656 $cb->();
3657 }
3658
3659 clear_package $k;
3611 } 3660 }
3612 3661
3613 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3665
3617 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
3620 3669
3621 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3671 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
3624 3673
3625 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
3626 3675
3627 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
3628 require cf; 3677 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3630 3679
3631 warn "loading config and database again"; 3680 warn "loading config and database again";
3632 cf::reload_config; 3681 cf::reload_config;
3633 3682
3634 warn "loading extensions"; 3683 warn "loading extensions";
3635 cf::load_extensions; 3684 cf::load_extensions;
3636 3685
3637 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
3643 3692
3644 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3645 3694
3646 1 3695 1
3647 } or do { 3696 } or do {
3648 warn $@; 3697 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3650 }; 3699 };
3651 3700
3652 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
3653}; 3704};
3654 3705
3655our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3656 3707
3657sub reload_perl() { 3708sub reload_perl() {
… …
3682 3733
3683our @WAIT_FOR_TICK; 3734our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3735our @WAIT_FOR_TICK_BEGIN;
3685 3736
3686sub wait_for_tick { 3737sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3738 return if tick_inhibit || $Coro::current == $Coro::main;
3689 3739
3690 my $signal = new Coro::Signal; 3740 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3741 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3742 $signal->wait;
3693} 3743}
3694 3744
3695sub wait_for_tick_begin { 3745sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3746 return if tick_inhibit || $Coro::current == $Coro::main;
3698 3747
3699 my $signal = new Coro::Signal; 3748 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3749 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3750 $signal->wait;
3702} 3751}
… …
3741{ 3790{
3742 # configure BDB 3791 # configure BDB
3743 3792
3744 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3745 BDB::max_poll_reqs $TICK * 0.1; 3794 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 3795 $AnyEvent::BDB::WATCHER->priority (1);
3747 3796
3748 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 3798 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3799 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 3800 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3801 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3803 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 3804
3755 cf::sync_job { 3805 cf::sync_job {
3756 eval { 3806 eval {
… …
3782{ 3832{
3783 # configure IO::AIO 3833 # configure IO::AIO
3784 3834
3785 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 3837 undef $AnyEvent::AIO::WATCHER;
3788} 3838}
3789 3839
3790my $_log_backtrace; 3840my $_log_backtrace;
3791 3841
3792sub _log_backtrace { 3842sub _log_backtrace {
… …
3795 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3796 3846
3797 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3800 async { 3851 async {
3801 $Coro::current->{desc} = "abt $msg"; 3852 $Coro::current->{desc} = "abt $msg";
3802 3853
3803 my @bt = fork_call { 3854 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
… …
3815 } 3866 }
3816 3867
3817 @funcs 3868 @funcs
3818 }; 3869 };
3819 3870
3820 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 3874 --$_log_backtrace;
3823 }; 3875 };
3824 } else { 3876 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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