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.415 by root, Thu Apr 10 15:35:16 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
… …
1775our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1777 1706
1778sub generate_random_map { 1707sub generate_random_map {
1779 my ($self, $rmp) = @_; 1708 my ($self, $rmp) = @_;
1709
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711
1780 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1713 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1838
1907# the temporary/swap location 1839# the temporary/swap location
1908sub save_path { 1840sub save_path {
1909 my ($self) = @_; 1841 my ($self) = @_;
1910 1842
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1913} 1845}
1914 1846
1915# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1916sub uniq_path { 1848sub uniq_path {
1917 my ($self) = @_; 1849 my ($self) = @_;
1918 1850
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1921} 1853}
1922 1854
1923# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1924# all maps in C++... 1856# all maps in C++...
… …
2022 1954
2023 cf::lock_wait "map_data:$path";#d#remove 1955 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
2025 1957
2026 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
2029 1961
2030 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2031 or return; 1963 or return;
2032 1964
2033 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 1968 or return;
2037 1969
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2041 undef $guard1; 1974 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1975 $map->reset;
2044 return find $path; 1976 return find $path;
2045 } 1977 }
2046 1978
2047 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2007 $f->skip_block;
2076 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2077 or return; 2009 or return;
2078 2010
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2080 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2081 2013
2082 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2015 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2110 } 2042 }
2111 2043
2112 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2114 2046
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2048 }
2117 2049
2118 $self->post_load; 2050 $self->post_load;
2119} 2051}
2120 2052
… …
2178 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2179 2111
2180 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2181 2113
2182 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2116 }
2185 2117
2186 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2187 2119
2188 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2157 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2228 }; 2160 };
2229 2161
2162 cf::get_slot 0.02;
2163
2230 if ($uniq) { 2164 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2167 } else {
2234 $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);
… …
2242 $self->save; 2176 $self->save;
2243 2177
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2179
2246 return if $self->players; 2180 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2249 2183
2250 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2251 2185
2252 $self->deactivate; 2186 $self->deactivate;
… …
2370 2304
2371sub unique_maps() { 2305sub unique_maps() {
2372 [ 2306 [
2373 map { 2307 map {
2374 utf8::decode $_; 2308 utf8::decode $_;
2375 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2376 ? normalise $_ 2312 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2314 ]
2380} 2315}
2381 2316
2382=back 2317=back
… …
2389 2324
2390=over 4 2325=over 4
2391 2326
2392=item $ob->inv_recursive 2327=item $ob->inv_recursive
2393 2328
2394Returns 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.
2395 2331
2396=cut 2332=cut
2397 2333
2398sub inv_recursive_; 2334sub inv_recursive_;
2399sub inv_recursive_ { 2335sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2405} 2341}
2406 2342
2407=item $ref = $ob->ref 2343=item $ref = $ob->ref
2408 2344
2409creates 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.
2410 2346
2411=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2412 2348
2413returns 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,
2414even if the object actually exists. May block. 2350even if the object actually exists. May block.
… …
2446can 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
2447dialogue with the given NPC character. 2383dialogue with the given NPC character.
2448 2384
2449=cut 2385=cut
2450 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
2451# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2402# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2418
2469 } else { 2419 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2422 }
2473 } 2423 }
2474} 2424}
2475 2425
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2451
2502=item $player_object->enter_link 2452=item $player_object->enter_link
2503 2453
2504Freezes 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}>).
2505 2455
2506The 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.
2507I<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.
2508 2460
2509Will never block. 2461Will never block.
2510 2462
2511=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2512 2464
… …
2570 2522
2571 $map->load; 2523 $map->load;
2572 $map->load_neighbours; 2524 $map->load_neighbours;
2573 2525
2574 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2528 $self->activate_recursive;
2576 2529
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2579} 2532}
… …
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2544
2589=cut 2545=cut
2590 2546
2591our $GOTOGEN; 2547our $GOTOGEN;
2592 2548
… …
2671} 2627}
2672 2628
2673sub prepare_random_map { 2629sub prepare_random_map {
2674 my ($exit) = @_; 2630 my ($exit) = @_;
2675 2631
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2634 # that depends on the exit object
2681 2635
2682 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2638 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2689 } 2645 }
2690 2646
2691 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2692 2648
2693 my $data = cf::encode_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2696 2652
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2655 undef $fh;
2700 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2701 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2704 } 2664 }
2705} 2665}
2706 2666
2707sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2709 2669
2710 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2711 2671
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2672 $self->enter_link;
2724 2673
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2674 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2731 2676
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2735 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
2736 1; 2698 1
2737 }) { 2699 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2704
2743 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2809 id => "infobox", 2771 id => "infobox",
2810 title => "Body Parts", 2772 title => "Body Parts",
2811 reply => undef, 2773 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2813 }, 2775 },
2776 "c/skills" => {
2777 id => "infobox",
2778 title => "Skills",
2779 reply => undef,
2780 tooltip => "Shows your experience per skill and item power",
2781 },
2814 "c/uptime" => { 2782 "c/uptime" => {
2815 id => "infobox", 2783 id => "infobox",
2816 title => "Uptime", 2784 title => "Uptime",
2817 reply => undef, 2785 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2786 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 2789 id => "infobox",
2822 title => "Map Info", 2790 title => "Map Info",
2823 reply => undef, 2791 reply => undef,
2824 tooltip => "Information related to the maps", 2792 tooltip => "Information related to the maps",
2825 }, 2793 },
2794 "c/party" => {
2795 id => "party",
2796 title => "Party",
2797 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party",
2799 },
2826); 2800);
2827 2801
2828sub cf::client::send_msg { 2802sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2804
2831 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2832 2807
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2809
2835 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2857 if ($self->can_msg) { 2832 if ($self->can_msg) {
2858 # default colour, mask it out 2833 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2861 2836
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2863 [$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);
2864 } else { 2853 } else {
2865 if ($color >= 0) { 2854 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2867 for ($msg) { 2856 for ($msg) {
2868 1 while 2857 1 while
… …
3067 3056
3068The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
3069 3058
3070 cf::object 3059 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3061 insert remove name archname title slaying race decrease split
3073 3062
3074 cf::object::player 3063 cf::object::player
3075 player 3064 player
3076 3065
3077 cf::player 3066 cf::player
… …
3082 3071
3083=cut 3072=cut
3084 3073
3085for ( 3074for (
3086 ["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
3087 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3077 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3092) { 3081) {
3093 no strict 'refs'; 3082 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3303 } 3292 }
3304}; 3293};
3305 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
3306sub reload_regions { 3305sub reload_regions {
3307 # 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
3308 # for this (global event?) 3307 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3309
… …
3323} 3322}
3324 3323
3325sub reload_archetypes { 3324sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3327}
3334 3328
3335sub reload_treasures { 3329sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3338} 3332}
3339 3333
3340sub reload_resources { 3334sub reload_resources {
3341 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3342 3336
3337 reload_facedata;
3338 reload_archetypes;
3343 reload_regions; 3339 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3340 reload_treasures;
3348 3341
3349 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3350} 3343}
3351 3344
3352sub init { 3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3353 reload_resources; 3350 reload_resources;
3354} 3351}
3355 3352
3356sub reload_config { 3353sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3372 }; 3369 };
3373 warn $@ if $@; 3370 warn $@ if $@;
3374 } 3371 }
3375} 3372}
3376 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
3377sub main { 3393sub main {
3394 atomic;
3395
3378 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
3380 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#
3381 (async { 3399 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3401 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3402 })->prio (Coro::PRIO_MAX);
3385 }; 3403 };
3386 3404
3405 {
3406 my $guard = freeze_mainloop;
3387 reload_config; 3407 reload_config;
3388 db_init; 3408 db_init;
3389 load_extensions; 3409 load_extensions;
3390 3410
3391 $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
3392 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
3393 EV::loop; 3419 EV::loop;
3394} 3420}
3395 3421
3396############################################################################# 3422#############################################################################
3397# initialisation and cleanup 3423# initialisation and cleanup
… …
3404 cf::cleanup "SIG$signal"; 3430 cf::cleanup "SIG$signal";
3405 }; 3431 };
3406 } 3432 }
3407} 3433}
3408 3434
3409sub write_runtime { 3435sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
3414 3438
3415 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3440
3417 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
3418 3442
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3444 or return;
3421 3445
3422 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
3435 3459
3436 close $fh 3460 close $fh
3437 or return; 3461 or return;
3438 3462
3439 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3464 and return;
3441 3465
3442 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
3443 3467
3444 1 3468 1
3469}
3470
3471our $uuid_lock;
3472our $uuid_skip;
3473
3474sub write_uuid_sync($) {
3475 $uuid_skip ||= $_[0];
3476
3477 return if $uuid_lock;
3478 local $uuid_lock = 1;
3479
3480 my $uuid = "$LOCALDIR/uuid";
3481
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return;
3484
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3486 $uuid_skip = 0;
3487
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return;
3490
3491 # always fsync - this file is important
3492 aio_fsync $fh
3493 and return;
3494
3495 close $fh
3496 or return;
3497
3498 aio_rename "$uuid~", $uuid
3499 and return;
3500
3501 warn "uuid file written ($value).\n";
3502
3503 1
3504
3505}
3506
3507sub write_uuid($$) {
3508 my ($skip, $sync) = @_;
3509
3510 $sync ? write_uuid_sync $skip
3511 : async { write_uuid_sync $skip };
3445} 3512}
3446 3513
3447sub emergency_save() { 3514sub emergency_save() {
3448 my $freeze_guard = cf::freeze_mainloop; 3515 my $freeze_guard = cf::freeze_mainloop;
3449 3516
… …
3471 warn "end emergency map save\n"; 3538 warn "end emergency map save\n";
3472 3539
3473 warn "begin emergency database checkpoint\n"; 3540 warn "begin emergency database checkpoint\n";
3474 BDB::db_env_txn_checkpoint $DB_ENV; 3541 BDB::db_env_txn_checkpoint $DB_ENV;
3475 warn "end emergency database checkpoint\n"; 3542 warn "end emergency database checkpoint\n";
3543
3544 warn "begin write uuid\n";
3545 write_uuid_sync 1;
3546 warn "end write uuid\n";
3476 }; 3547 };
3477 3548
3478 warn "leave emergency perl save\n"; 3549 warn "leave emergency perl save\n";
3479} 3550}
3480 3551
3481sub post_cleanup { 3552sub post_cleanup {
3482 my ($make_core) = @_; 3553 my ($make_core) = @_;
3483 3554
3484 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
3485 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
3486} 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
3487 3589
3488sub do_reload_perl() { 3590sub do_reload_perl() {
3489 # can/must only be called in main 3591 # can/must only be called in main
3490 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
3491 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
3492 return; 3594 return;
3493 } 3595 }
3494 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
3495 warn "reloading..."; 3600 warn "reloading...";
3496 3601
3497 warn "entering sync_job"; 3602 warn "entering sync_job";
3498 3603
3499 cf::sync_job { 3604 cf::sync_job {
3500 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3501 cf::emergency_save; 3606 cf::emergency_save;
3502 cf::write_runtime; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
3503 3608
3504 warn "syncing database to disk"; 3609 warn "syncing database to disk";
3505 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3506 3611
3507 # 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
3508 3613
3509 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
3510 for (;;) {
3511 BDB::flush;
3512 IO::AIO::flush;
3513 Coro::cede_notself;
3514 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
3515 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3516 }
3517
3518 ++$RELOAD;
3519
3520 warn "cancelling all extension coros";
3521 $_->cancel for values %EXT_CORO;
3522 %EXT_CORO = ();
3523
3524 warn "removing commands";
3525 %COMMAND = ();
3526
3527 warn "removing ext/exti commands";
3528 %EXTCMD = ();
3529 %EXTICMD = ();
3530
3531 warn "unloading/nuking all extensions";
3532 for my $pkg (@EXTS) {
3533 warn "... unloading $pkg";
3534
3535 if (my $cb = $pkg->can ("unload")) {
3536 eval {
3537 $cb->($pkg);
3538 1
3539 } or warn "$pkg unloaded, but with errors: $@";
3540 } 3617 }
3541 3618
3542 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
3543 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
3544 } 3621 %EXT_CORO = ();
3545 3622
3546 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
3547 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
3548 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3549 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3550 warn "... unloading $k"; 3632 warn "... unloading $pkg";
3551 delete $INC{$k};
3552 3633
3553 $k =~ s/\.pm$//;
3554 $k =~ s/\//::/g;
3555
3556 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3557 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
3558 } 3643 }
3559 3644
3560 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;
3561 } 3660 }
3562 3661
3563 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
3564 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
3565 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);
3566 3665
3567 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
3568 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
3569 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
3570 3669
3571 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
3572 # and global variables created in xs 3671 # and global variables created in xs
3573 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
3574 3673
3575 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
3576 3675
3577 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
3578 require cf; 3677 require cf;
3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3580 3679
3581 warn "loading config and database again"; 3680 warn "loading config and database again";
3582 cf::reload_config; 3681 cf::reload_config;
3583 3682
3584 warn "loading extensions"; 3683 warn "loading extensions";
3585 cf::load_extensions; 3684 cf::load_extensions;
3586 3685
3587 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
3588 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
3589 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
3590 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
3591 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
3592 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
3593 3692
3594 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3595 3694
3596 1 3695 1
3597 } or do { 3696 } or do {
3598 warn $@; 3697 warn $@;
3599 cf::cleanup "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3600 }; 3699 };
3601 3700
3602 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
3603}; 3704};
3604 3705
3605our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3606 3707
3607sub reload_perl() { 3708sub reload_perl() {
… …
3632 3733
3633our @WAIT_FOR_TICK; 3734our @WAIT_FOR_TICK;
3634our @WAIT_FOR_TICK_BEGIN; 3735our @WAIT_FOR_TICK_BEGIN;
3635 3736
3636sub wait_for_tick { 3737sub wait_for_tick {
3637 return if tick_inhibit;
3638 return if $Coro::current == $Coro::main; 3738 return if tick_inhibit || $Coro::current == $Coro::main;
3639 3739
3640 my $signal = new Coro::Signal; 3740 my $signal = new Coro::Signal;
3641 push @WAIT_FOR_TICK, $signal; 3741 push @WAIT_FOR_TICK, $signal;
3642 $signal->wait; 3742 $signal->wait;
3643} 3743}
3644 3744
3645sub wait_for_tick_begin { 3745sub wait_for_tick_begin {
3646 return if tick_inhibit;
3647 return if $Coro::current == $Coro::main; 3746 return if tick_inhibit || $Coro::current == $Coro::main;
3648 3747
3649 my $signal = new Coro::Signal; 3748 my $signal = new Coro::Signal;
3650 push @WAIT_FOR_TICK_BEGIN, $signal; 3749 push @WAIT_FOR_TICK_BEGIN, $signal;
3651 $signal->wait; 3750 $signal->wait;
3652} 3751}
… …
3662 3761
3663 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3762 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3665 Coro::async_pool { 3764 Coro::async_pool {
3666 $Coro::current->{desc} = "runtime saver"; 3765 $Coro::current->{desc} = "runtime saver";
3667 write_runtime 3766 write_runtime_sync
3668 or warn "ERROR: unable to write runtime file: $!"; 3767 or warn "ERROR: unable to write runtime file: $!";
3669 }; 3768 };
3670 } 3769 }
3671 3770
3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3691{ 3790{
3692 # configure BDB 3791 # configure BDB
3693 3792
3694 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3695 BDB::max_poll_reqs $TICK * 0.1; 3794 BDB::max_poll_reqs $TICK * 0.1;
3696 $Coro::BDB::WATCHER->priority (1); 3795 $AnyEvent::BDB::WATCHER->priority (1);
3697 3796
3698 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3699 $DB_ENV = BDB::db_env_create; 3798 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3799 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3701 | 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;
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3803 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3704 3804
3705 cf::sync_job { 3805 cf::sync_job {
3706 eval { 3806 eval {
… …
3732{ 3832{
3733 # configure IO::AIO 3833 # configure IO::AIO
3734 3834
3735 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3736 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3737 $Coro::AIO::WATCHER->priority (1); 3837 undef $AnyEvent::AIO::WATCHER;
3738} 3838}
3739 3839
3740my $_log_backtrace; 3840my $_log_backtrace;
3741 3841
3742sub _log_backtrace { 3842sub _log_backtrace {
… …
3745 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3746 3846
3747 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3748 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3749 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3750 async { 3851 async {
3751 $Coro::current->{desc} = "abt $msg"; 3852 $Coro::current->{desc} = "abt $msg";
3752 3853
3753 my @bt = fork_call { 3854 my @bt = fork_call {
3754 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
… …
3765 } 3866 }
3766 3867
3767 @funcs 3868 @funcs
3768 }; 3869 };
3769 3870
3770 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3771 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3772 --$_log_backtrace; 3874 --$_log_backtrace;
3773 }; 3875 };
3774 } else { 3876 } else {
3775 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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