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.455 by root, Sat Sep 27 08:17:40 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
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 130our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
123 132
133our @POST_INIT;
134
124binmode STDOUT; 135binmode STDOUT;
125binmode STDERR; 136binmode STDERR;
126 137
127# read virtual server time, if available 138# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
132} 143}
133 144
134mkdir $_ 145mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 253for my $pkg (qw(
243 cf::global cf::attachable 254 cf::global cf::attachable
244 cf::object cf::object::player 255 cf::object cf::object::player
245 cf::client cf::player 256 cf::client cf::player
246 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
247 cf::map cf::party cf::region 259 cf::party cf::region
248)) { 260)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 262}
252 263
253$EV::DIED = sub { 264$EV::DIED = sub {
254 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 308
298sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
300 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
301=item cf::lock_wait $string 326=item cf::lock_wait $string
302 327
303Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
304 329
305=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
332 return;#d# 357 return;#d#
333 }#d# 358 }#d#
334 359
335 # wait for lock, if any 360 # wait for lock, if any
336 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 364 Coro::schedule;
339 } 365 }
340} 366}
341 367
… …
724 750
725############################################################################# 751#############################################################################
726 752
727=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
728 754
729Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
732 758
733In the following description, CLASS can be any of C<global>, C<object> 759In 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 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
785 811
786Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
788 814
789Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
791 817
792These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
793 819
794=over 4 820=over 4
… …
1085 1111
1086sub reattach { 1112sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1114 my ($obj) = @_;
1089 1115
1116 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1118
1092 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1093 1120
1094 @$registry = (); 1121 @$registry = ();
1095 1122
… …
1141 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1144 1171
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1176 aio_close $fh;
1150 1177
1151 if (@$objs) { 1178 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1184 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1186 }
1160 } else { 1187 } else {
1161 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1162 } 1189 }
… …
1331 1358
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1361
1335 $ext{source} = 1362 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1338 . $source 1365 . $source
1339 . "\n};\n1"; 1366 . "\n};\n1";
1340 1367
1341 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1381 1408
1382=back 1409=back
1383 1410
1384=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1385 1412
1386Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1387 1414
1388=cut 1415=cut
1389 1416
1390package cf::player; 1417package cf::player;
1391 1418
… …
1434 1461
1435sub exists($) { 1462sub exists($) {
1436 my ($login) = @_; 1463 my ($login) = @_;
1437 1464
1438 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1440} 1467}
1441 1468
1442sub find($) { 1469sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1471 my $login = $_[0];
… …
1456 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1484 or return;
1458 1485
1459 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1460 or return; 1487 or return;
1488
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1464 } 1492 }
1465 } 1493 }
… …
1518 my ($pl) = @_; 1546 my ($pl) = @_;
1519 1547
1520 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1521 1549
1522 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1552
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1529 1559
1530 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1600
1571 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1572 my $path = path $login; 1602 my $path = path $login;
1573 1603
1574 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1610 }
1580 1611
… …
1611 } 1642 }
1612 1643
1613 \@paths 1644 \@paths
1614} 1645}
1615 1646
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1648
1618Expand crossfire pod fragments into protocol xml. 1649Expand 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 1650
1709=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1710 1652
1711Sends an ext reply to the player. 1653Sends an ext reply to the player.
1712 1654
… …
2029 1971
2030 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
2032 1974
2033 $cf::MAP{$path} || do { 1975 $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 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1978
2037 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
2038 or return; 1980 or return;
2039 1981
2040 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
… …
2043 or return; 1985 or return;
2044 1986
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
2048 undef $guard1; 1991 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1992 $map->reset;
2051 return find $path; 1993 return find $path;
2052 } 1994 }
2053 1995
2054 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2024 $f->skip_block;
2083 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2084 or return; 2026 or return;
2085 2027
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2087 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2088 2030
2089 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2032 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2400dialogue with the given NPC character.
2459 2401
2460=cut 2402=cut
2461 2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2417
2462# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2419# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2435
2480 } else { 2436 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2439 }
2484 } 2440 }
2485} 2441}
2486 2442
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2468
2513=item $player_object->enter_link 2469=item $player_object->enter_link
2514 2470
2515Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2516 2472
2517The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2519 2477
2520Will never block. 2478Will never block.
2521 2479
2522=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2523 2481
… …
2581 2539
2582 $map->load; 2540 $map->load;
2583 $map->load_neighbours; 2541 $map->load_neighbours;
2584 2542
2585 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2545 $self->activate_recursive;
2587 2546
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2590} 2549}
… …
2594Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2555that 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 2556the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2599 2561
2600=cut 2562=cut
2601 2563
2602our $GOTOGEN; 2564our $GOTOGEN;
2603 2565
… …
2682} 2644}
2683 2645
2684sub prepare_random_map { 2646sub prepare_random_map {
2685 my ($exit) = @_; 2647 my ($exit) = @_;
2686 2648
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2651 # that depends on the exit object
2692 2652
2693 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2655 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2700 } 2662 }
2701 2663
2702 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2703 2665
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2672 undef $fh;
2711 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2712 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2715 } 2681 }
2716} 2682}
2717 2683
2718sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2720 2686
2721 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2722 2688
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; 2689 $self->enter_link;
2735 2690
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 { 2691 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2742 2693
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2745 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2746 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2747 1; 2715 1
2748 }) { 2716 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2721
2754 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2820 id => "infobox", 2788 id => "infobox",
2821 title => "Body Parts", 2789 title => "Body Parts",
2822 reply => undef, 2790 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2824 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2825 "c/uptime" => { 2799 "c/uptime" => {
2826 id => "infobox", 2800 id => "infobox",
2827 title => "Uptime", 2801 title => "Uptime",
2828 reply => undef, 2802 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 2806 id => "infobox",
2833 title => "Map Info", 2807 title => "Map Info",
2834 reply => undef, 2808 reply => undef,
2835 tooltip => "Information related to the maps", 2809 tooltip => "Information related to the maps",
2836 }, 2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2837); 2817);
2838 2818
2839sub cf::client::send_msg { 2819sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2821
2842 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2843 2824
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2826
2846 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
… …
2868 if ($self->can_msg) { 2849 if ($self->can_msg) {
2869 # default colour, mask it out 2850 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2872 2853
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2875 } else { 2870 } else {
2876 if ($color >= 0) { 2871 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2873 for ($msg) {
2879 1 while 2874 1 while
… …
3078 3073
3079The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3080 3075
3081 cf::object 3076 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3084 3079
3085 cf::object::player 3080 cf::object::player
3086 player 3081 player
3087 3082
3088 cf::player 3083 cf::player
… …
3093 3088
3094=cut 3089=cut
3095 3090
3096for ( 3091for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3103) { 3098) {
3104 no strict 'refs'; 3099 no strict 'refs';
… …
3362 reload_treasures; 3357 reload_treasures;
3363 3358
3364 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3365} 3360}
3366 3361
3367sub init {
3368 my $guard = freeze_mainloop;
3369
3370 reload_resources;
3371}
3372
3373sub reload_config { 3362sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3375 or return; 3364 or return;
3376 3365
3377 local $/; 3366 local $/;
… …
3389 }; 3378 };
3390 warn $@ if $@; 3379 warn $@ if $@;
3391 } 3380 }
3392} 3381}
3393 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3394sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3395 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3398 (async { 3421 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3401 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3402 }; 3425 };
3403 3426
3404 { 3427 evthread_start IO::AIO::poll_fileno;
3405 my $guard = freeze_mainloop; 3428
3429 cf::sync_job {
3430 reload_resources;
3406 reload_config; 3431 reload_config;
3407 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3408 load_extensions; 3445 load_extensions;
3409 3446
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 utime time, time, $RUNTIMEFILE;
3411 evthread_start IO::AIO::poll_fileno; 3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3412 } 3453 };
3413 3454
3414 EV::loop; 3455 EV::loop;
3415} 3456}
3416 3457
3417############################################################################# 3458#############################################################################
… …
3426 }; 3467 };
3427 } 3468 }
3428} 3469}
3429 3470
3430sub write_runtime_sync { 3471sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime";
3432
3433 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3435 3474
3436 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3476
3438 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3439 3478
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3441 or return; 3480 or return;
3442 3481
3443 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
3455 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3456 3495
3457 close $fh 3496 close $fh
3458 or return; 3497 or return;
3459 3498
3460 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3500 and return;
3462 3501
3463 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3464 3503
3465 1 3504 1
… …
3477 my $uuid = "$LOCALDIR/uuid"; 3516 my $uuid = "$LOCALDIR/uuid";
3478 3517
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return; 3519 or return;
3481 3520
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3521 my $value = uuid_seq uuid_cur;
3522
3523 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3483 $uuid_skip = 0; 3529 $uuid_skip = 0;
3484 3530
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return; 3532 and return;
3487 3533
… …
3549sub post_cleanup { 3595sub post_cleanup {
3550 my ($make_core) = @_; 3596 my ($make_core) = @_;
3551 3597
3552 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3553 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3554} 3629}
3555 3630
3556sub do_reload_perl() { 3631sub do_reload_perl() {
3557 # can/must only be called in main 3632 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3559 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3560 return; 3635 return;
3561 } 3636 }
3562 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3563 warn "reloading..."; 3641 warn "reloading...";
3564 3642
3565 warn "entering sync_job"; 3643 warn "entering sync_job";
3566 3644
3567 cf::sync_job { 3645 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 3647 cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3571 3649
3572 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3574 3652
3575 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3576 3654
3577 warn "flushing outstanding aio requests"; 3655 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; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3583 warn "iterate..."; 3657 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 } 3658 }
3609 3659
3610 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3611 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3612 } 3662 %EXT_CORO = ();
3613 3663
3614 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3615 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3618 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3619 delete $INC{$k};
3620 3674
3621 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g;
3623
3624 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3625 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3626 } 3684 }
3627 3685
3628 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3629 } 3701 }
3630 3702
3631 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3633 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3634 3706
3635 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3638 3710
3639 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3640 # and global variables created in xs 3712 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3642 3714
3643 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3644 3716
3645 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3646 require cf; 3718 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3648 3720
3649 warn "loading config and database again"; 3721 warn "loading config and database again";
3650 cf::reload_config; 3722 cf::reload_config;
3651 3723
3652 warn "loading extensions"; 3724 warn "loading extensions";
3653 cf::load_extensions; 3725 cf::load_extensions;
3654 3726
3655 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3658 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3661 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3662 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3663 3738
3664 1 3739 1
3665 } or do { 3740 } or do {
3666 warn $@; 3741 warn $@;
3667 cf::cleanup "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3668 }; 3743 };
3669 3744
3670 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3671}; 3748};
3672 3749
3673our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3674 3751
3675sub reload_perl() { 3752sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3678 3755
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 3757 do_reload_perl;
3681 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3682 }; 3759 };
3683} 3760}
3684 3761
… …
3757{ 3834{
3758 # configure BDB 3835 # configure BDB
3759 3836
3760 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3761 BDB::max_poll_reqs $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 3839 $AnyEvent::BDB::WATCHER->priority (1);
3763 3840
3764 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | BDB::LOG_AUTOREMOVE, 1); 3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 3848
3771 cf::sync_job { 3849 cf::sync_job {
3772 eval { 3850 eval {
… …
3798{ 3876{
3799 # configure IO::AIO 3877 # configure IO::AIO
3800 3878
3801 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 3881 undef $AnyEvent::AIO::WATCHER;
3804} 3882}
3805 3883
3806my $_log_backtrace; 3884my $_log_backtrace;
3807 3885
3808sub _log_backtrace { 3886sub _log_backtrace {
… …
3811 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3812 3890
3813 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3815 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3816 async { 3895 async {
3817 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3818 3897
3819 my @bt = fork_call { 3898 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
… …
3831 } 3910 }
3832 3911
3833 @funcs 3912 @funcs
3834 }; 3913 };
3835 3914
3836 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 3918 --$_log_backtrace;
3839 }; 3919 };
3840 } else { 3920 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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