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.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.462 by root, Tue Dec 23 06:58:23 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;
41use Coro::EV;
39use Coro::AnyEvent; 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 1.6; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
… …
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
… …
1930 1862
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1933} 1865}
1934 1866
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1867sub decay_objects {
1945 my ($self) = @_; 1868 my ($self) = @_;
1946 1869
1947 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1948 1871
… …
2030sub find { 1953sub find {
2031 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2032 1955
2033 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2034 1957
2035 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1960
2038 $cf::MAP{$path} || do { 1961 $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 1962 my $map = new_from_path cf::map $path
2043 or return; 1963 or return;
2044 1964
2045 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2046 1966
… …
2113 2033
2114 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2035 $self->decay_objects;
2116 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2117 $self->update_buttons; 2037 $self->update_buttons;
2118 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick; 2038 cf::cede_to_tick;
2121 $self->activate; 2039 $self->activate;
2122 } 2040 }
2123 2041
2124 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2531 2449
2532=item $player_object->enter_link 2450=item $player_object->enter_link
2533 2451
2534Freezes 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}>).
2535 2453
2536The 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.
2537I<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.
2538 2458
2539Will never block. 2459Will never block.
2540 2460
2541=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2542 2462
… …
2600 2520
2601 $map->load; 2521 $map->load;
2602 $map->load_neighbours; 2522 $map->load_neighbours;
2603 2523
2604 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2526 $self->activate_recursive;
2606 2527
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2609} 2530}
… …
2772 $self->contr->savebed ($map, $x, $y) 2693 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2694 if $exit->flag (cf::FLAG_DAMNED);
2774 2695
2775 1 2696 1
2776 }) { 2697 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "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. "
2779 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2702
2782 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2848 id => "infobox", 2769 id => "infobox",
2849 title => "Body Parts", 2770 title => "Body Parts",
2850 reply => undef, 2771 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2852 }, 2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2853 "c/uptime" => { 2780 "c/uptime" => {
2854 id => "infobox", 2781 id => "infobox",
2855 title => "Uptime", 2782 title => "Uptime",
2856 reply => undef, 2783 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2784 tooltip => "How long the server has been running since last restart",
… …
2866 id => "party", 2793 id => "party",
2867 title => "Party", 2794 title => "Party",
2868 reply => "gsay ", 2795 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 2796 tooltip => "Messages and chat related to your party",
2870 }, 2797 },
2798 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2871); 2800);
2872 2801
2873sub cf::client::send_msg { 2802sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2804
2876 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2877 2807
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2809
2880 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2832 if ($self->can_msg) {
2903 # default colour, mask it out 2833 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2906 2836
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2909 } else { 2853 } else {
2910 if ($color >= 0) { 2854 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2856 for ($msg) {
2913 1 while 2857 1 while
… …
3396 reload_treasures; 3340 reload_treasures;
3397 3341
3398 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3399} 3343}
3400 3344
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3345sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3347 or return;
3412 3348
3413 local $/; 3349 local $/;
… …
3425 }; 3361 };
3426 warn $@ if $@; 3362 warn $@ if $@;
3427 } 3363 }
3428} 3364}
3429 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
3430sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
3431 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3403 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3438 }; 3407 };
3439 3408
3440 { 3409 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3442 reload_config; 3413 reload_config;
3443 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3444 load_extensions; 3427 load_extensions;
3445 3428
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3429 utime time, time, $RUNTIMEFILE;
3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3435 };
3448 3436
3449 EV::loop; 3437 EV::loop;
3450} 3438}
3451 3439
3452############################################################################# 3440#############################################################################
… …
3461 }; 3449 };
3462 } 3450 }
3463} 3451}
3464 3452
3465sub write_runtime_sync { 3453sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3470 3456
3471 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3458
3473 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3474 3460
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3462 or return;
3477 3463
3478 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3491 3477
3492 close $fh 3478 close $fh
3493 or return; 3479 or return;
3494 3480
3495 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3482 and return;
3497 3483
3498 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3499 3485
3500 1 3486 1
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3513 3499
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3501 or return;
3516 3502
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3511 $uuid_skip = 0;
3519 3512
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3514 and return;
3522 3515
… …
3544} 3537}
3545 3538
3546sub emergency_save() { 3539sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3548 3541
3549 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3550 3543
3551 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3552 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3556 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3558 $pl->save;
3561 } 3559 }
3562 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3563 3561
3564 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3565 $map->valid or next;
3568 $map->save; 3566 $map->save;
3569 } 3567 }
3570 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3571 3569
3572 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3575 3573
3576 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3575 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3579 }; 3577 };
3580 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3581 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3582} 3585}
3583 3586
3584sub post_cleanup { 3587sub post_cleanup {
3585 my ($make_core) = @_; 3588 my ($make_core) = @_;
3586 3589
3587 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3595}
3596
3597# a safer delete_package, copied from Symbol
3598sub clear_package($) {
3599 my $pkg = shift;
3600
3601 # expand to full symbol table name if needed
3602 unless ($pkg =~ /^main::.*::$/) {
3603 $pkg = "main$pkg" if $pkg =~ /^::/;
3604 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3605 $pkg .= '::' unless $pkg =~ /::$/;
3606 }
3607
3608 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3609 my $stem_symtab = *{$stem}{HASH};
3610
3611 defined $stem_symtab and exists $stem_symtab->{$leaf}
3612 or return;
3613
3614 # clear all symbols
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 }
3620 warn "cleared package $pkg\n";#d#
3589} 3621}
3590 3622
3591sub do_reload_perl() { 3623sub do_reload_perl() {
3592 # can/must only be called in main 3624 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3595 return; 3627 return;
3596 } 3628 }
3597 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3598 warn "reloading..."; 3635 warn "reloading...";
3599 3636
3600 warn "entering sync_job"; 3637 warn "entering sync_job";
3601 3638
3602 cf::sync_job { 3639 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3641 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3606 3643
3607 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3646
3610 # if anything goes wrong in here, we should simply crash as we already saved 3647 # if anything goes wrong in here, we should simply crash as we already saved
3611 3648
3612 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3652 }
3644 3653
3645 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3647 } 3656 %EXT_CORO = ();
3648 3657
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3668
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3660 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3661 } 3678 }
3662 3679
3663 Symbol::delete_package $k; 3680 warn "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683
3684 warn "... unloading $k";
3685 delete $INC{$k};
3686
3687 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g;
3689
3690 if (my $cb = $k->can ("unload_module")) {
3691 $cb->();
3692 }
3693
3694 clear_package $k;
3664 } 3695 }
3665 3696
3666 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3700
3670 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/pod.pm"};
3673 3704
3674 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3706 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3677 3708
3678 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3679 3710
3680 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3681 require cf; 3712 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3714
3684 warn "loading config and database again"; 3715 warn "loading config and database again";
3685 cf::reload_config; 3716 cf::reload_config;
3686 3717
3687 warn "loading extensions"; 3718 warn "loading extensions";
3688 cf::load_extensions; 3719 cf::load_extensions;
3689 3720
3721 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3696 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3697 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3698 3734
3699 1 3735 1
3700 } or do { 3736 } or do {
3701 warn $@; 3737 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3703 }; 3739 };
3704 3740
3705 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3706}; 3747};
3707 3748
3708our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3709 3750
3710sub reload_perl() { 3751sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3713 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3759 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3717 }; 3762 };
3718} 3763}
3719 3764
3720register_command "reload" => sub { 3765register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3847 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3848 3893
3849 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3852 async { 3898 async {
3853 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3854 3900
3855 my @bt = fork_call { 3901 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3913 }
3868 3914
3869 @funcs 3915 @funcs
3870 }; 3916 };
3871 3917
3872 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3921 --$_log_backtrace;
3875 }; 3922 };
3876 } else { 3923 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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