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.424 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.452 by root, Tue Sep 23 00:24:52 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
… …
724 734
725############################################################################# 735#############################################################################
726 736
727=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
728 738
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
732 742
733In 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>
734C<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
… …
784=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
785 795
786Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
788 798
789Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 801
792These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
793 803
794=over 4 804=over 4
… …
1085 1095
1086sub reattach { 1096sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1098 my ($obj) = @_;
1089 1099
1100 # no longer needed after getting rid of delete_package?
1090 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
1091 1102
1092 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
1093 1104
1094 @$registry = (); 1105 @$registry = ();
1095 1106
… …
1141 utf8::decode (my $decname = $filename); 1152 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1153 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1154 $decname, length $$rdata, scalar @$objs;
1144 1155
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1160 aio_close $fh;
1150 1161
1151 if (@$objs) { 1162 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1167 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1168 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1169 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1170 }
1160 } else { 1171 } else {
1161 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
1162 } 1173 }
… …
1331 1342
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1345
1335 $ext{source} = 1346 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1338 . $source 1349 . $source
1339 . "\n};\n1"; 1350 . "\n};\n1";
1340 1351
1341 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
… …
1381 1392
1382=back 1393=back
1383 1394
1384=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1385 1396
1386Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1387 1398
1388=cut 1399=cut
1389 1400
1390package cf::player; 1401package cf::player;
1391 1402
… …
1434 1445
1435sub exists($) { 1446sub exists($) {
1436 my ($login) = @_; 1447 my ($login) = @_;
1437 1448
1438 $cf::PLAYER{$login} 1449 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1450 or !aio_stat path $login
1440} 1451}
1441 1452
1442sub find($) { 1453sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1454 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1455 my $login = $_[0];
… …
1456 my $f = new_from_file cf::object::thawer path $login 1467 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1468 or return;
1458 1469
1459 my $pl = cf::player::load_pl $f 1470 my $pl = cf::player::load_pl $f
1460 or return; 1471 or return;
1472
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1473 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1474 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1475 $cf::PLAYER{$login} = $pl
1464 } 1476 }
1465 } 1477 }
… …
1518 my ($pl) = @_; 1530 my ($pl) = @_;
1519 1531
1520 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1521 1533
1522 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1523 $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
1524 1536
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1538 $pl->deactivate;
1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1541 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1542 $pl->ns->destroy if $pl->ns;
1529 1543
1530 my $path = playerdir $pl; 1544 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1545 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1584
1571 for my $login (@$dirs) { 1585 for my $login (@$dirs) {
1572 my $path = path $login; 1586 my $path = path $login;
1573 1587
1574 # a .pst is a dead give-away for a valid player 1588 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1589 # if no pst file found, open and chekc for blocked users
1590 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1591 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1592 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1593 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1594 }
1580 1595
… …
1611 } 1626 }
1612 1627
1613 \@paths 1628 \@paths
1614} 1629}
1615 1630
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1632
1618Expand crossfire pod fragments into protocol xml. 1633Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1634
1709=item $player->ext_reply ($msgid, @msg) 1635=item $player->ext_reply ($msgid, @msg)
1710 1636
1711Sends an ext reply to the player. 1637Sends an ext reply to the player.
1712 1638
… …
2029 1955
2030 cf::lock_wait "map_data:$path";#d#remove 1956 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1957 cf::lock_wait "map_find:$path";
2032 1958
2033 $cf::MAP{$path} || do { 1959 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 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";
2036 1962
2037 my $map = new_from_path cf::map $path 1963 my $map = new_from_path cf::map $path
2038 or return; 1964 or return;
2039 1965
2040 $map->{last_save} = $cf::RUNTIME; 1966 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 1969 or return;
2044 1970
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1971 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1972 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1973 #$cf::WAIT_FOR_TICK->wait;
1974 undef $guard2;
2048 undef $guard1; 1975 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1976 $map->reset;
2051 return find $path; 1977 return find $path;
2052 } 1978 }
2053 1979
2054 $cf::MAP{$path} = $map 1980 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2008 $f->skip_block;
2083 $self->_load_objects ($f) 2009 $self->_load_objects ($f)
2084 or return; 2010 or return;
2085 2011
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
2087 if delete $self->{load_original}; 2013 if delete $self->{load_original};
2088 2014
2089 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2016 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2017 unless (aio_stat $uniq) {
… …
2457can 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
2458dialogue with the given NPC character. 2384dialogue with the given NPC character.
2459 2385
2460=cut 2386=cut
2461 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
2462# rough implementation of a future "reply" method that works 2402# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2403# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2405sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2406 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2419
2480 } else { 2420 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2422 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2423 }
2484 } 2424 }
2485} 2425}
2486 2426
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2427=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2452
2513=item $player_object->enter_link 2453=item $player_object->enter_link
2514 2454
2515Freezes 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}>).
2516 2456
2517The 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.
2518I<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.
2519 2461
2520Will never block. 2462Will never block.
2521 2463
2522=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2523 2465
… …
2581 2523
2582 $map->load; 2524 $map->load;
2583 $map->load_neighbours; 2525 $map->load_neighbours;
2584 2526
2585 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2529 $self->activate_recursive;
2587 2530
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2590} 2533}
… …
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2545
2600=cut 2546=cut
2601 2547
2602our $GOTOGEN; 2548our $GOTOGEN;
2603 2549
… …
2682} 2628}
2683 2629
2684sub prepare_random_map { 2630sub prepare_random_map {
2685 my ($exit) = @_; 2631 my ($exit) = @_;
2686 2632
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2633 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2634 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2635 # that depends on the exit object
2692 2636
2693 my $rmp = parse_random_map_params $exit->msg; 2637 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2639 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2640 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2641 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2642 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2643 $rmp->{origin_y} = $exit->y;
2644
2645 $exit->map->touch;
2700 } 2646 }
2701 2647
2702 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2703 2649
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2650 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2656 undef $fh;
2711 aio_rename "$meta~", $meta; 2657 aio_rename "$meta~", $meta;
2712 2658
2659 my $slaying = "?random/$md5";
2660
2661 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2662 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2663 $exit->msg (undef);
2664 }
2715 } 2665 }
2716} 2666}
2717 2667
2718sub cf::object::player::enter_exit { 2668sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2669 my ($self, $exit) = @_;
2720 2670
2721 return unless $self->type == cf::PLAYER; 2671 return unless $self->type == cf::PLAYER;
2722 2672
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2673 $self->enter_link;
2735 2674
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2675 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2676 $Coro::current->{desc} = "enter_exit";
2742 2677
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2693 $self->goto ($map, $x, $y);
2746 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
2747 1; 2699 1
2748 }) { 2700 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2705
2754 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
… …
2820 id => "infobox", 2772 id => "infobox",
2821 title => "Body Parts", 2773 title => "Body Parts",
2822 reply => undef, 2774 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2775 tooltip => "Shows which body parts you posess and are available",
2824 }, 2776 },
2777 "c/skills" => {
2778 id => "infobox",
2779 title => "Skills",
2780 reply => undef,
2781 tooltip => "Shows your experience per skill and item power",
2782 },
2825 "c/uptime" => { 2783 "c/uptime" => {
2826 id => "infobox", 2784 id => "infobox",
2827 title => "Uptime", 2785 title => "Uptime",
2828 reply => undef, 2786 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2787 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 2790 id => "infobox",
2833 title => "Map Info", 2791 title => "Map Info",
2834 reply => undef, 2792 reply => undef,
2835 tooltip => "Information related to the maps", 2793 tooltip => "Information related to the maps",
2836 }, 2794 },
2795 "c/party" => {
2796 id => "party",
2797 title => "Party",
2798 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party",
2800 },
2837); 2801);
2838 2802
2839sub cf::client::send_msg { 2803sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2805
2842 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg)
2807 unless $color & cf::NDI_VERBATIM;
2843 2808
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2809 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2810
2846 # check predefined channels, for the benefit of C 2811 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2812 if ($CHANNEL{$channel}) {
… …
2868 if ($self->can_msg) { 2833 if ($self->can_msg) {
2869 # default colour, mask it out 2834 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2836 if $color & cf::NDI_DEF;
2872 2837
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2838 my $pkt = "msg "
2839 . $self->{json_coder}->encode (
2874 [$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);
2875 } else { 2854 } else {
2876 if ($color >= 0) { 2855 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2856 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2857 for ($msg) {
2879 1 while 2858 1 while
… …
3078 3057
3079The following functions and methods are available within a safe environment: 3058The following functions and methods are available within a safe environment:
3080 3059
3081 cf::object 3060 cf::object
3082 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
3083 insert remove name archname title slaying race decrease_ob_nr 3062 insert remove name archname title slaying race decrease split
3084 3063
3085 cf::object::player 3064 cf::object::player
3086 player 3065 player
3087 3066
3088 cf::player 3067 cf::player
… …
3093 3072
3094=cut 3073=cut
3095 3074
3096for ( 3075for (
3097 ["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
3098 insert remove inv name archname title slaying race 3077 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3078 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3079 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3080 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3081 ["cf::map" => qw(trigger)],
3103) { 3082) {
3104 no strict 'refs'; 3083 no strict 'refs';
… …
3365} 3344}
3366 3345
3367sub init { 3346sub init {
3368 my $guard = freeze_mainloop; 3347 my $guard = freeze_mainloop;
3369 3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3370 reload_resources; 3351 reload_resources;
3371} 3352}
3372 3353
3373sub reload_config { 3354sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3389 }; 3370 };
3390 warn $@ if $@; 3371 warn $@ if $@;
3391 } 3372 }
3392} 3373}
3393 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
3394sub main { 3394sub main {
3395 atomic;
3396
3395 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
3397 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#
3398 (async { 3400 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
… …
3406 reload_config; 3408 reload_config;
3407 db_init; 3409 db_init;
3408 load_extensions; 3410 load_extensions;
3409 3411
3410 $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
3411 evthread_start IO::AIO::poll_fileno;
3412 } 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};
3413 3419
3414 EV::loop; 3420 EV::loop;
3415} 3421}
3416 3422
3417############################################################################# 3423#############################################################################
… …
3426 }; 3432 };
3427 } 3433 }
3428} 3434}
3429 3435
3430sub write_runtime_sync { 3436sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime";
3432
3433 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
3435 3439
3436 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3441
3438 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
3439 3443
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3441 or return; 3445 or return;
3442 3446
3443 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
… …
3455 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
3456 3460
3457 close $fh 3461 close $fh
3458 or return; 3462 or return;
3459 3463
3460 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3465 and return;
3462 3466
3463 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
3464 3468
3465 1 3469 1
… …
3549sub post_cleanup { 3553sub post_cleanup {
3550 my ($make_core) = @_; 3554 my ($make_core) = @_;
3551 3555
3552 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
3553 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#
3554} 3587}
3555 3588
3556sub do_reload_perl() { 3589sub do_reload_perl() {
3557 # can/must only be called in main 3590 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
3559 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
3560 return; 3593 return;
3561 } 3594 }
3562 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
3563 warn "reloading..."; 3599 warn "reloading...";
3564 3600
3565 warn "entering sync_job"; 3601 warn "entering sync_job";
3566 3602
3567 cf::sync_job { 3603 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3605 cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3571 3607
3572 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3574 3610
3575 # 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
3576 3612
3577 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
3583 warn "iterate..."; 3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = ();
3591
3592 warn "removing commands";
3593 %COMMAND = ();
3594
3595 warn "removing ext/exti commands";
3596 %EXTCMD = ();
3597 %EXTICMD = ();
3598
3599 warn "unloading/nuking all extensions";
3600 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg";
3602
3603 if (my $cb = $pkg->can ("unload")) {
3604 eval {
3605 $cb->($pkg);
3606 1
3607 } or warn "$pkg unloaded, but with errors: $@";
3608 } 3616 }
3609 3617
3610 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
3611 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
3612 } 3620 %EXT_CORO = ();
3613 3621
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
3615 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3618 warn "... unloading $k"; 3631 warn "... unloading $pkg";
3619 delete $INC{$k};
3620 3632
3621 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g;
3623
3624 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3625 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
3626 } 3642 }
3627 3643
3628 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;
3629 } 3659 }
3630 3660
3631 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
3633 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);
3634 3664
3635 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
3638 3668
3639 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3670 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
3642 3672
3643 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
3644 3674
3645 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3646 require cf; 3676 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3648 3678
3649 warn "loading config and database again"; 3679 warn "loading config and database again";
3650 cf::reload_config; 3680 cf::reload_config;
3651 3681
3652 warn "loading extensions"; 3682 warn "loading extensions";
3653 cf::load_extensions; 3683 cf::load_extensions;
3654 3684
3655 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
3661 3691
3662 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3663 3693
3664 1 3694 1
3665 } or do { 3695 } or do {
3666 warn $@; 3696 warn $@;
3667 cf::cleanup "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3668 }; 3698 };
3669 3699
3670 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
3671}; 3703};
3672 3704
3673our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
3674 3706
3675sub reload_perl() { 3707sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3678 3710
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 3712 do_reload_perl;
3681 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3682 }; 3714 };
3683} 3715}
3684 3716
… …
3757{ 3789{
3758 # configure BDB 3790 # configure BDB
3759 3791
3760 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3761 BDB::max_poll_reqs $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 3794 $AnyEvent::BDB::WATCHER->priority (1);
3763 3795
3764 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | 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;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3801 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 3803
3771 cf::sync_job { 3804 cf::sync_job {
3772 eval { 3805 eval {
… …
3798{ 3831{
3799 # configure IO::AIO 3832 # configure IO::AIO
3800 3833
3801 IO::AIO::min_parallel 8; 3834 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 3835 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 3836 undef $AnyEvent::AIO::WATCHER;
3804} 3837}
3805 3838
3806my $_log_backtrace; 3839my $_log_backtrace;
3807 3840
3808sub _log_backtrace { 3841sub _log_backtrace {
… …
3811 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3812 3845
3813 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3815 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3816 async { 3850 async {
3817 $Coro::current->{desc} = "abt $msg"; 3851 $Coro::current->{desc} = "abt $msg";
3818 3852
3819 my @bt = fork_call { 3853 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
… …
3831 } 3865 }
3832 3866
3833 @funcs 3867 @funcs
3834 }; 3868 };
3835 3869
3836 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 3873 --$_log_backtrace;
3839 }; 3874 };
3840 } else { 3875 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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