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.432 by root, Mon May 5 22:38:47 2008 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 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;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score; 1551 $pl->ob->check_score;
… …
1615 } 1637 }
1616 1638
1617 \@paths 1639 \@paths
1618} 1640}
1619 1641
1620=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1621 1643
1622Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1623
1624=cut
1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1637sub expand_cfpod {
1638 my ($self, $pod) = @_;
1639
1640 my $xml;
1641
1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1645
1646 $group =~ s/&/&amp;/g;
1647 $group =~ s/</&lt;/g;
1648
1649 $xml .= $group;
1650 } elsif ($pod =~ m%\G
1651 ([BCGHITU])
1652 <
1653 (?:
1654 ([^<>]*) (?{ $group = $^N })
1655 | < $interior >
1656 )
1657 >
1658 %gcsx
1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1679 "")
1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1691
1692 for ($xml) {
1693 # create single paragraphs (very hackish)
1694 s/(?<=\S)\n(?=\w)/ /g;
1695
1696 # compress some whitespace
1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1702
1703 $xml
1704}
1705
1706no re 'eval';
1707
1708sub hintmode {
1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1710 $_[0]{hintmode}
1711}
1712 1645
1713=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1714 1647
1715Sends an ext reply to the player. 1648Sends an ext reply to the player.
1716 1649
… …
1929 1862
1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1931 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1932} 1865}
1933 1866
1934# and all this just because we cannot iterate over
1935# all maps in C++...
1936sub change_all_map_light {
1937 my ($change) = @_;
1938
1939 $_->change_map_light ($change)
1940 for grep $_->outdoor, values %cf::MAP;
1941}
1942
1943sub decay_objects { 1867sub decay_objects {
1944 my ($self) = @_; 1868 my ($self) = @_;
1945 1869
1946 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1947 1871
… …
2029sub find { 1953sub find {
2030 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2031 1955
2032 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2033 1957
2034 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2035 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1960
2037 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
2041 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2042 or return; 1963 or return;
2043 1964
2044 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2045 1966
… …
2085 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block; 2007 $f->skip_block;
2087 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2088 or return; 2009 or return;
2089 2010
2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2091 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2092 2013
2093 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2094 utf8::encode $uniq; 2015 utf8::encode $uniq;
2095 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2112 2033
2113 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2114 $self->decay_objects; 2035 $self->decay_objects;
2115 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2116 $self->update_buttons; 2037 $self->update_buttons;
2117 cf::cede_to_tick;
2118 $self->set_darkness_map;
2119 cf::cede_to_tick; 2038 cf::cede_to_tick;
2120 $self->activate; 2039 $self->activate;
2121 } 2040 }
2122 2041
2123 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2530 2449
2531=item $player_object->enter_link 2450=item $player_object->enter_link
2532 2451
2533Freezes 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}>).
2534 2453
2535The 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.
2536I<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.
2537 2458
2538Will never block. 2459Will never block.
2539 2460
2540=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2541 2462
… …
2599 2520
2600 $map->load; 2521 $map->load;
2601 $map->load_neighbours; 2522 $map->load_neighbours;
2602 2523
2603 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2604 $self->activate_recursive; 2526 $self->activate_recursive;
2605 2527
2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2607 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2608} 2530}
… …
2612Moves 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
2613her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2614that 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
2615the 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
2616be 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 >>.
2617 2542
2618=cut 2543=cut
2619 2544
2620our $GOTOGEN; 2545our $GOTOGEN;
2621 2546
… …
2768 $self->contr->savebed ($map, $x, $y) 2693 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED); 2694 if $exit->flag (cf::FLAG_DAMNED);
2770 2695
2771 1 2696 1
2772 }) { 2697 }) {
2773 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2774 . "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. "
2775 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2776 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2777 2702
2778 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2844 id => "infobox", 2769 id => "infobox",
2845 title => "Body Parts", 2770 title => "Body Parts",
2846 reply => undef, 2771 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2848 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2849 "c/uptime" => { 2798 "c/uptime" => {
2850 id => "infobox", 2799 id => "infobox",
2851 title => "Uptime", 2800 title => "Uptime",
2852 reply => undef, 2801 reply => undef,
2853 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
… …
2862 id => "party", 2811 id => "party",
2863 title => "Party", 2812 title => "Party",
2864 reply => "gsay ", 2813 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party", 2814 tooltip => "Messages and chat related to your party",
2866 }, 2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2867); 2824);
2868 2825
2869sub cf::client::send_msg { 2826sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2871 2828
2872 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2873 2831
2874 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875 2833
2876 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2879 2837
2880 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2884 2840
2885 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891 } 2846 }
2892 2847
2893 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2894 } 2849 }
2895 2850
2896 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2897 2852
2898 if ($self->can_msg) {
2899 # default colour, mask it out 2853 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2902 2856
2903 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2905 } else { 2860 );
2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916 2861
2917 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2918 2865
2919 utf8::encode $msg; 2866 # split very large packets
2920 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2921 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2922 # COMMAND/INFO 2869 $pkt = "frag";
2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2924 } else {
2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2926 $self->send_packet ("drawinfo $color $msg")
2927 }
2928 }
2929 } 2870 }
2871
2872 $self->send_packet ($pkt);
2930} 2873}
2931 2874
2932=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2933 2876
2934Sends an ext event to the client. 2877Sends an ext event to the client.
… …
3124=cut 3067=cut
3125 3068
3126for ( 3069for (
3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3128 insert remove inv nrof name archname title slaying race 3071 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)], 3072 decrease split destroy change_exp)],
3130 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
3131 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
3132 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
3133) { 3076) {
3134 no strict 'refs'; 3077 no strict 'refs';
… …
3392 reload_treasures; 3335 reload_treasures;
3393 3336
3394 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3395} 3338}
3396 3339
3397sub init {
3398 my $guard = freeze_mainloop;
3399
3400 reload_resources;
3401}
3402
3403sub reload_config { 3340sub reload_config {
3404 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3405 or return; 3342 or return;
3406 3343
3407 local $/; 3344 local $/;
… …
3419 }; 3356 };
3420 warn $@ if $@; 3357 warn $@ if $@;
3421 } 3358 }
3422} 3359}
3423 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3424sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3425 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3426 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3428 (async { 3398 (async {
3429 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3431 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3432 }; 3402 };
3433 3403
3434 { 3404 evthread_start IO::AIO::poll_fileno;
3435 my $guard = freeze_mainloop; 3405
3406 cf::sync_job {
3407 reload_resources;
3436 reload_config; 3408 reload_config;
3437 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3438 load_extensions; 3422 load_extensions;
3439 3423
3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3424 utime time, time, $RUNTIMEFILE;
3441 evthread_start IO::AIO::poll_fileno; 3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3442 } 3430 };
3443 3431
3444 EV::loop; 3432 EV::loop;
3445} 3433}
3446 3434
3447############################################################################# 3435#############################################################################
… …
3456 }; 3444 };
3457 } 3445 }
3458} 3446}
3459 3447
3460sub write_runtime_sync { 3448sub write_runtime_sync {
3461 my $runtime = "$LOCALDIR/runtime";
3462
3463 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3465 3451
3466 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3453
3468 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3469 3455
3470 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3471 or return; 3457 or return;
3472 3458
3473 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
… …
3485 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3486 3472
3487 close $fh 3473 close $fh
3488 or return; 3474 or return;
3489 3475
3490 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3477 and return;
3492 3478
3493 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3494 3480
3495 1 3481 1
… …
3507 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3508 3494
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return; 3496 or return;
3511 3497
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3506 $uuid_skip = 0;
3514 3507
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return; 3509 and return;
3517 3510
… …
3539} 3532}
3540 3533
3541sub emergency_save() { 3534sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3543 3536
3544 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3545 3538
3546 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3547 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3548 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3549 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3550 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3551 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3552 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3553 $pl->valid or next; 3551 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3555 $pl->save; 3553 $pl->save;
3556 } 3554 }
3557 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3558 3556
3559 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3560 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3561 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3562 $map->valid or next; 3560 $map->valid or next;
3563 $map->save; 3561 $map->save;
3564 } 3562 }
3565 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3566 3564
3567 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3568 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3569 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3570 3568
3571 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3572 write_uuid_sync 1; 3570 write_uuid_sync 1;
3573 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3574 }; 3572 };
3575 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3576 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3577} 3580}
3578 3581
3579sub post_cleanup { 3582sub post_cleanup {
3580 my ($make_core) = @_; 3583 my ($make_core) = @_;
3581 3584
3582 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3583 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
3584} 3616}
3585 3617
3586sub do_reload_perl() { 3618sub do_reload_perl() {
3587 # can/must only be called in main 3619 # can/must only be called in main
3588 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3589 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3590 return; 3622 return;
3591 } 3623 }
3592 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
3593 warn "reloading..."; 3630 warn "reloading...";
3594 3631
3595 warn "entering sync_job"; 3632 warn "entering sync_job";
3596 3633
3597 cf::sync_job { 3634 cf::sync_job {
3598 cf::write_runtime_sync; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
3599 cf::emergency_save; 3636 cf::emergency_save;
3600 cf::write_runtime_sync; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3601 3638
3602 warn "syncing database to disk"; 3639 warn "syncing database to disk";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
3604 3641
3605 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
3606 3643
3607 warn "flushing outstanding aio requests"; 3644 warn "flushing outstanding aio requests";
3608 for (;;) {
3609 BDB::flush;
3610 IO::AIO::flush;
3611 Coro::cede_notself;
3612 last unless IO::AIO::nreqs || BDB::nreqs; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
3613 warn "iterate..."; 3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3614 }
3615
3616 ++$RELOAD;
3617
3618 warn "cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = ();
3621
3622 warn "removing commands";
3623 %COMMAND = ();
3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg";
3632
3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 } 3647 }
3639 3648
3640 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
3641 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
3642 } 3651 %EXT_CORO = ();
3643 3652
3644 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
3645 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
3648 warn "... unloading $k"; 3662 warn "... unloading $pkg";
3649 delete $INC{$k};
3650 3663
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
3655 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
3656 } 3673 }
3657 3674
3658 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
3659 } 3690 }
3660 3691
3661 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
3662 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3695
3665 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
3668 3699
3669 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3701 # and global variables created in xs
3671 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
3672 3703
3673 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
3674 3705
3675 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
3676 require cf; 3707 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3678 3709
3679 warn "loading config and database again"; 3710 warn "loading config and database again";
3680 cf::reload_config; 3711 cf::reload_config;
3681 3712
3682 warn "loading extensions"; 3713 warn "loading extensions";
3683 cf::load_extensions; 3714 cf::load_extensions;
3684 3715
3716 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3691 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
3692 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3693 3729
3694 1 3730 1
3695 } or do { 3731 } or do {
3696 warn $@; 3732 warn $@;
3697 cf::cleanup "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
3698 }; 3734 };
3699 3735
3700 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3701}; 3742};
3702 3743
3703our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3704 3745
3705sub reload_perl() { 3746sub reload_perl() {
3706 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3707 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3708 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3710 do_reload_perl; 3754 do_reload_perl;
3711 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3712 }; 3757 };
3713} 3758}
3714 3759
3715register_command "reload" => sub { 3760register_command "reload" => sub {
3716 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
… …
3787{ 3832{
3788 # configure BDB 3833 # configure BDB
3789 3834
3790 BDB::min_parallel 8; 3835 BDB::min_parallel 8;
3791 BDB::max_poll_reqs $TICK * 0.1; 3836 BDB::max_poll_reqs $TICK * 0.1;
3792 $Coro::BDB::WATCHER->priority (1); 3837 $AnyEvent::BDB::WATCHER->priority (1);
3793 3838
3794 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3795 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3797 | BDB::LOG_AUTOREMOVE, 1); 3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3800 3846
3801 cf::sync_job { 3847 cf::sync_job {
3802 eval { 3848 eval {
… …
3828{ 3874{
3829 # configure IO::AIO 3875 # configure IO::AIO
3830 3876
3831 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3832 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3833 $Coro::AIO::WATCHER->priority (1); 3879 undef $AnyEvent::AIO::WATCHER;
3834} 3880}
3835 3881
3836my $_log_backtrace; 3882my $_log_backtrace;
3837 3883
3838sub _log_backtrace { 3884sub _log_backtrace {
… …
3841 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3842 3888
3843 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3844 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3845 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3846 async { 3893 async {
3847 $Coro::current->{desc} = "abt $msg"; 3894 $Coro::current->{desc} = "abt $msg";
3848 3895
3849 my @bt = fork_call { 3896 my @bt = fork_call {
3850 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
… …
3861 } 3908 }
3862 3909
3863 @funcs 3910 @funcs
3864 }; 3911 };
3865 3912
3866 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 3916 --$_log_backtrace;
3869 }; 3917 };
3870 } else { 3918 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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