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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 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
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::AnyEvent;
43use Coro::AIO; 47use Coro::AIO;
44use Coro::BDB; 48use Coro::BDB 1.6;
45use Coro::Storable; 49use Coro::Storable;
46use Coro::Util (); 50use Coro::Util ();
47 51
48use JSON::XS 2.01 (); 52use JSON::XS 2.01 ();
49use BDB (); 53use BDB ();
50use Data::Dumper; 54use Data::Dumper;
51use Digest::MD5; 55use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::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 75
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 77
69our %COMMAND = (); 78our %COMMAND = ();
70our %COMMAND_TIME = (); 79our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 82our %EXTCMD = ();
74our %EXTICMD = (); 83our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 84our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 85our %EXT_MAP = (); # pluggable maps
77 86
78our $RELOAD; # number of reloads so far 87our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 88our @EVENT;
80 89
81our $CONFDIR = confdir; 90our $CONFDIR = confdir;
82our $DATADIR = datadir; 91our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 92our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 93our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 94our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 95our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 96our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 98our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 99our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 100our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime";
103
92our %RESOURCE; 104our %RESOURCE;
93 105
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 108our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 109our $USE_FSYNC = 1; # use fsync to write maps - default off
99 110
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 111our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 112our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 113our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 114our $DB_ENV;
105 115
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 129our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 130our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 131our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 132our $TICK_START; # for load detecting purposes
123 133
134our @POST_INIT;
135
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
137
124binmode STDOUT; 138binmode STDOUT;
125binmode STDERR; 139binmode STDERR;
126 140
127# read virtual server time, if available 141# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 142unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 143 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 144 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 145 $RUNTIME = <$fh> + 0.;
132} 146}
133 147
134mkdir $_ 148mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 256for my $pkg (qw(
243 cf::global cf::attachable 257 cf::global cf::attachable
244 cf::object cf::object::player 258 cf::object cf::object::player
245 cf::client cf::player 259 cf::client cf::player
246 cf::arch cf::living 260 cf::arch cf::living
261 cf::map cf::mapspace
247 cf::map cf::party cf::region 262 cf::party cf::region
248)) { 263)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 265}
252 266
253$EV::DIED = sub { 267$EV::DIED = sub {
254 warn "error in event callback: @_"; 268 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 310our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 311
298sub encode_json($) { $json_coder->encode ($_[0]) } 312sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 313sub decode_json($) { $json_coder->decode ($_[0]) }
300 314
315=item cf::post_init { BLOCK }
316
317Execute the given codeblock, I<after> all extensions have been (re-)loaded,
318but I<before> the server starts ticking again.
319
320The cdoeblock will have a single boolean argument to indicate whether this
321is a reload or not.
322
323=cut
324
325sub post_init(&) {
326 push @POST_INIT, shift;
327}
328
301=item cf::lock_wait $string 329=item cf::lock_wait $string
302 330
303Wait until the given lock is available. See cf::lock_acquire. 331Wait until the given lock is available. See cf::lock_acquire.
304 332
305=item my $lock = cf::lock_acquire $string 333=item my $lock = cf::lock_acquire $string
306 334
307Wait until the given lock is available and then acquires it and returns 335Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 336a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 337for example when the coroutine gets canceled), the lock is automatically
310returned. 338returned.
311 339
312Locks are *not* recursive, locking from the same coro twice results in a 340Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 341deadlocked coro.
… …
332 return;#d# 360 return;#d#
333 }#d# 361 }#d#
334 362
335 # wait for lock, if any 363 # wait for lock, if any
336 while ($LOCK{$key}) { 364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 366 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 367 Coro::schedule;
339 } 368 }
340} 369}
341 370
… …
346 lock_wait $key; 375 lock_wait $key;
347 376
348 $LOCK{$key} = []; 377 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d# 378 $LOCKER{$key} = $Coro::current;#d#
350 379
351 Coro::guard { 380 Guard::guard {
352 delete $LOCKER{$key};#d# 381 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side 382 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} }; 383 $_->ready for @{ delete $LOCK{$key} };
355 } 384 }
356} 385}
… …
362} 391}
363 392
364sub freeze_mainloop { 393sub freeze_mainloop {
365 tick_inhibit_inc; 394 tick_inhibit_inc;
366 395
367 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
368} 397}
369 398
370=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
371 400
372Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
… …
724 753
725############################################################################# 754#############################################################################
726 755
727=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
728 757
729Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
732 761
733In the following description, CLASS can be any of C<global>, C<object> 762In 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 763C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
785 814
786Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
788 817
789Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
791 820
792These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
793 822
794=over 4 823=over 4
… …
1085 1114
1086sub reattach { 1115sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1117 my ($obj) = @_;
1089 1118
1119 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1121
1092 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1093 1123
1094 @$registry = (); 1124 @$registry = ();
1095 1125
… …
1160 } else { 1190 } else {
1161 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1162 } 1192 }
1163 1193
1164 aio_rename "$filename~", $filename; 1194 aio_rename "$filename~", $filename;
1195
1196 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1198 } else {
1166 warn "FATAL: $filename~: $!\n"; 1199 warn "FATAL: $filename~: $!\n";
1167 } 1200 }
1168 } else { 1201 } else {
1169 aio_unlink $filename; 1202 aio_unlink $filename;
… …
1262 my ($name, $cb) = @_; 1295 my ($name, $cb) = @_;
1263 1296
1264 $EXTICMD{$name} = $cb; 1297 $EXTICMD{$name} = $cb;
1265} 1298}
1266 1299
1300use File::Glob ();
1301
1267cf::player->attach ( 1302cf::player->attach (
1268 on_command => sub { 1303 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1304 my ($pl, $name, $params) = @_;
1270 1305
1271 my $cb = $COMMAND{$name} 1306 my $cb = $COMMAND{$name}
… …
1303 1338
1304 cf::override; 1339 cf::override;
1305 }, 1340 },
1306); 1341);
1307 1342
1343# "readahead" all extensions
1344sub cache_extensions {
1345 my $grp = IO::AIO::aio_group;
1346
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1348 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 }
1351 };
1352
1353 $grp
1354}
1355
1308sub load_extensions { 1356sub load_extensions {
1309 cf::sync_job { 1357 cf::sync_job {
1310 my %todo; 1358 my %todo;
1311 1359
1312 for my $path (<$LIBDIR/*.ext>) { 1360 for my $path (<$LIBDIR/*.ext>) {
… …
1331 1379
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1382
1335 $ext{source} = 1383 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1385 . "#line 1 \"$path\"\n{\n"
1338 . $source 1386 . $source
1339 . "\n};\n1"; 1387 . "\n};\n1";
1340 1388
1341 $todo{$base} = \%ext; 1389 $todo{$base} = \%ext;
… …
1381 1429
1382=back 1430=back
1383 1431
1384=head2 CORE EXTENSIONS 1432=head2 CORE EXTENSIONS
1385 1433
1386Functions and methods that extend core crossfire objects. 1434Functions and methods that extend core deliantra objects.
1387 1435
1388=cut 1436=cut
1389 1437
1390package cf::player; 1438package cf::player;
1391 1439
… …
1434 1482
1435sub exists($) { 1483sub exists($) {
1436 my ($login) = @_; 1484 my ($login) = @_;
1437 1485
1438 $cf::PLAYER{$login} 1486 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1487 or !aio_stat path $login
1440} 1488}
1441 1489
1442sub find($) { 1490sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1491 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1492 my $login = $_[0];
… …
1519 my ($pl) = @_; 1567 my ($pl) = @_;
1520 1568
1521 my $name = $pl->ob->name; 1569 my $name = $pl->ob->name;
1522 1570
1523 $pl->{deny_save} = 1; 1571 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1572 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1573
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1575 $pl->deactivate;
1576 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1577 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1578 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1579 $pl->ns->destroy if $pl->ns;
1530 1580
1531 my $path = playerdir $pl; 1581 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1582 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1613 } 1663 }
1614 1664
1615 \@paths 1665 \@paths
1616} 1666}
1617 1667
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1668=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1669
1620Expand crossfire pod fragments into protocol xml. 1670Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1671
1711=item $player->ext_reply ($msgid, @msg) 1672=item $player->ext_reply ($msgid, @msg)
1712 1673
1713Sends an ext reply to the player. 1674Sends an ext reply to the player.
1714 1675
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2045 $f->skip_block;
2085 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2086 or return; 2047 or return;
2087 2048
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2089 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2090 2051
2091 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2053 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
… …
2528 2489
2529=item $player_object->enter_link 2490=item $player_object->enter_link
2530 2491
2531Freezes the player and moves him/her to a special map (C<{link}>). 2492Freezes the player and moves him/her to a special map (C<{link}>).
2532 2493
2533The player should be reasonably safe there for short amounts of time. You 2494The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2495for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2496though, as the palyer cannot control the character while it is on the link
2497map.
2535 2498
2536Will never block. 2499Will never block.
2537 2500
2538=item $player_object->leave_link ($map, $x, $y) 2501=item $player_object->leave_link ($map, $x, $y)
2539 2502
… …
2597 2560
2598 $map->load; 2561 $map->load;
2599 $map->load_neighbours; 2562 $map->load_neighbours;
2600 2563
2601 return unless $self->contr->active; 2564 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602 $self->activate_recursive; 2566 $self->activate_recursive;
2603 2567
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2569 $self->enter_map ($map, $x, $y);
2606} 2570}
… …
2610Moves the player to the given map-path and coordinates by first freezing 2574Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2575her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2576that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2577the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2578be called at the end of this process.
2579
2580Note that $check will be called with a potentially non-loaded map, so if
2581it needs a loaded map it has to call C<< ->load >>.
2615 2582
2616=cut 2583=cut
2617 2584
2618our $GOTOGEN; 2585our $GOTOGEN;
2619 2586
… …
2766 $self->contr->savebed ($map, $x, $y) 2733 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2734 if $exit->flag (cf::FLAG_DAMNED);
2768 2735
2769 1 2736 1
2770 }) { 2737 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2738 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2739 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2740 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2741 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2742
2776 warn "ERROR in enter_exit: $@"; 2743 warn "ERROR in enter_exit: $@";
… …
2842 id => "infobox", 2809 id => "infobox",
2843 title => "Body Parts", 2810 title => "Body Parts",
2844 reply => undef, 2811 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2812 tooltip => "Shows which body parts you posess and are available",
2846 }, 2813 },
2814 "c/skills" => {
2815 id => "infobox",
2816 title => "Skills",
2817 reply => undef,
2818 tooltip => "Shows your experience per skill and item power",
2819 },
2847 "c/uptime" => { 2820 "c/uptime" => {
2848 id => "infobox", 2821 id => "infobox",
2849 title => "Uptime", 2822 title => "Uptime",
2850 reply => undef, 2823 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
… …
2865); 2838);
2866 2839
2867sub cf::client::send_msg { 2840sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2841 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2842
2870 $msg = $self->pl->expand_cfpod ($msg); 2843 $msg = $self->pl->expand_cfpod ($msg)
2844 unless $color & cf::NDI_VERBATIM;
2871 2845
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 2846 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 2847
2874 # check predefined channels, for the benefit of C 2848 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 2849 if ($CHANNEL{$channel}) {
… …
2896 if ($self->can_msg) { 2870 if ($self->can_msg) {
2897 # default colour, mask it out 2871 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2873 if $color & cf::NDI_DEF;
2900 2874
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2875 my $pkt = "msg "
2876 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 );
2879
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt);
2903 } else { 2891 } else {
2904 if ($color >= 0) { 2892 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones 2893 # replace some tags by gcfclient-compatible ones
2906 for ($msg) { 2894 for ($msg) {
2907 1 while 2895 1 while
… …
3121 3109
3122=cut 3110=cut
3123 3111
3124for ( 3112for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3114 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3115 decrease split destroy change_exp)],
3128 ["cf::object::player" => qw(player)], 3116 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3117 ["cf::player" => qw(peaceful)],
3130 ["cf::map" => qw(trigger)], 3118 ["cf::map" => qw(trigger)],
3131) { 3119) {
3132 no strict 'refs'; 3120 no strict 'refs';
… …
3390 reload_treasures; 3378 reload_treasures;
3391 3379
3392 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
3393} 3381}
3394 3382
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399}
3400
3401sub reload_config { 3383sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3385 or return;
3404 3386
3405 local $/; 3387 local $/;
… …
3417 }; 3399 };
3418 warn $@ if $@; 3400 warn $@ if $@;
3419 } 3401 }
3420} 3402}
3421 3403
3404sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!";
3407 flock $fh, &Fcntl::LOCK_EX
3408 or die "$PIDFILE: flock: $!";
3409 $fh
3410}
3411
3412# make sure only one server instance is running at any one time
3413sub atomic {
3414 my $fh = pidfile;
3415
3416 my $pid = <$fh>;
3417 kill 9, $pid if $pid > 0;
3418
3419 seek $fh, 0, 0;
3420 print $fh $$;
3421}
3422
3422sub main { 3423sub main {
3424 cf::init_globals; # initialise logging
3425
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438
3423 # we must not ever block the main coroutine 3439 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3440 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3441 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3442 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3443 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3444 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3445 })->prio (Coro::PRIO_MAX);
3430 }; 3446 };
3431 3447
3432 { 3448 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3449
3450 cf::sync_job {
3451 reload_resources;
3434 reload_config; 3452 reload_config;
3435 db_init; 3453 db_init;
3454
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid;
3458 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills;
3461
3462 cf::init_beforeplay;
3463
3464 atomic;
3465
3436 load_extensions; 3466 load_extensions;
3437 3467
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3468 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3469
3470 # no (long-running) fork's whatsoever before this point(!)
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472
3473 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3474 };
3441 3475
3442 EV::loop; 3476 EV::loop;
3443} 3477}
3444 3478
3445############################################################################# 3479#############################################################################
… …
3454 }; 3488 };
3455 } 3489 }
3456} 3490}
3457 3491
3458sub write_runtime_sync { 3492sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3493 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3494 # the fsync below can take a very very long time.
3463 3495
3464 IO::AIO::aio_utime $runtime, undef, undef; 3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3497
3466 my $guard = cf::lock_acquire "write_runtime"; 3498 my $guard = cf::lock_acquire "write_runtime";
3467 3499
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3501 or return;
3470 3502
3471 my $value = $cf::RUNTIME + 90 + 10; 3503 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3504 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3505 # 60 allows for the watchdog to kill the server.
… …
3483 aio_utime $fh, undef, undef; 3515 aio_utime $fh, undef, undef;
3484 3516
3485 close $fh 3517 close $fh
3486 or return; 3518 or return;
3487 3519
3488 aio_rename "$runtime~", $runtime 3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3521 and return;
3490 3522
3491 warn "runtime file written.\n"; 3523 warn "runtime file written.\n";
3492 3524
3493 1 3525 1
… …
3505 my $uuid = "$LOCALDIR/uuid"; 3537 my $uuid = "$LOCALDIR/uuid";
3506 3538
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3539 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3540 or return;
3509 3541
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3542 my $value = uuid_seq uuid_cur;
3543
3544 unless ($value) {
3545 warn "cowardly refusing to write zero uuid value!\n";
3546 return;
3547 }
3548
3549 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3550 $uuid_skip = 0;
3512 3551
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3552 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3553 and return;
3515 3554
… …
3537} 3576}
3538 3577
3539sub emergency_save() { 3578sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3579 my $freeze_guard = cf::freeze_mainloop;
3541 3580
3542 warn "enter emergency perl save\n"; 3581 warn "emergency_perl_save: enter\n";
3543 3582
3544 cf::sync_job { 3583 cf::sync_job {
3584 # this is a trade-off: we want to be very quick here, so
3585 # save all maps without fsync, and later call a global sync
3586 # (which in turn might be very very slow)
3587 local $USE_FSYNC = 0;
3588
3545 # use a peculiar iteration method to avoid tripping on perl 3589 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3590 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3591 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3592 warn "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3593 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3594 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3595 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3597 $pl->save;
3554 } 3598 }
3555 warn "end emergency player save\n"; 3599 warn "emergency_perl_save: end player save\n";
3556 3600
3557 warn "begin emergency map save\n"; 3601 warn "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3602 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3603 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3604 $map->valid or next;
3561 $map->save; 3605 $map->save;
3562 } 3606 }
3563 warn "end emergency map save\n"; 3607 warn "emergency_perl_save: end map save\n";
3564 3608
3565 warn "begin emergency database checkpoint\n"; 3609 warn "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3611 warn "emergency_perl_save: end database checkpoint\n";
3568 3612
3569 warn "begin write uuid\n"; 3613 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3614 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3615 warn "emergency_perl_save: end write uuid\n";
3572 }; 3616 };
3573 3617
3618 warn "emergency_perl_save: starting sync()\n";
3619 IO::AIO::aio_sync sub {
3620 warn "emergency_perl_save: finished sync()\n";
3621 };
3622
3574 warn "leave emergency perl save\n"; 3623 warn "emergency_perl_save: leave\n";
3575} 3624}
3576 3625
3577sub post_cleanup { 3626sub post_cleanup {
3578 my ($make_core) = @_; 3627 my ($make_core) = @_;
3579 3628
3580 warn Carp::longmess "post_cleanup backtrace" 3629 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3630 if $make_core;
3631
3632 my $fh = pidfile;
3633 unlink $PIDFILE if <$fh> == $$;
3634}
3635
3636# a safer delete_package, copied from Symbol
3637sub clear_package($) {
3638 my $pkg = shift;
3639
3640 # expand to full symbol table name if needed
3641 unless ($pkg =~ /^main::.*::$/) {
3642 $pkg = "main$pkg" if $pkg =~ /^::/;
3643 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3644 $pkg .= '::' unless $pkg =~ /::$/;
3645 }
3646
3647 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3648 my $stem_symtab = *{$stem}{HASH};
3649
3650 defined $stem_symtab and exists $stem_symtab->{$leaf}
3651 or return;
3652
3653 # clear all symbols
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 }
3659 warn "cleared package $pkg\n";#d#
3582} 3660}
3583 3661
3584sub do_reload_perl() { 3662sub do_reload_perl() {
3585 # can/must only be called in main 3663 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3664 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3665 warn "can only reload from main coroutine";
3588 return; 3666 return;
3589 } 3667 }
3590 3668
3669 return if $RELOAD++;
3670
3671 my $t1 = EV::time;
3672
3673 while ($RELOAD) {
3591 warn "reloading..."; 3674 warn "reloading...";
3592 3675
3593 warn "entering sync_job"; 3676 warn "entering sync_job";
3594 3677
3595 cf::sync_job { 3678 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3679 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3680 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3681 cf::write_runtime_sync; # external watchdog should not bark
3599 3682
3600 warn "syncing database to disk"; 3683 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3684 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3685
3603 # if anything goes wrong in here, we should simply crash as we already saved 3686 # if anything goes wrong in here, we should simply crash as we already saved
3604 3687
3605 warn "flushing outstanding aio requests"; 3688 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3689 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3690 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3691 }
3637 3692
3638 warn "... nuking $pkg"; 3693 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3694 $_->cancel for values %EXT_CORO;
3640 } 3695 %EXT_CORO = ();
3641 3696
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3697 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3698 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3699
3700 warn "removing ext/exti commands";
3701 %EXTCMD = ();
3702 %EXTICMD = ();
3703
3704 warn "unloading/nuking all extensions";
3705 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3706 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3707
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3708 if (my $cb = $pkg->can ("unload")) {
3709 eval {
3653 $cb->(); 3710 $cb->($pkg);
3711 1
3712 } or warn "$pkg unloaded, but with errors: $@";
3713 }
3714
3715 warn "... clearing $pkg";
3716 clear_package $pkg;
3654 } 3717 }
3655 3718
3656 Symbol::delete_package $k; 3719 warn "unloading all perl modules loaded from $LIBDIR";
3720 while (my ($k, $v) = each %INC) {
3721 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3722
3723 warn "... unloading $k";
3724 delete $INC{$k};
3725
3726 $k =~ s/\.pm$//;
3727 $k =~ s/\//::/g;
3728
3729 if (my $cb = $k->can ("unload_module")) {
3730 $cb->();
3731 }
3732
3733 clear_package $k;
3657 } 3734 }
3658 3735
3659 warn "getting rid of safe::, as good as possible"; 3736 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3737 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3739
3663 warn "unloading cf.pm \"a bit\""; 3740 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3741 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3742 delete $INC{"cf/pod.pm"};
3666 3743
3667 # don't, removes xs symbols, too, 3744 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3745 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3746 #clear_package __PACKAGE__;
3670 3747
3671 warn "unload completed, starting to reload now"; 3748 warn "unload completed, starting to reload now";
3672 3749
3673 warn "reloading cf.pm"; 3750 warn "reloading cf.pm";
3674 require cf; 3751 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3676 3753
3677 warn "loading config and database again"; 3754 warn "loading config and database again";
3678 cf::reload_config; 3755 cf::reload_config;
3679 3756
3680 warn "loading extensions"; 3757 warn "loading extensions";
3681 cf::load_extensions; 3758 cf::load_extensions;
3682 3759
3760 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3761 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3762 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3763 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3764 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3765 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3766 reattach $_ for values %PLAYER;
3767 }
3689 3768
3769 warn "running post_init jobs";
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771
3690 warn "leaving sync_job"; 3772 warn "leaving sync_job";
3691 3773
3692 1 3774 1
3693 } or do { 3775 } or do {
3694 warn $@; 3776 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3777 cf::cleanup "error while reloading, exiting.";
3696 }; 3778 };
3697 3779
3698 warn "reloaded"; 3780 warn "reloaded";
3781 --$RELOAD;
3782 }
3783
3784 $t1 = EV::time - $t1;
3785 warn "reload completed in ${t1}s\n";
3699}; 3786};
3700 3787
3701our $RELOAD_WATCHER; # used only during reload 3788our $RELOAD_WATCHER; # used only during reload
3702 3789
3703sub reload_perl() { 3790sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3791 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3792 # coro crashes during coro_state_free->destroy here.
3706 3793
3794 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions;
3796
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3798 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3799 undef $RELOAD_WATCHER;
3800 };
3710 }; 3801 };
3711} 3802}
3712 3803
3713register_command "reload" => sub { 3804register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3805 my ($who, $arg) = @_;
… …
3785{ 3876{
3786 # configure BDB 3877 # configure BDB
3787 3878
3788 BDB::min_parallel 8; 3879 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3880 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3881 $AnyEvent::BDB::WATCHER->priority (1);
3791 3882
3792 unless ($DB_ENV) { 3883 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3884 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3885 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3886 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3887 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3889 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3890
3799 cf::sync_job { 3891 cf::sync_job {
3800 eval { 3892 eval {
… …
3826{ 3918{
3827 # configure IO::AIO 3919 # configure IO::AIO
3828 3920
3829 IO::AIO::min_parallel 8; 3921 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3922 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3923 undef $AnyEvent::AIO::WATCHER;
3832} 3924}
3833 3925
3834my $_log_backtrace; 3926my $_log_backtrace;
3835 3927
3836sub _log_backtrace { 3928sub _log_backtrace {
… …
3839 $msg =~ s/\n//; 3931 $msg =~ s/\n//;
3840 3932
3841 # limit the # of concurrent backtraces 3933 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 3934 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 3935 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg;
3844 async { 3937 async {
3845 $Coro::current->{desc} = "abt $msg"; 3938 $Coro::current->{desc} = "abt $msg";
3846 3939
3847 my @bt = fork_call { 3940 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 3941 @addr = map { sprintf "%x", $_ } @addr;
… …
3859 } 3952 }
3860 3953
3861 @funcs 3954 @funcs
3862 }; 3955 };
3863 3956
3864 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $perl_bt\n";
3958 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 3959 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 3960 --$_log_backtrace;
3867 }; 3961 };
3868 } else { 3962 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 3963 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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