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.433 by root, Sat May 10 22:38:52 2008 UTC vs.
Revision 1.460 by root, Mon Dec 15 17:04:53 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 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 (); 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;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
… …
61 65
62# configure various modules to our taste 66# configure various modules to our taste
63# 67#
64$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
69 76
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 78
72our %COMMAND = (); 79our %COMMAND = ();
73our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 83our %EXTCMD = ();
77our %EXTICMD = (); 84our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
80 87
81our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 89our @EVENT;
83 90
84our $CONFDIR = confdir; 91our $CONFDIR = confdir;
85our $DATADIR = datadir; 92our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
95our %RESOURCE; 105our %RESOURCE;
96 106
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 109our $NEXT_TICK;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 132our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
124 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
125binmode STDOUT; 139binmode STDOUT;
126binmode STDERR; 140binmode STDERR;
127 141
128# read virtual server time, if available 142# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
133} 147}
134 148
135mkdir $_ 149mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
243for my $pkg (qw( 257for my $pkg (qw(
244 cf::global cf::attachable 258 cf::global cf::attachable
245 cf::object cf::object::player 259 cf::object cf::object::player
246 cf::client cf::player 260 cf::client cf::player
247 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
248 cf::map cf::party cf::region 263 cf::party cf::region
249)) { 264)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 266}
253 267
254$EV::DIED = sub { 268$EV::DIED = sub {
255 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
… …
297our $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
298 312
299sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 330=item cf::lock_wait $string
303 331
304Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
305 333
306=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
307 335
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
311returned. 339returned.
312 340
313Locks 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
314deadlocked coro. 342deadlocked coro.
… …
320 348
321Return 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.
322 350
323=cut 351=cut
324 352
325our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 354
328sub lock_wait($) { 355sub lock_wait($) {
329 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 357}
342 358
343sub lock_acquire($) { 359sub lock_acquire($) {
344 my ($key) = @_; 360 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 361}
358 362
359sub lock_active($) { 363sub lock_active($) {
360 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 365}
364 366
365sub freeze_mainloop { 367sub freeze_mainloop {
366 tick_inhibit_inc; 368 tick_inhibit_inc;
367 369
368 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
369} 371}
370 372
371=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
372 374
373Like 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
… …
725 727
726############################################################################# 728#############################################################################
727 729
728=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
729 731
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
733 735
734In 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>
735C<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
… …
785=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
786 788
787Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
789 791
790Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 794
793These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
794 796
795=over 4 797=over 4
… …
1086 1088
1087sub reattach { 1089sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1091 my ($obj) = @_;
1090 1092
1093 # no longer needed after getting rid of delete_package?
1091 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
1092 1095
1093 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1094 1097
1095 @$registry = (); 1098 @$registry = ();
1096 1099
… …
1161 } else { 1164 } else {
1162 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1163 } 1166 }
1164 1167
1165 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1172 } else {
1167 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1168 } 1174 }
1169 } else { 1175 } else {
1170 aio_unlink $filename; 1176 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1172 } 1178 }
… …
1263 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1264 1270
1265 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1266} 1272}
1267 1273
1274use File::Glob ();
1275
1268cf::player->attach ( 1276cf::player->attach (
1269 on_command => sub { 1277 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1271 1279
1272 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1304 1312
1305 cf::override; 1313 cf::override;
1306 }, 1314 },
1307); 1315);
1308 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
1309sub load_extensions { 1330sub load_extensions {
1310 cf::sync_job { 1331 cf::sync_job {
1311 my %todo; 1332 my %todo;
1312 1333
1313 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
… …
1332 1353
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1356
1336 $ext{source} = 1357 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1339 . $source 1360 . $source
1340 . "\n};\n1"; 1361 . "\n};\n1";
1341 1362
1342 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1382 1403
1383=back 1404=back
1384 1405
1385=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1386 1407
1387Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1388 1409
1389=cut 1410=cut
1390 1411
1391package cf::player; 1412package cf::player;
1392 1413
… …
1435 1456
1436sub exists($) { 1457sub exists($) {
1437 my ($login) = @_; 1458 my ($login) = @_;
1438 1459
1439 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1441} 1462}
1442 1463
1443sub find($) { 1464sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1466 my $login = $_[0];
… …
1520 my ($pl) = @_; 1541 my ($pl) = @_;
1521 1542
1522 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1523 1544
1524 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1525 $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
1526 1547
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1549 $pl->deactivate;
1529 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;
1530 $pl->ob->check_score; 1551 $pl->ob->check_score;
… …
1616 } 1637 }
1617 1638
1618 \@paths 1639 \@paths
1619} 1640}
1620 1641
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1643
1623Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1645
1714=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1715 1647
1716Sends an ext reply to the player. 1648Sends an ext reply to the player.
1717 1649
… …
2030sub find { 1962sub find {
2031 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
2032 1964
2033 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
2034 1966
2035 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1969
2038 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
2043 or return; 1972 or return;
2044 1973
2045 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
2046 1975
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2015 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2016 $f->skip_block;
2088 $self->_load_objects ($f) 2017 $self->_load_objects ($f)
2089 or return; 2018 or return;
2090 2019
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
2092 if delete $self->{load_original}; 2021 if delete $self->{load_original};
2093 2022
2094 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2024 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2025 unless (aio_stat $uniq) {
… …
2531 2460
2532=item $player_object->enter_link 2461=item $player_object->enter_link
2533 2462
2534Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2535 2464
2536The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2538 2469
2539Will never block. 2470Will never block.
2540 2471
2541=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2542 2473
… …
2600 2531
2601 $map->load; 2532 $map->load;
2602 $map->load_neighbours; 2533 $map->load_neighbours;
2603 2534
2604 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2537 $self->activate_recursive;
2606 2538
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2609} 2541}
… …
2613Moves the player to the given map-path and coordinates by first freezing 2545Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2547that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2548the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2549be called at the end of this process.
2550
2551Note that $check will be called with a potentially non-loaded map, so if
2552it needs a loaded map it has to call C<< ->load >>.
2618 2553
2619=cut 2554=cut
2620 2555
2621our $GOTOGEN; 2556our $GOTOGEN;
2622 2557
… …
2769 $self->contr->savebed ($map, $x, $y) 2704 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2705 if $exit->flag (cf::FLAG_DAMNED);
2771 2706
2772 1 2707 1
2773 }) { 2708 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2713
2779 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
… …
2845 id => "infobox", 2780 id => "infobox",
2846 title => "Body Parts", 2781 title => "Body Parts",
2847 reply => undef, 2782 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2783 tooltip => "Shows which body parts you posess and are available",
2849 }, 2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2850 "c/uptime" => { 2791 "c/uptime" => {
2851 id => "infobox", 2792 id => "infobox",
2852 title => "Uptime", 2793 title => "Uptime",
2853 reply => undef, 2794 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 2795 tooltip => "How long the server has been running since last restart",
… …
2868); 2809);
2869 2810
2870sub cf::client::send_msg { 2811sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2872 2813
2873 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2874 2816
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 2818
2877 # check predefined channels, for the benefit of C 2819 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 2820 if ($CHANNEL{$channel}) {
… …
2899 if ($self->can_msg) { 2841 if ($self->can_msg) {
2900 # default colour, mask it out 2842 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 2844 if $color & cf::NDI_DEF;
2903 2845
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2846 my $pkt = "msg "
2847 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 );
2850
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt);
2906 } else { 2862 } else {
2907 if ($color >= 0) { 2863 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones 2864 # replace some tags by gcfclient-compatible ones
2909 for ($msg) { 2865 for ($msg) {
2910 1 while 2866 1 while
… …
3125=cut 3081=cut
3126 3082
3127for ( 3083for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3085 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3086 decrease split destroy change_exp)],
3131 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
3133 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
3134) { 3090) {
3135 no strict 'refs'; 3091 no strict 'refs';
… …
3393 reload_treasures; 3349 reload_treasures;
3394 3350
3395 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3396} 3352}
3397 3353
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 reload_resources;
3402}
3403
3404sub reload_config { 3354sub reload_config {
3405 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3406 or return; 3356 or return;
3407 3357
3408 local $/; 3358 local $/;
… …
3420 }; 3370 };
3421 warn $@ if $@; 3371 warn $@ if $@;
3422 } 3372 }
3423} 3373}
3424 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3425sub main { 3394sub main {
3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409
3426 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
3427 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
3428 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3429 (async { 3413 (async {
3430 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3431 EV::loop EV::LOOP_ONESHOT; 3415 EV::loop EV::LOOP_ONESHOT;
3432 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
3433 }; 3417 };
3434 3418
3435 { 3419 evthread_start IO::AIO::poll_fileno;
3436 my $guard = freeze_mainloop; 3420
3421 cf::sync_job {
3422 reload_resources;
3437 reload_config; 3423 reload_config;
3438 db_init; 3424 db_init;
3425
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid;
3429 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills;
3432
3433 cf::init_beforeplay;
3434
3435 atomic;
3436
3439 load_extensions; 3437 load_extensions;
3440 3438
3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3439 utime time, time, $RUNTIMEFILE;
3442 evthread_start IO::AIO::poll_fileno; 3440
3441 # no (long-running) fork's whatsoever before this point(!)
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443
3444 (pop @POST_INIT)->(0) while @POST_INIT;
3443 } 3445 };
3444 3446
3445 EV::loop; 3447 EV::loop;
3446} 3448}
3447 3449
3448############################################################################# 3450#############################################################################
… …
3457 }; 3459 };
3458 } 3460 }
3459} 3461}
3460 3462
3461sub write_runtime_sync { 3463sub write_runtime_sync {
3462 my $runtime = "$LOCALDIR/runtime";
3463
3464 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3466 3466
3467 IO::AIO::aio_utime $runtime, undef, undef; 3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3468
3469 my $guard = cf::lock_acquire "write_runtime"; 3469 my $guard = cf::lock_acquire "write_runtime";
3470 3470
3471 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3472 or return; 3472 or return;
3473 3473
3474 my $value = $cf::RUNTIME + 90 + 10; 3474 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3475 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3476 # 60 allows for the watchdog to kill the server.
… …
3486 aio_utime $fh, undef, undef; 3486 aio_utime $fh, undef, undef;
3487 3487
3488 close $fh 3488 close $fh
3489 or return; 3489 or return;
3490 3490
3491 aio_rename "$runtime~", $runtime 3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3492 and return;
3493 3493
3494 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3495 3495
3496 1 3496 1
… …
3508 my $uuid = "$LOCALDIR/uuid"; 3508 my $uuid = "$LOCALDIR/uuid";
3509 3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return; 3511 or return;
3512 3512
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3513 my $value = uuid_seq uuid_cur;
3514
3515 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n";
3517 return;
3518 }
3519
3520 my $value = uuid_str $value + $uuid_skip;
3514 $uuid_skip = 0; 3521 $uuid_skip = 0;
3515 3522
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return; 3524 and return;
3518 3525
… …
3540} 3547}
3541 3548
3542sub emergency_save() { 3549sub emergency_save() {
3543 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3544 3551
3545 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
3546 3553
3547 cf::sync_job { 3554 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559
3548 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
3549 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
3550 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
3551 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
3552 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
3553 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
3554 $pl->valid or next; 3566 $pl->valid or next;
3555 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3556 $pl->save; 3568 $pl->save;
3557 } 3569 }
3558 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
3559 3571
3560 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
3561 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
3562 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
3563 $map->valid or next; 3575 $map->valid or next;
3564 $map->save; 3576 $map->save;
3565 } 3577 }
3566 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
3567 3579
3568 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
3569 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3570 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3571 3583
3572 warn "begin write uuid\n"; 3584 warn "emergency_perl_save: begin write uuid\n";
3573 write_uuid_sync 1; 3585 write_uuid_sync 1;
3574 warn "end write uuid\n"; 3586 warn "emergency_perl_save: end write uuid\n";
3575 }; 3587 };
3576 3588
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3577 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
3578} 3595}
3579 3596
3580sub post_cleanup { 3597sub post_cleanup {
3581 my ($make_core) = @_; 3598 my ($make_core) = @_;
3582 3599
3583 warn Carp::longmess "post_cleanup backtrace" 3600 warn Carp::longmess "post_cleanup backtrace"
3584 if $make_core; 3601 if $make_core;
3602
3603 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$;
3605}
3606
3607# a safer delete_package, copied from Symbol
3608sub clear_package($) {
3609 my $pkg = shift;
3610
3611 # expand to full symbol table name if needed
3612 unless ($pkg =~ /^main::.*::$/) {
3613 $pkg = "main$pkg" if $pkg =~ /^::/;
3614 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3615 $pkg .= '::' unless $pkg =~ /::$/;
3616 }
3617
3618 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3619 my $stem_symtab = *{$stem}{HASH};
3620
3621 defined $stem_symtab and exists $stem_symtab->{$leaf}
3622 or return;
3623
3624 # clear all symbols
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 }
3630 warn "cleared package $pkg\n";#d#
3585} 3631}
3586 3632
3587sub do_reload_perl() { 3633sub do_reload_perl() {
3588 # can/must only be called in main 3634 # can/must only be called in main
3589 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
3590 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
3591 return; 3637 return;
3592 } 3638 }
3593 3639
3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3643
3644 while ($RELOAD) {
3594 warn "reloading..."; 3645 warn "reloading...";
3595 3646
3596 warn "entering sync_job"; 3647 warn "entering sync_job";
3597 3648
3598 cf::sync_job { 3649 cf::sync_job {
3599 cf::write_runtime_sync; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3600 cf::emergency_save; 3651 cf::emergency_save;
3601 cf::write_runtime_sync; # external watchdog should not bark 3652 cf::write_runtime_sync; # external watchdog should not bark
3602 3653
3603 warn "syncing database to disk"; 3654 warn "syncing database to disk";
3604 BDB::db_env_txn_checkpoint $DB_ENV; 3655 BDB::db_env_txn_checkpoint $DB_ENV;
3605 3656
3606 # if anything goes wrong in here, we should simply crash as we already saved 3657 # if anything goes wrong in here, we should simply crash as we already saved
3607 3658
3608 warn "flushing outstanding aio requests"; 3659 warn "flushing outstanding aio requests";
3609 for (;;) {
3610 BDB::flush;
3611 IO::AIO::flush;
3612 Coro::cede_notself;
3613 last unless IO::AIO::nreqs || BDB::nreqs; 3660 while (IO::AIO::nreqs || BDB::nreqs) {
3614 warn "iterate..."; 3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3615 }
3616
3617 ++$RELOAD;
3618
3619 warn "cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = ();
3622
3623 warn "removing commands";
3624 %COMMAND = ();
3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg";
3633
3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 } 3662 }
3640 3663
3641 warn "... nuking $pkg"; 3664 warn "cancelling all extension coros";
3642 Symbol::delete_package $pkg; 3665 $_->cancel for values %EXT_CORO;
3643 } 3666 %EXT_CORO = ();
3644 3667
3645 warn "unloading all perl modules loaded from $LIBDIR"; 3668 warn "removing commands";
3646 while (my ($k, $v) = each %INC) { 3669 %COMMAND = ();
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 3670
3671 warn "removing ext/exti commands";
3672 %EXTCMD = ();
3673 %EXTICMD = ();
3674
3675 warn "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) {
3649 warn "... unloading $k"; 3677 warn "... unloading $pkg";
3650 delete $INC{$k};
3651 3678
3652 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g;
3654
3655 if (my $cb = $k->can ("unload_module")) { 3679 if (my $cb = $pkg->can ("unload")) {
3680 eval {
3656 $cb->(); 3681 $cb->($pkg);
3682 1
3683 } or warn "$pkg unloaded, but with errors: $@";
3684 }
3685
3686 warn "... clearing $pkg";
3687 clear_package $pkg;
3657 } 3688 }
3658 3689
3659 Symbol::delete_package $k; 3690 warn "unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693
3694 warn "... unloading $k";
3695 delete $INC{$k};
3696
3697 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g;
3699
3700 if (my $cb = $k->can ("unload_module")) {
3701 $cb->();
3702 }
3703
3704 clear_package $k;
3660 } 3705 }
3661 3706
3662 warn "getting rid of safe::, as good as possible"; 3707 warn "getting rid of safe::, as good as possible";
3663 Symbol::delete_package "safe::$_" 3708 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3710
3666 warn "unloading cf.pm \"a bit\""; 3711 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3712 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3713 delete $INC{"cf/pod.pm"};
3669 3714
3670 # don't, removes xs symbols, too, 3715 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3716 # and global variables created in xs
3672 #Symbol::delete_package __PACKAGE__; 3717 #clear_package __PACKAGE__;
3673 3718
3674 warn "unload completed, starting to reload now"; 3719 warn "unload completed, starting to reload now";
3675 3720
3676 warn "reloading cf.pm"; 3721 warn "reloading cf.pm";
3677 require cf; 3722 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3679 3724
3680 warn "loading config and database again"; 3725 warn "loading config and database again";
3681 cf::reload_config; 3726 cf::reload_config;
3682 3727
3683 warn "loading extensions"; 3728 warn "loading extensions";
3684 cf::load_extensions; 3729 cf::load_extensions;
3685 3730
3731 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
3692 3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742
3693 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3694 3744
3695 1 3745 1
3696 } or do { 3746 } or do {
3697 warn $@; 3747 warn $@;
3698 cf::cleanup "error while reloading, exiting."; 3748 cf::cleanup "error while reloading, exiting.";
3699 }; 3749 };
3700 3750
3701 warn "reloaded"; 3751 warn "reloaded";
3752 --$RELOAD;
3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3702}; 3757};
3703 3758
3704our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3705 3760
3706sub reload_perl() { 3761sub reload_perl() {
3707 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3708 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3709 3764
3765 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions;
3767
3710 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3711 do_reload_perl; 3769 do_reload_perl;
3712 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3771 };
3713 }; 3772 };
3714} 3773}
3715 3774
3716register_command "reload" => sub { 3775register_command "reload" => sub {
3717 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;
… …
3792 BDB::max_poll_reqs $TICK * 0.1; 3851 BDB::max_poll_reqs $TICK * 0.1;
3793 $AnyEvent::BDB::WATCHER->priority (1); 3852 $AnyEvent::BDB::WATCHER->priority (1);
3794 3853
3795 unless ($DB_ENV) { 3854 unless ($DB_ENV) {
3796 $DB_ENV = BDB::db_env_create; 3855 $DB_ENV = BDB::db_env_create;
3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3798 | BDB::LOG_AUTOREMOVE, 1); 3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3858 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3799 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3859 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3800 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3860 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3801 3861
3802 cf::sync_job { 3862 cf::sync_job {
3803 eval { 3863 eval {
… …
3829{ 3889{
3830 # configure IO::AIO 3890 # configure IO::AIO
3831 3891
3832 IO::AIO::min_parallel 8; 3892 IO::AIO::min_parallel 8;
3833 IO::AIO::max_poll_time $TICK * 0.1; 3893 IO::AIO::max_poll_time $TICK * 0.1;
3834 $AnyEvent::AIO::WATCHER->priority (1); 3894 undef $AnyEvent::AIO::WATCHER;
3835} 3895}
3836 3896
3837my $_log_backtrace; 3897my $_log_backtrace;
3838 3898
3839sub _log_backtrace { 3899sub _log_backtrace {
… …
3842 $msg =~ s/\n//; 3902 $msg =~ s/\n//;
3843 3903
3844 # limit the # of concurrent backtraces 3904 # limit the # of concurrent backtraces
3845 if ($_log_backtrace < 2) { 3905 if ($_log_backtrace < 2) {
3846 ++$_log_backtrace; 3906 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg;
3847 async { 3908 async {
3848 $Coro::current->{desc} = "abt $msg"; 3909 $Coro::current->{desc} = "abt $msg";
3849 3910
3850 my @bt = fork_call { 3911 my @bt = fork_call {
3851 @addr = map { sprintf "%x", $_ } @addr; 3912 @addr = map { sprintf "%x", $_ } @addr;
… …
3862 } 3923 }
3863 3924
3864 @funcs 3925 @funcs
3865 }; 3926 };
3866 3927
3867 LOG llevInfo, "[ABT] $msg\n"; 3928 LOG llevInfo, "[ABT] $perl_bt\n";
3929 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3868 LOG llevInfo, "[ABT] $_\n" for @bt; 3930 LOG llevInfo, "[ABT] $_\n" for @bt;
3869 --$_log_backtrace; 3931 --$_log_backtrace;
3870 }; 3932 };
3871 } else { 3933 } else {
3872 LOG llevInfo, "[ABT] $msg\n"; 3934 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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