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.464 by root, Thu Jan 1 18:35:48 2009 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::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::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 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 132our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
123 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
124binmode STDOUT; 139binmode STDOUT;
125binmode STDERR; 140binmode STDERR;
126 141
127# read virtual server time, if available 142# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
132} 147}
133 148
134mkdir $_ 149mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 257for my $pkg (qw(
243 cf::global cf::attachable 258 cf::global cf::attachable
244 cf::object cf::object::player 259 cf::object cf::object::player
245 cf::client cf::player 260 cf::client cf::player
246 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
247 cf::map cf::party cf::region 263 cf::party cf::region
248)) { 264)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 266}
252 267
253$EV::DIED = sub { 268$EV::DIED = sub {
254 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 312
298sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
300 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
301=item cf::lock_wait $string 330=item cf::lock_wait $string
302 331
303Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
304 333
305=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
306 335
307Wait until the given lock is available and then acquires it and returns 336Wait 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, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
310returned. 339returned.
311 340
312Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 342deadlocked coro.
… …
319 348
320Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
321 350
322=cut 351=cut
323 352
324our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 354
327sub lock_wait($) { 355sub lock_wait($) {
328 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 357}
341 358
342sub lock_acquire($) { 359sub lock_acquire($) {
343 my ($key) = @_; 360 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 361}
357 362
358sub lock_active($) { 363sub lock_active($) {
359 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 365}
363 366
364sub freeze_mainloop { 367sub freeze_mainloop {
365 tick_inhibit_inc; 368 tick_inhibit_inc;
366 369
367 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
368} 371}
369 372
370=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
371 374
372Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
724 727
725############################################################################# 728#############################################################################
726 729
727=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
728 731
729Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
732 735
733In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
785 788
786Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
788 791
789Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
791 794
792These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
793 796
794=over 4 797=over 4
… …
1085 1088
1086sub reattach { 1089sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1091 my ($obj) = @_;
1089 1092
1093 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1095
1092 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1093 1097
1094 @$registry = (); 1098 @$registry = ();
1095 1099
… …
1160 } else { 1164 } else {
1161 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1162 } 1166 }
1163 1167
1164 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1172 } else {
1166 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1167 } 1174 }
1168 } else { 1175 } else {
1169 aio_unlink $filename; 1176 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1171 } 1178 }
… …
1262 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1263 1270
1264 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1265} 1272}
1266 1273
1274use File::Glob ();
1275
1267cf::player->attach ( 1276cf::player->attach (
1268 on_command => sub { 1277 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1270 1279
1271 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1303 1312
1304 cf::override; 1313 cf::override;
1305 }, 1314 },
1306); 1315);
1307 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1308sub load_extensions { 1330sub load_extensions {
1309 cf::sync_job { 1331 cf::sync_job {
1310 my %todo; 1332 my %todo;
1311 1333
1312 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
… …
1331 1353
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1356
1335 $ext{source} = 1357 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1338 . $source 1360 . $source
1339 . "\n};\n1"; 1361 . "\n};\n1";
1340 1362
1341 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1381 1403
1382=back 1404=back
1383 1405
1384=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1385 1407
1386Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1387 1409
1388=cut 1410=cut
1389 1411
1390package cf::player; 1412package cf::player;
1391 1413
… …
1434 1456
1435sub exists($) { 1457sub exists($) {
1436 my ($login) = @_; 1458 my ($login) = @_;
1437 1459
1438 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1440} 1462}
1441 1463
1442sub find($) { 1464sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1466 my $login = $_[0];
… …
1519 my ($pl) = @_; 1541 my ($pl) = @_;
1520 1542
1521 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1522 1544
1523 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1547
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1530 1554
1531 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1613 } 1637 }
1614 1638
1615 \@paths 1639 \@paths
1616} 1640}
1617 1641
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1643
1620Expand crossfire pod fragments into protocol xml. 1644Expand 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 1645
1711=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1712 1647
1713Sends an ext reply to the player. 1648Sends an ext reply to the player.
1714 1649
… …
1927 1862
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1930} 1865}
1931 1866
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1867sub decay_objects {
1942 my ($self) = @_; 1868 my ($self) = @_;
1943 1869
1944 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1945 1871
… …
2027sub find { 1953sub find {
2028 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2029 1955
2030 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2031 1957
2032 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2034 1960
2035 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2040 or return; 1963 or return;
2041 1964
2042 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2043 1966
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2007 $f->skip_block;
2085 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2086 or return; 2009 or return;
2087 2010
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2089 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2090 2013
2091 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2015 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2110 2033
2111 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2035 $self->decay_objects;
2113 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2114 $self->update_buttons; 2037 $self->update_buttons;
2115 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick; 2038 cf::cede_to_tick;
2118 $self->activate; 2039 $self->activate;
2119 } 2040 }
2120 2041
2121 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2528 2449
2529=item $player_object->enter_link 2450=item $player_object->enter_link
2530 2451
2531Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2532 2453
2533The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2535 2458
2536Will never block. 2459Will never block.
2537 2460
2538=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2539 2462
… …
2597 2520
2598 $map->load; 2521 $map->load;
2599 $map->load_neighbours; 2522 $map->load_neighbours;
2600 2523
2601 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602 $self->activate_recursive; 2526 $self->activate_recursive;
2603 2527
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2606} 2530}
… …
2610Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2536that 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 2537the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2615 2542
2616=cut 2543=cut
2617 2544
2618our $GOTOGEN; 2545our $GOTOGEN;
2619 2546
… …
2766 $self->contr->savebed ($map, $x, $y) 2693 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2694 if $exit->flag (cf::FLAG_DAMNED);
2768 2695
2769 1 2696 1
2770 }) { 2697 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2702
2776 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2842 id => "infobox", 2769 id => "infobox",
2843 title => "Body Parts", 2770 title => "Body Parts",
2844 reply => undef, 2771 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2846 }, 2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2847 "c/uptime" => { 2780 "c/uptime" => {
2848 id => "infobox", 2781 id => "infobox",
2849 title => "Uptime", 2782 title => "Uptime",
2850 reply => undef, 2783 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2784 tooltip => "How long the server has been running since last restart",
… …
2860 id => "party", 2793 id => "party",
2861 title => "Party", 2794 title => "Party",
2862 reply => "gsay ", 2795 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 2796 tooltip => "Messages and chat related to your party",
2864 }, 2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2865); 2806);
2866 2807
2867sub cf::client::send_msg { 2808sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2809 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2810
2870 $msg = $self->pl->expand_cfpod ($msg); 2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2871 2813
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 2815
2874 # check predefined channels, for the benefit of C 2816 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 2817 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 2818 $channel = $CHANNEL{$channel};
2877 2819
2878 $self->ext_msg (channel_info => $channel) 2820 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 2821 $channel = $channel->{id};
2882 2822
2883 } elsif (ref $channel) { 2823 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 2824 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 2825 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 2826 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 2827 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 2828 }
2890 2829
2891 $channel = $channel->{id}; 2830 $channel = $channel->{id};
2892 } 2831 }
2893 2832
2894 return unless @extra || length $msg; 2833 return unless @extra || length $msg;
2895 2834
2896 if ($self->can_msg) {
2897 # default colour, mask it out 2835 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2837 if $color & cf::NDI_DEF;
2900 2838
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2839 my $pkt = "msg "
2840 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 2842 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 2843
2915 $color &= cf::NDI_COLOR_MASK; 2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2916 2847
2917 utf8::encode $msg; 2848 # split very large packets
2918 2849 if (8192 < length $pkt and $self->{can_lzf}) {
2919 if (0 && $msg =~ /\[/) { 2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2920 # COMMAND/INFO 2851 $pkt = "frag";
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 } 2852 }
2853
2854 $self->send_packet ($pkt);
2928} 2855}
2929 2856
2930=item $client->ext_msg ($type, @msg) 2857=item $client->ext_msg ($type, @msg)
2931 2858
2932Sends an ext event to the client. 2859Sends an ext event to the client.
… …
3121 3048
3122=cut 3049=cut
3123 3050
3124for ( 3051for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3053 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3054 decrease split destroy change_exp)],
3128 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
3130 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
3131) { 3058) {
3132 no strict 'refs'; 3059 no strict 'refs';
… …
3390 reload_treasures; 3317 reload_treasures;
3391 3318
3392 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
3393} 3320}
3394 3321
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399}
3400
3401sub reload_config { 3322sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3324 or return;
3404 3325
3405 local $/; 3326 local $/;
… …
3417 }; 3338 };
3418 warn $@ if $@; 3339 warn $@ if $@;
3419 } 3340 }
3420} 3341}
3421 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
3422sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
3423 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3380 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3382 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
3430 }; 3384 };
3431 3385
3432 { 3386 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3387
3388 cf::sync_job {
3389 reload_resources;
3434 reload_config; 3390 reload_config;
3435 db_init; 3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
3436 load_extensions; 3404 load_extensions;
3437 3405
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3406 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3412 };
3441 3413
3442 EV::loop; 3414 EV::loop;
3443} 3415}
3444 3416
3445############################################################################# 3417#############################################################################
… …
3454 }; 3426 };
3455 } 3427 }
3456} 3428}
3457 3429
3458sub write_runtime_sync { 3430sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3431 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3432 # the fsync below can take a very very long time.
3463 3433
3464 IO::AIO::aio_utime $runtime, undef, undef; 3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3435
3466 my $guard = cf::lock_acquire "write_runtime"; 3436 my $guard = cf::lock_acquire "write_runtime";
3467 3437
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3439 or return;
3470 3440
3471 my $value = $cf::RUNTIME + 90 + 10; 3441 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3442 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3443 # 60 allows for the watchdog to kill the server.
… …
3483 aio_utime $fh, undef, undef; 3453 aio_utime $fh, undef, undef;
3484 3454
3485 close $fh 3455 close $fh
3486 or return; 3456 or return;
3487 3457
3488 aio_rename "$runtime~", $runtime 3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3459 and return;
3490 3460
3491 warn "runtime file written.\n"; 3461 warn "runtime file written.\n";
3492 3462
3493 1 3463 1
… …
3505 my $uuid = "$LOCALDIR/uuid"; 3475 my $uuid = "$LOCALDIR/uuid";
3506 3476
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3478 or return;
3509 3479
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3488 $uuid_skip = 0;
3512 3489
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3491 and return;
3515 3492
… …
3537} 3514}
3538 3515
3539sub emergency_save() { 3516sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
3541 3518
3542 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
3543 3520
3544 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
3545 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3533 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3535 $pl->save;
3554 } 3536 }
3555 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
3556 3538
3557 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3542 $map->valid or next;
3561 $map->save; 3543 $map->save;
3562 } 3544 }
3563 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
3564 3546
3565 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3568 3550
3569 warn "begin write uuid\n"; 3551 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3552 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3553 warn "emergency_perl_save: end write uuid\n";
3572 }; 3554 };
3573 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3574 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
3575} 3562}
3576 3563
3577sub post_cleanup { 3564sub post_cleanup {
3578 my ($make_core) = @_; 3565 my ($make_core) = @_;
3579 3566
3580 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
3582} 3598}
3583 3599
3584sub do_reload_perl() { 3600sub do_reload_perl() {
3585 # can/must only be called in main 3601 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
3588 return; 3604 return;
3589 } 3605 }
3590 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
3591 warn "reloading..."; 3612 warn "reloading...";
3592 3613
3593 warn "entering sync_job"; 3614 warn "entering sync_job";
3594 3615
3595 cf::sync_job { 3616 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3618 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
3599 3620
3600 warn "syncing database to disk"; 3621 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3623
3603 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
3604 3625
3605 warn "flushing outstanding aio requests"; 3626 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; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3628 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 } 3629 }
3637 3630
3638 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
3640 } 3633 %EXT_CORO = ();
3641 3634
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3644 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3645
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
3653 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
3654 } 3655 }
3655 3656
3656 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
3657 } 3672 }
3658 3673
3659 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3677
3663 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
3666 3681
3667 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3683 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
3670 3685
3671 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
3672 3687
3673 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
3674 require cf; 3689 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3676 3691
3677 warn "loading config and database again"; 3692 warn "loading config and database again";
3678 cf::reload_config; 3693 cf::reload_config;
3679 3694
3680 warn "loading extensions"; 3695 warn "loading extensions";
3681 cf::load_extensions; 3696 cf::load_extensions;
3682 3697
3698 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
3689 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
3690 warn "leaving sync_job"; 3710 warn "leaving sync_job";
3691 3711
3692 1 3712 1
3693 } or do { 3713 } or do {
3694 warn $@; 3714 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
3696 }; 3716 };
3697 3717
3698 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
3699}; 3724};
3700 3725
3701our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
3702 3727
3703sub reload_perl() { 3728sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
3706 3731
3732 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions;
3734
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3736 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
3738 };
3710 }; 3739 };
3711} 3740}
3712 3741
3713register_command "reload" => sub { 3742register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
… …
3785{ 3814{
3786 # configure BDB 3815 # configure BDB
3787 3816
3788 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3818 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3819 $AnyEvent::BDB::WATCHER->priority (1);
3791 3820
3792 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3828
3799 cf::sync_job { 3829 cf::sync_job {
3800 eval { 3830 eval {
… …
3826{ 3856{
3827 # configure IO::AIO 3857 # configure IO::AIO
3828 3858
3829 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3861 undef $AnyEvent::AIO::WATCHER;
3832} 3862}
3833 3863
3834my $_log_backtrace; 3864my $_log_backtrace;
3835 3865
3836sub _log_backtrace { 3866sub _log_backtrace {
… …
3839 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3840 3870
3841 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3844 async { 3875 async {
3845 $Coro::current->{desc} = "abt $msg"; 3876 $Coro::current->{desc} = "abt $msg";
3846 3877
3847 my @bt = fork_call { 3878 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
… …
3859 } 3890 }
3860 3891
3861 @funcs 3892 @funcs
3862 }; 3893 };
3863 3894
3864 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 3898 --$_log_backtrace;
3867 }; 3899 };
3868 } else { 3900 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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