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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.468 by root, Thu Jan 8 19:23:44 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
63 65
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
97our %RESOURCE; 105our %RESOURCE;
98 106
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 109our $NEXT_TICK;
… …
104our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 115our $DB_ENV;
108 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
109our %CFG; 119our %CFG;
110 120
111our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 122our $RUNTIME;
113our $NOW; 123our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 134our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
126 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
127binmode STDOUT; 141binmode STDOUT;
128binmode STDERR; 142binmode STDERR;
129 143
130# read virtual server time, if available 144# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
135} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
136 152
137mkdir $_ 153mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 155
140our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 316
301sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
303 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
304=item cf::lock_wait $string 334=item cf::lock_wait $string
305 335
306Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
307 337
308=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
309 339
310Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
313returned. 343returned.
314 344
315Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 346deadlocked coro.
… …
322 352
323Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
324 354
325=cut 355=cut
326 356
327our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 358
330sub lock_wait($) { 359sub lock_wait($) {
331 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 361}
344 362
345sub lock_acquire($) { 363sub lock_acquire($) {
346 my ($key) = @_; 364 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 365}
360 366
361sub lock_active($) { 367sub lock_active($) {
362 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 369}
366 370
367sub freeze_mainloop { 371sub freeze_mainloop {
368 tick_inhibit_inc; 372 tick_inhibit_inc;
369 373
370 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
371} 375}
372 376
373=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
374 378
375Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 731
728############################################################################# 732#############################################################################
729 733
730=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
731 735
732Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
735 739
736In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
788 792
789Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
791 795
792Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
794 798
795These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
796 800
797=over 4 801=over 4
… …
1164 } else { 1168 } else {
1165 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1166 } 1170 }
1167 1171
1168 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1176 } else {
1170 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1171 } 1178 }
1172 } else { 1179 } else {
1173 aio_unlink $filename; 1180 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1175 } 1182 }
… …
1266 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1267 1274
1268 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1269} 1276}
1270 1277
1278use File::Glob ();
1279
1271cf::player->attach ( 1280cf::player->attach (
1272 on_command => sub { 1281 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1274 1283
1275 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1306 } 1315 }
1307 1316
1308 cf::override; 1317 cf::override;
1309 }, 1318 },
1310); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1311 1333
1312sub load_extensions { 1334sub load_extensions {
1313 cf::sync_job { 1335 cf::sync_job {
1314 my %todo; 1336 my %todo;
1315 1337
… …
1385 1407
1386=back 1408=back
1387 1409
1388=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1389 1411
1390Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1391 1413
1392=cut 1414=cut
1393 1415
1394package cf::player; 1416package cf::player;
1395 1417
… …
1438 1460
1439sub exists($) { 1461sub exists($) {
1440 my ($login) = @_; 1462 my ($login) = @_;
1441 1463
1442 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1444} 1466}
1445 1467
1446sub find($) { 1468sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1470 my $login = $_[0];
… …
1523 my ($pl) = @_; 1545 my ($pl) = @_;
1524 1546
1525 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1526 1548
1527 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1551
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1553 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1555 $pl->ob->check_score;
… …
1619 } 1641 }
1620 1642
1621 \@paths 1643 \@paths
1622} 1644}
1623 1645
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1647
1626Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1649
1717=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1718 1651
1719Sends an ext reply to the player. 1652Sends an ext reply to the player.
1720 1653
… …
1933 1866
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1936} 1869}
1937 1870
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945}
1946
1947sub decay_objects { 1871sub decay_objects {
1948 my ($self) = @_; 1872 my ($self) = @_;
1949 1873
1950 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1951 1875
… …
2033sub find { 1957sub find {
2034 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2035 1959
2036 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2037 1961
2038 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2040 1964
2041 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
2046 or return; 1967 or return;
2047 1968
2048 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2049 1970
… …
2116 2037
2117 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2039 $self->decay_objects;
2119 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2120 $self->update_buttons; 2041 $self->update_buttons;
2121 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick; 2042 cf::cede_to_tick;
2124 $self->activate; 2043 $self->activate;
2125 } 2044 }
2126 2045
2127 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2469 2388
2470our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2471 id => "say", 2390 id => "say",
2472 title => "Map", 2391 title => "Map",
2473 reply => "say ", 2392 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2475}; 2394};
2476 2395
2477our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2478 id => "chat", 2397 id => "chat",
2479 title => "Chat", 2398 title => "Chat",
… …
2534 2453
2535=item $player_object->enter_link 2454=item $player_object->enter_link
2536 2455
2537Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2538 2457
2539The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2540I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2541 2462
2542Will never block. 2463Will never block.
2543 2464
2544=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2545 2466
… …
2603 2524
2604 $map->load; 2525 $map->load;
2605 $map->load_neighbours; 2526 $map->load_neighbours;
2606 2527
2607 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2608 $self->activate_recursive; 2530 $self->activate_recursive;
2609 2531
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2612} 2534}
… …
2775 $self->contr->savebed ($map, $x, $y) 2697 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2698 if $exit->flag (cf::FLAG_DAMNED);
2777 2699
2778 1 2700 1
2779 }) { 2701 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2782 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2706
2785 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2851 id => "infobox", 2773 id => "infobox",
2852 title => "Body Parts", 2774 title => "Body Parts",
2853 reply => undef, 2775 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2855 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2856 "c/uptime" => { 2802 "c/uptime" => {
2857 id => "infobox", 2803 id => "infobox",
2858 title => "Uptime", 2804 title => "Uptime",
2859 reply => undef, 2805 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
… …
2869 id => "party", 2815 id => "party",
2870 title => "Party", 2816 title => "Party",
2871 reply => "gsay ", 2817 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 2818 tooltip => "Messages and chat related to your party",
2873 }, 2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2874); 2828);
2875 2829
2876sub cf::client::send_msg { 2830sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2878 2832
2879 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2880 2835
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 2837
2883 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2886 2841
2887 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2891 2844
2892 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 2850 }
2899 2851
2900 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2901 } 2853 }
2902 2854
2903 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2904 2856
2905 if ($self->can_msg) {
2906 # default colour, mask it out 2857 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2909 2860
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 2864 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 2865
2924 $color &= cf::NDI_COLOR_MASK; 2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2925 2869
2926 utf8::encode $msg; 2870 # split very large packets
2927 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2928 if (0 && $msg =~ /\[/) { 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2929 # COMMAND/INFO 2873 $pkt = "frag";
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 } 2874 }
2875
2876 $self->send_packet ($pkt);
2937} 2877}
2938 2878
2939=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2940 2880
2941Sends an ext event to the client. 2881Sends an ext event to the client.
… …
3116The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3117 3057
3118 cf::object 3058 cf::object
3119 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3120 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3121 3062
3122 cf::object::player 3063 cf::object::player
3123 player 3064 player
3124 3065
3125 cf::player 3066 cf::player
… …
3131=cut 3072=cut
3132 3073
3133for ( 3074for (
3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3135 insert remove inv nrof name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3137 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3138 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3139 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3140) { 3081) {
3141 no strict 'refs'; 3082 no strict 'refs';
3142 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3143 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3160 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3161 3102
3162 my $qcode = $code; 3103 my $qcode = $code;
3163 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3164 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3165 3108
3166 local $_; 3109 local $_;
3167 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3168 3111
3169 my $eval = 3112 my $eval =
… …
3399 reload_treasures; 3342 reload_treasures;
3400 3343
3401 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3402} 3345}
3403 3346
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410}
3411
3412sub reload_config { 3347sub reload_config {
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3414 or return; 3349 or return;
3415 3350
3416 local $/; 3351 local $/;
… …
3428 }; 3363 };
3429 warn $@ if $@; 3364 warn $@ if $@;
3430 } 3365 }
3431} 3366}
3432 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3433sub main { 3387sub main {
3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401
3434 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3405 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3441 }; 3409 };
3442 3410
3443 { 3411 evthread_start IO::AIO::poll_fileno;
3444 my $guard = freeze_mainloop; 3412
3413 cf::sync_job {
3414 reload_resources;
3445 reload_config; 3415 reload_config;
3446 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
3447 load_extensions; 3429 load_extensions;
3448 3430
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3431 utime time, time, $RUNTIMEFILE;
3432
3433 # no (long-running) fork's whatsoever before this point(!)
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3450 } 3437 };
3451 3438
3452 EV::loop; 3439 EV::loop;
3453} 3440}
3454 3441
3455############################################################################# 3442#############################################################################
… …
3464 }; 3451 };
3465 } 3452 }
3466} 3453}
3467 3454
3468sub write_runtime_sync { 3455sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime";
3470
3471 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
3473 3458
3474 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3460
3476 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
3477 3462
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3479 or return; 3464 or return;
3480 3465
3481 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
… …
3493 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
3494 3479
3495 close $fh 3480 close $fh
3496 or return; 3481 or return;
3497 3482
3498 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3484 and return;
3500 3485
3501 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
3502 3487
3503 1 3488 1
… …
3515 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3516 3501
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3503 or return;
3519 3504
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3513 $uuid_skip = 0;
3522 3514
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3516 and return;
3525 3517
… …
3547} 3539}
3548 3540
3549sub emergency_save() { 3541sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3551 3543
3552 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3553 3545
3554 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
3555 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3558 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3560 $pl->save;
3564 } 3561 }
3565 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3566 3563
3567 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3568 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3567 $map->valid or next;
3571 $map->save; 3568 $map->save;
3572 } 3569 }
3573 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3574 3571
3575 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3578 3575
3579 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3577 write_uuid_sync 1;
3581 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3582 }; 3579 };
3583 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3584 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3585} 3587}
3586 3588
3587sub post_cleanup { 3589sub post_cleanup {
3588 my ($make_core) = @_; 3590 my ($make_core) = @_;
3589 3591
3590 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3592} 3597}
3593 3598
3594# a safer delete_package, copied from Symbol 3599# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3600sub clear_package($) {
3596 my $pkg = shift; 3601 my $pkg = shift;
… …
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3618 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3619 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3621 }
3617 warn "cleared package #$pkg\n";#d# 3622 warn "cleared package $pkg\n";#d#
3618} 3623}
3619
3620our $RELOAD; # how many times to reload
3621 3624
3622sub do_reload_perl() { 3625sub do_reload_perl() {
3623 # can/must only be called in main 3626 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
3625 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3626 return; 3629 return;
3627 } 3630 }
3628 3631
3629 return if $RELOAD++; 3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3630 3635
3631 while ($RELOAD) { 3636 while ($RELOAD) {
3632 warn "reloading..."; 3637 warn "reloading...";
3633 3638
3634 warn "entering sync_job"; 3639 warn "entering sync_job";
… …
3695 clear_package "safe::$_" 3700 clear_package "safe::$_"
3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3697 3702
3698 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3699 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3701 3706
3702 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3703 # and global variables created in xs 3708 # and global variables created in xs
3704 #clear_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3705 3710
… …
3713 cf::reload_config; 3718 cf::reload_config;
3714 3719
3715 warn "loading extensions"; 3720 warn "loading extensions";
3716 cf::load_extensions; 3721 cf::load_extensions;
3717 3722
3723 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3724 3734
3725 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3726 3736
3727 1 3737 1
3728 } or do { 3738 } or do {
… …
3731 }; 3741 };
3732 3742
3733 warn "reloaded"; 3743 warn "reloaded";
3734 --$RELOAD; 3744 --$RELOAD;
3735 } 3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3736}; 3749};
3737 3750
3738our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3739 3752
3740sub reload_perl() { 3753sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3743 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 3761 do_reload_perl;
3746 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3747 }; 3764 };
3748} 3765}
3749 3766
3750register_command "reload" => sub { 3767register_command "reload" => sub {
3751 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
… …
3877 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3878 3895
3879 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3882 async { 3900 async {
3883 $Coro::current->{desc} = "abt $msg"; 3901 $Coro::current->{desc} = "abt $msg";
3884 3902
3885 my @bt = fork_call { 3903 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
… …
3897 } 3915 }
3898 3916
3899 @funcs 3917 @funcs
3900 }; 3918 };
3901 3919
3902 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 3923 --$_log_backtrace;
3905 }; 3924 };
3906 } else { 3925 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3909 } 3928 }
3910} 3929}
3911 3930
3912# load additional modules 3931# load additional modules
3913use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3914 3933
3915END { cf::emergency_save } 3934END { cf::emergency_save }
3916 3935
39171 39361
3918 3937

Diff Legend

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