ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.451 by root, Mon Sep 22 05:42:41 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 = ();
… …
73our %EXTCMD = (); 81our %EXTCMD = ();
74our %EXTICMD = (); 82our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
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, non-zero while in reload
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: @_";
… …
332 return;#d# 341 return;#d#
333 }#d# 342 }#d#
334 343
335 # wait for lock, if any 344 # wait for lock, if any
336 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 347 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 348 Coro::schedule;
339 } 349 }
340} 350}
341 351
… …
427 } 437 }
428 } 438 }
429}; 439};
430 440
431sub get_slot($;$$) { 441sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main;
443
432 my ($time, $pri, $name) = @_; 444 my ($time, $pri, $name) = @_;
433 445
434 $time = $TICK * .6 if $time > $TICK * .6; 446 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 447 my $sig = new Coro::Signal;
436 448
… …
722 734
723############################################################################# 735#############################################################################
724 736
725=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
726 738
727Many objects in crossfire are so-called attachable objects. That means you can 739Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
730 742
731In the following description, CLASS can be any of C<global>, C<object> 743In 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 744C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
783 795
784Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
786 798
787Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 800that are attached at load/instantiate time, thus the need for a name.
789 801
790These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
791 803
792=over 4 804=over 4
… …
1083 1095
1084sub reattach { 1096sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1098 my ($obj) = @_;
1087 1099
1100 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1101 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1102
1090 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
1091 1104
1092 @$registry = (); 1105 @$registry = ();
1093 1106
… …
1139 utf8::decode (my $decname = $filename); 1152 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1153 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1154 $decname, length $$rdata, scalar @$objs;
1142 1155
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1160 aio_close $fh;
1148 1161
1149 if (@$objs) { 1162 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1167 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1168 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1169 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1170 }
1158 } else { 1171 } else {
1159 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
1160 } 1173 }
… …
1329 1342
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1345
1333 $ext{source} = 1346 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1336 . $source 1349 . $source
1337 . "\n};\n1"; 1350 . "\n};\n1";
1338 1351
1339 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
… …
1379 1392
1380=back 1393=back
1381 1394
1382=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1383 1396
1384Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1385 1398
1386=cut 1399=cut
1387 1400
1388package cf::player; 1401package cf::player;
1389 1402
… …
1454 my $f = new_from_file cf::object::thawer path $login 1467 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1468 or return;
1456 1469
1457 my $pl = cf::player::load_pl $f 1470 my $pl = cf::player::load_pl $f
1458 or return; 1471 or return;
1472
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1473 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1474 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1475 $cf::PLAYER{$login} = $pl
1462 } 1476 }
1463 } 1477 }
… …
1473 1487
1474 return if $pl->{deny_save}; 1488 return if $pl->{deny_save};
1475 1489
1476 aio_mkdir playerdir $pl, 0770; 1490 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1491 $pl->{last_save} = $cf::RUNTIME;
1492
1493 cf::get_slot 0.01;
1478 1494
1479 $pl->save_pl ($path); 1495 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1496 cf::cede_to_tick;
1481} 1497}
1482 1498
… …
1514 my ($pl) = @_; 1530 my ($pl) = @_;
1515 1531
1516 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1517 1533
1518 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1535 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1536
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1538 $pl->deactivate;
1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1541 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1542 $pl->ns->destroy if $pl->ns;
1525 1543
1526 my $path = playerdir $pl; 1544 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1545 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1584
1567 for my $login (@$dirs) { 1585 for my $login (@$dirs) {
1568 my $path = path $login; 1586 my $path = path $login;
1569 1587
1570 # a .pst is a dead give-away for a valid player 1588 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1589 # if no pst file found, open and chekc for blocked users
1590 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1591 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1592 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1593 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1594 }
1576 1595
… …
1607 } 1626 }
1608 1627
1609 \@paths 1628 \@paths
1610} 1629}
1611 1630
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1632
1614Expand crossfire pod fragments into protocol xml. 1633Expand 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 1634
1705=item $player->ext_reply ($msgid, @msg) 1635=item $player->ext_reply ($msgid, @msg)
1706 1636
1707Sends an ext reply to the player. 1637Sends an ext reply to the player.
1708 1638
… …
1775our $MAX_RESET = 3600; 1705our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1706our $DEFAULT_RESET = 3000;
1777 1707
1778sub generate_random_map { 1708sub generate_random_map {
1779 my ($self, $rmp) = @_; 1709 my ($self, $rmp) = @_;
1710
1711 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712
1780 # mit "rum" bekleckern, nicht 1713 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1714 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1839
1907# the temporary/swap location 1840# the temporary/swap location
1908sub save_path { 1841sub save_path {
1909 my ($self) = @_; 1842 my ($self) = @_;
1910 1843
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1844 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1845 "$TMPDIR/$path.map"
1913} 1846}
1914 1847
1915# the unique path, undef == no special unique path 1848# the unique path, undef == no special unique path
1916sub uniq_path { 1849sub uniq_path {
1917 my ($self) = @_; 1850 my ($self) = @_;
1918 1851
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1853 "$UNIQUEDIR/$path"
1921} 1854}
1922 1855
1923# and all this just because we cannot iterate over 1856# and all this just because we cannot iterate over
1924# all maps in C++... 1857# all maps in C++...
… …
2022 1955
2023 cf::lock_wait "map_data:$path";#d#remove 1956 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1957 cf::lock_wait "map_find:$path";
2025 1958
2026 $cf::MAP{$path} || do { 1959 $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 1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
2029 1962
2030 my $map = new_from_path cf::map $path 1963 my $map = new_from_path cf::map $path
2031 or return; 1964 or return;
2032 1965
2033 $map->{last_save} = $cf::RUNTIME; 1966 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 1969 or return;
2037 1970
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1971 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1972 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1973 #$cf::WAIT_FOR_TICK->wait;
1974 undef $guard2;
2041 undef $guard1; 1975 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1976 $map->reset;
2044 return find $path; 1977 return find $path;
2045 } 1978 }
2046 1979
2047 $cf::MAP{$path} = $map 1980 $cf::MAP{$path} = $map
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2008 $f->skip_block;
2076 $self->_load_objects ($f) 2009 $self->_load_objects ($f)
2077 or return; 2010 or return;
2078 2011
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
2080 if delete $self->{load_original}; 2013 if delete $self->{load_original};
2081 2014
2082 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2016 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2017 unless (aio_stat $uniq) {
… …
2110 } 2043 }
2111 2044
2112 $self->{last_save} = $cf::RUNTIME; 2045 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2046 $self->last_access ($cf::RUNTIME);
2114 2047
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2048 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2049 }
2117 2050
2118 $self->post_load; 2051 $self->post_load;
2119} 2052}
2120 2053
… …
2178 my ($path, $origin, $load) = @_; 2111 my ($path, $origin, $load) = @_;
2179 2112
2180 $path = normalise $path, $origin && $origin->{path}; 2113 $path = normalise $path, $origin && $origin->{path};
2181 2114
2182 if (my $map = $cf::MAP{$path}) { 2115 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2116 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2117 }
2185 2118
2186 $MAP_PREFETCH{$path} |= $load; 2119 $MAP_PREFETCH{$path} |= $load;
2187 2120
2188 $MAP_PREFETCHER ||= cf::async { 2121 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2158 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2159 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2160 $_->contr->save for $self->players;
2228 }; 2161 };
2229 2162
2163 cf::get_slot 0.02;
2164
2230 if ($uniq) { 2165 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2167 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2168 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2242 $self->save; 2177 $self->save;
2243 2178
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2180
2246 return if $self->players; 2181 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2249 2184
2250 $self->in_memory (cf::MAP_SWAPPED); 2185 $self->in_memory (cf::MAP_SWAPPED);
2251 2186
2252 $self->deactivate; 2187 $self->deactivate;
… …
2370 2305
2371sub unique_maps() { 2306sub unique_maps() {
2372 [ 2307 [
2373 map { 2308 map {
2374 utf8::decode $_; 2309 utf8::decode $_;
2375 /\.map$/ 2310 s/\.map$//; # TODO future compatibility hack
2311 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2312 ? ()
2376 ? normalise $_ 2313 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2314 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2315 ]
2380} 2316}
2381 2317
2382=back 2318=back
… …
2389 2325
2390=over 4 2326=over 4
2391 2327
2392=item $ob->inv_recursive 2328=item $ob->inv_recursive
2393 2329
2394Returns the inventory of the object _and_ their inventories, recursively. 2330Returns the inventory of the object I<and> their inventories, recursively,
2331but I<not> the object itself.
2395 2332
2396=cut 2333=cut
2397 2334
2398sub inv_recursive_; 2335sub inv_recursive_;
2399sub inv_recursive_ { 2336sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2405} 2342}
2406 2343
2407=item $ref = $ob->ref 2344=item $ref = $ob->ref
2408 2345
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2346Creates and returns a persistent reference to an object that can be stored as a string.
2410 2347
2411=item $ob = cf::object::deref ($refstring) 2348=item $ob = cf::object::deref ($refstring)
2412 2349
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2351even if the object actually exists. May block.
… …
2446can be C<undef>. Does the right thing when the player is currently in a 2383can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2384dialogue with the given NPC character.
2448 2385
2449=cut 2386=cut
2450 2387
2388our $SAY_CHANNEL = {
2389 id => "say",
2390 title => "Map",
2391 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2393};
2394
2395our $CHAT_CHANNEL = {
2396 id => "chat",
2397 title => "Chat",
2398 reply => "chat ",
2399 tooltip => "Player chat and shouts, global to the server.",
2400};
2401
2451# rough implementation of a future "reply" method that works 2402# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2403# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2404#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2405sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2406 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2419
2469 } else { 2420 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2422 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2423 }
2473 } 2424 }
2474} 2425}
2475 2426
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2427=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2452
2502=item $player_object->enter_link 2453=item $player_object->enter_link
2503 2454
2504Freezes the player and moves him/her to a special map (C<{link}>). 2455Freezes the player and moves him/her to a special map (C<{link}>).
2505 2456
2506The player should be reasonably safe there for short amounts of time. You 2457The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2458for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link
2460map.
2508 2461
2509Will never block. 2462Will never block.
2510 2463
2511=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2512 2465
… …
2570 2523
2571 $map->load; 2524 $map->load;
2572 $map->load_neighbours; 2525 $map->load_neighbours;
2573 2526
2574 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2529 $self->activate_recursive;
2576 2530
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2579} 2533}
… …
2583Moves the player to the given map-path and coordinates by first freezing 2537Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2539that 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 2540the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2541be called at the end of this process.
2542
2543Note that $check will be called with a potentially non-loaded map, so if
2544it needs a loaded map it has to call C<< ->load >>.
2588 2545
2589=cut 2546=cut
2590 2547
2591our $GOTOGEN; 2548our $GOTOGEN;
2592 2549
… …
2671} 2628}
2672 2629
2673sub prepare_random_map { 2630sub prepare_random_map {
2674 my ($exit) = @_; 2631 my ($exit) = @_;
2675 2632
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2633 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2634 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2635 # that depends on the exit object
2681 2636
2682 my $rmp = parse_random_map_params $exit->msg; 2637 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2639 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2640 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2641 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2642 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2643 $rmp->{origin_y} = $exit->y;
2644
2645 $exit->map->touch;
2689 } 2646 }
2690 2647
2691 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2692 2649
2693 my $data = cf::encode_json $rmp; 2650 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2696 2653
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2656 undef $fh;
2700 aio_rename "$meta~", $meta; 2657 aio_rename "$meta~", $meta;
2701 2658
2659 my $slaying = "?random/$md5";
2660
2661 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2662 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2663 $exit->msg (undef);
2664 }
2704 } 2665 }
2705} 2666}
2706 2667
2707sub cf::object::player::enter_exit { 2668sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2669 my ($self, $exit) = @_;
2709 2670
2710 return unless $self->type == cf::PLAYER; 2671 return unless $self->type == cf::PLAYER;
2711 2672
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; 2673 $self->enter_link;
2724 2674
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 { 2675 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2676 $Coro::current->{desc} = "enter_exit";
2731 2677
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2678 unless (eval {
2679 $self->deactivate_recursive; # just to be sure
2680
2681 # random map handling
2682 {
2683 my $guard = cf::lock_acquire "exit_prepare:$exit";
2684
2685 prepare_random_map $exit
2686 if $exit->slaying eq "/!";
2687 }
2688
2689 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2690 my $x = $exit->stats->hp;
2691 my $y = $exit->stats->sp;
2692
2734 $self->goto ($slaying, $hp, $sp); 2693 $self->goto ($map, $x, $y);
2735 2694
2695 # if exit is damned, update players death & WoR home-position
2696 $self->contr->savebed ($map, $x, $y)
2697 if $exit->flag (cf::FLAG_DAMNED);
2698
2736 1; 2699 1
2737 }) { 2700 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2702 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2705
2743 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
… …
2809 id => "infobox", 2772 id => "infobox",
2810 title => "Body Parts", 2773 title => "Body Parts",
2811 reply => undef, 2774 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2775 tooltip => "Shows which body parts you posess and are available",
2813 }, 2776 },
2777 "c/skills" => {
2778 id => "infobox",
2779 title => "Skills",
2780 reply => undef,
2781 tooltip => "Shows your experience per skill and item power",
2782 },
2814 "c/uptime" => { 2783 "c/uptime" => {
2815 id => "infobox", 2784 id => "infobox",
2816 title => "Uptime", 2785 title => "Uptime",
2817 reply => undef, 2786 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2787 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 2790 id => "infobox",
2822 title => "Map Info", 2791 title => "Map Info",
2823 reply => undef, 2792 reply => undef,
2824 tooltip => "Information related to the maps", 2793 tooltip => "Information related to the maps",
2825 }, 2794 },
2795 "c/party" => {
2796 id => "party",
2797 title => "Party",
2798 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party",
2800 },
2826); 2801);
2827 2802
2828sub cf::client::send_msg { 2803sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2805
2831 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg)
2807 unless $color & cf::NDI_VERBATIM;
2832 2808
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2809 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2810
2835 # check predefined channels, for the benefit of C 2811 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2812 if ($CHANNEL{$channel}) {
… …
2857 if ($self->can_msg) { 2833 if ($self->can_msg) {
2858 # default colour, mask it out 2834 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2836 if $color & cf::NDI_DEF;
2861 2837
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2838 my $pkt = "msg "
2839 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 );
2842
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt);
2864 } else { 2854 } else {
2865 if ($color >= 0) { 2855 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones 2856 # replace some tags by gcfclient-compatible ones
2867 for ($msg) { 2857 for ($msg) {
2868 1 while 2858 1 while
… …
3067 3057
3068The following functions and methods are available within a safe environment: 3058The following functions and methods are available within a safe environment:
3069 3059
3070 cf::object 3060 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3061 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3062 insert remove name archname title slaying race decrease split
3073 3063
3074 cf::object::player 3064 cf::object::player
3075 player 3065 player
3076 3066
3077 cf::player 3067 cf::player
… …
3082 3072
3083=cut 3073=cut
3084 3074
3085for ( 3075for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3077 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3078 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3079 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3080 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3081 ["cf::map" => qw(trigger)],
3092) { 3082) {
3093 no strict 'refs'; 3083 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3291 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3292 $ns->fx_want ($k, $v);
3303 } 3293 }
3304}; 3294};
3305 3295
3296sub load_resource_file($) {
3297 my $guard = lock_acquire "load_resource_file";
3298
3299 my $status = load_resource_file_ $_[0];
3300 get_slot 0.1, 100;
3301 cf::arch::commit_load;
3302
3303 $status
3304}
3305
3306sub reload_regions { 3306sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3307 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3308 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3309 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3310
… …
3323} 3323}
3324 3324
3325sub reload_archetypes { 3325sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3326 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3327 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} 3328}
3334 3329
3335sub reload_treasures { 3330sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3331 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3332 or die "unable to load treasurelists\n";
3338} 3333}
3339 3334
3340sub reload_resources { 3335sub reload_resources {
3341 warn "reloading resource files...\n"; 3336 warn "reloading resource files...\n";
3342 3337
3338 reload_facedata;
3339 reload_archetypes;
3343 reload_regions; 3340 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3341 reload_treasures;
3348 3342
3349 warn "finished reloading resource files\n"; 3343 warn "finished reloading resource files\n";
3350} 3344}
3351 3345
3352sub init { 3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3353 reload_resources; 3351 reload_resources;
3354} 3352}
3355 3353
3356sub reload_config { 3354sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3372 }; 3370 };
3373 warn $@ if $@; 3371 warn $@ if $@;
3374 } 3372 }
3375} 3373}
3376 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3377sub main { 3394sub main {
3395 atomic;
3396
3378 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3400 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3402 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3403 })->prio (Coro::PRIO_MAX);
3385 }; 3404 };
3386 3405
3406 {
3407 my $guard = freeze_mainloop;
3387 reload_config; 3408 reload_config;
3388 db_init; 3409 db_init;
3389 load_extensions; 3410 load_extensions;
3390 3411
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3413 }
3414
3415 utime time, time, $RUNTIMEFILE;
3416
3417 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419
3393 EV::loop; 3420 EV::loop;
3394} 3421}
3395 3422
3396############################################################################# 3423#############################################################################
3397# initialisation and cleanup 3424# initialisation and cleanup
… …
3404 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3405 }; 3432 };
3406 } 3433 }
3407} 3434}
3408 3435
3409sub write_runtime { 3436sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
3414 3439
3415 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3441
3417 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
3418 3443
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3445 or return;
3421 3446
3422 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
3435 3460
3436 close $fh 3461 close $fh
3437 or return; 3462 or return;
3438 3463
3439 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3465 and return;
3441 3466
3442 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
3443 3468
3444 1 3469 1
… …
3528sub post_cleanup { 3553sub post_cleanup {
3529 my ($make_core) = @_; 3554 my ($make_core) = @_;
3530 3555
3531 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3557 if $make_core;
3558
3559 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$;
3561}
3562
3563# a safer delete_package, copied from Symbol
3564sub clear_package($) {
3565 my $pkg = shift;
3566
3567 # expand to full symbol table name if needed
3568 unless ($pkg =~ /^main::.*::$/) {
3569 $pkg = "main$pkg" if $pkg =~ /^::/;
3570 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3571 $pkg .= '::' unless $pkg =~ /::$/;
3572 }
3573
3574 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3575 my $stem_symtab = *{$stem}{HASH};
3576
3577 defined $stem_symtab and exists $stem_symtab->{$leaf}
3578 or return;
3579
3580 # clear all symbols
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 }
3586 warn "cleared package $pkg\n";#d#
3533} 3587}
3534 3588
3535sub do_reload_perl() { 3589sub do_reload_perl() {
3536 # can/must only be called in main 3590 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
3539 return; 3593 return;
3540 } 3594 }
3541 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
3542 warn "reloading..."; 3599 warn "reloading...";
3543 3600
3544 warn "entering sync_job"; 3601 warn "entering sync_job";
3545 3602
3546 cf::sync_job { 3603 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3605 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3550 3607
3551 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3610
3554 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3555 3612
3556 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3616 }
3588 3617
3589 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
3591 } 3620 %EXT_CORO = ();
3592 3621
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3631 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3632
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3604 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
3605 } 3642 }
3606 3643
3607 Symbol::delete_package $k; 3644 warn "unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647
3648 warn "... unloading $k";
3649 delete $INC{$k};
3650
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) {
3655 $cb->();
3656 }
3657
3658 clear_package $k;
3608 } 3659 }
3609 3660
3610 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3664
3614 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
3617 3668
3618 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3670 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
3621 3672
3622 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
3623 3674
3624 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3625 require cf; 3676 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3678
3628 warn "loading config and database again"; 3679 warn "loading config and database again";
3629 cf::reload_config; 3680 cf::reload_config;
3630 3681
3631 warn "loading extensions"; 3682 warn "loading extensions";
3632 cf::load_extensions; 3683 cf::load_extensions;
3633 3684
3634 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
3640 3691
3641 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3642 3693
3643 1 3694 1
3644 } or do { 3695 } or do {
3645 warn $@; 3696 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3647 }; 3698 };
3648 3699
3649 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
3650}; 3703};
3651 3704
3652our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
3653 3706
3654sub reload_perl() { 3707sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3657 3710
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3712 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3661 }; 3714 };
3662} 3715}
3663 3716
… …
3679 3732
3680our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3682 3735
3683sub wait_for_tick { 3736sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3738
3687 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3741 $signal->wait;
3690} 3742}
3691 3743
3692sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3746
3696 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3749 $signal->wait;
3699} 3750}
… …
3709 3760
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 3763 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3765 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3767 };
3717 } 3768 }
3718 3769
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
… …
3738{ 3789{
3739 # configure BDB 3790 # configure BDB
3740 3791
3741 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3744 3795
3745 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3799 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3800 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3801 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3803
3752 cf::sync_job { 3804 cf::sync_job {
3753 eval { 3805 eval {
… …
3779{ 3831{
3780 # configure IO::AIO 3832 # configure IO::AIO
3781 3833
3782 IO::AIO::min_parallel 8; 3834 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3835 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3836 undef $AnyEvent::AIO::WATCHER;
3785} 3837}
3786 3838
3787my $_log_backtrace; 3839my $_log_backtrace;
3788 3840
3789sub _log_backtrace { 3841sub _log_backtrace {
… …
3792 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3793 3845
3794 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3797 async { 3850 async {
3798 $Coro::current->{desc} = "abt $msg"; 3851 $Coro::current->{desc} = "abt $msg";
3799 3852
3800 my @bt = fork_call { 3853 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 3865 }
3813 3866
3814 @funcs 3867 @funcs
3815 }; 3868 };
3816 3869
3817 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3873 --$_log_backtrace;
3820 }; 3874 };
3821 } else { 3875 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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