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.442 by root, Sun Aug 31 09:03:31 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
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1649
1719=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1720 1651
1721Sends an ext reply to the player. 1652Sends an ext reply to the player.
1722 1653
… …
1935 1866
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1938} 1869}
1939 1870
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1871sub decay_objects {
1950 my ($self) = @_; 1872 my ($self) = @_;
1951 1873
1952 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1953 1875
… …
2035sub find { 1957sub find {
2036 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2037 1959
2038 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2039 1961
2040 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2042 1964
2043 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
2048 or return; 1967 or return;
2049 1968
2050 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2051 1970
… …
2118 2037
2119 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2039 $self->decay_objects;
2121 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2122 $self->update_buttons; 2041 $self->update_buttons;
2123 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick; 2042 cf::cede_to_tick;
2126 $self->activate; 2043 $self->activate;
2127 } 2044 }
2128 2045
2129 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2471 2388
2472our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2473 id => "say", 2390 id => "say",
2474 title => "Map", 2391 title => "Map",
2475 reply => "say ", 2392 reply => "say ",
2476 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.",
2477}; 2394};
2478 2395
2479our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2480 id => "chat", 2397 id => "chat",
2481 title => "Chat", 2398 title => "Chat",
… …
2536 2453
2537=item $player_object->enter_link 2454=item $player_object->enter_link
2538 2455
2539Freezes 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}>).
2540 2457
2541The 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.
2542I<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.
2543 2462
2544Will never block. 2463Will never block.
2545 2464
2546=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2547 2466
… …
2605 2524
2606 $map->load; 2525 $map->load;
2607 $map->load_neighbours; 2526 $map->load_neighbours;
2608 2527
2609 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2610 $self->activate_recursive; 2530 $self->activate_recursive;
2611 2531
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2614} 2534}
… …
2777 $self->contr->savebed ($map, $x, $y) 2697 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2698 if $exit->flag (cf::FLAG_DAMNED);
2779 2699
2780 1 2700 1
2781 }) { 2701 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "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. "
2784 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2706
2787 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2853 id => "infobox", 2773 id => "infobox",
2854 title => "Body Parts", 2774 title => "Body Parts",
2855 reply => undef, 2775 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2857 }, 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 },
2858 "c/uptime" => { 2802 "c/uptime" => {
2859 id => "infobox", 2803 id => "infobox",
2860 title => "Uptime", 2804 title => "Uptime",
2861 reply => undef, 2805 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
… …
2871 id => "party", 2815 id => "party",
2872 title => "Party", 2816 title => "Party",
2873 reply => "gsay ", 2817 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2818 tooltip => "Messages and chat related to your party",
2875 }, 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,
2876); 2828);
2877 2829
2878sub cf::client::send_msg { 2830sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2880 2832
2881 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2882 2835
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 2837
2885 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2888 2841
2889 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2893 2844
2894 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 2850 }
2901 2851
2902 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2903 } 2853 }
2904 2854
2905 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2906 2856
2907 if ($self->can_msg) {
2908 # default colour, mask it out 2857 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2911 2860
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 2864 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 2865
2926 $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};
2927 2869
2928 utf8::encode $msg; 2870 # split very large packets
2929 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2930 if (0 && $msg =~ /\[/) { 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2931 # COMMAND/INFO 2873 $pkt = "frag";
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 } 2874 }
2875
2876 $self->send_packet ($pkt);
2939} 2877}
2940 2878
2941=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2942 2880
2943Sends an ext event to the client. 2881Sends an ext event to the client.
… …
3118The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3119 3057
3120 cf::object 3058 cf::object
3121 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
3122 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3123 3062
3124 cf::object::player 3063 cf::object::player
3125 player 3064 player
3126 3065
3127 cf::player 3066 cf::player
… …
3133=cut 3072=cut
3134 3073
3135for ( 3074for (
3136 ["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
3137 insert remove inv nrof name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3142) { 3081) {
3143 no strict 'refs'; 3082 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3162 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3163 3102
3164 my $qcode = $code; 3103 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3167 3108
3168 local $_; 3109 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3170 3111
3171 my $eval = 3112 my $eval =
… …
3401 reload_treasures; 3342 reload_treasures;
3402 3343
3403 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3404} 3345}
3405 3346
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412}
3413
3414sub reload_config { 3347sub reload_config {
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3416 or return; 3349 or return;
3417 3350
3418 local $/; 3351 local $/;
… …
3430 }; 3363 };
3431 warn $@ if $@; 3364 warn $@ if $@;
3432 } 3365 }
3433} 3366}
3434 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
3435sub 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
3436 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3438 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#
3439 (async { 3405 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3443 }; 3409 };
3444 3410
3445 { 3411 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3412
3413 cf::sync_job {
3414 reload_resources;
3447 reload_config; 3415 reload_config;
3448 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
3449 load_extensions; 3429 load_extensions;
3450 3430
3451 $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;
3452 } 3437 };
3453 3438
3454 EV::loop; 3439 EV::loop;
3455} 3440}
3456 3441
3457############################################################################# 3442#############################################################################
… …
3466 }; 3451 };
3467 } 3452 }
3468} 3453}
3469 3454
3470sub write_runtime_sync { 3455sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime";
3472
3473 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
3475 3458
3476 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3460
3478 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
3479 3462
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3481 or return; 3464 or return;
3482 3465
3483 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
… …
3495 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
3496 3479
3497 close $fh 3480 close $fh
3498 or return; 3481 or return;
3499 3482
3500 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3484 and return;
3502 3485
3503 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
3504 3487
3505 1 3488 1
… …
3517 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3518 3501
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3503 or return;
3521 3504
3522 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;
3523 $uuid_skip = 0; 3513 $uuid_skip = 0;
3524 3514
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3516 and return;
3527 3517
… …
3549} 3539}
3550 3540
3551sub emergency_save() { 3541sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3553 3543
3554 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3555 3545
3556 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
3557 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3558 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3560 $pl->save;
3566 } 3561 }
3567 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3568 3563
3569 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3567 $map->valid or next;
3573 $map->save; 3568 $map->save;
3574 } 3569 }
3575 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3576 3571
3577 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3580 3575
3581 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3577 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3584 }; 3579 };
3585 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
3586 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3587} 3587}
3588 3588
3589sub post_cleanup { 3589sub post_cleanup {
3590 my ($make_core) = @_; 3590 my ($make_core) = @_;
3591 3591
3592 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3594} 3597}
3595 3598
3596# a safer delete_package, copied from Symbol 3599# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3600sub clear_package($) {
3598 my $pkg = shift; 3601 my $pkg = shift;
… …
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3618 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3619 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3621 }
3619 warn "cleared package #$pkg\n";#d# 3622 warn "cleared package $pkg\n";#d#
3620} 3623}
3621
3622our $RELOAD; # how many times to reload
3623 3624
3624sub do_reload_perl() { 3625sub do_reload_perl() {
3625 # can/must only be called in main 3626 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
3627 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3628 return; 3629 return;
3629 } 3630 }
3630 3631
3631 return if $RELOAD++; 3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3632 3635
3633 while ($RELOAD) { 3636 while ($RELOAD) {
3634 warn "reloading..."; 3637 warn "reloading...";
3635 3638
3636 warn "entering sync_job"; 3639 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3700 clear_package "safe::$_"
3698 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);
3699 3702
3700 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3706
3704 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3708 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3707 3710
… …
3715 cf::reload_config; 3718 cf::reload_config;
3716 3719
3717 warn "loading extensions"; 3720 warn "loading extensions";
3718 cf::load_extensions; 3721 cf::load_extensions;
3719 3722
3723 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3725 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;
3726 3734
3727 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3728 3736
3729 1 3737 1
3730 } or do { 3738 } or do {
… …
3733 }; 3741 };
3734 3742
3735 warn "reloaded"; 3743 warn "reloaded";
3736 --$RELOAD; 3744 --$RELOAD;
3737 } 3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3738}; 3749};
3739 3750
3740our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3741 3752
3742sub reload_perl() { 3753sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3745 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 3761 do_reload_perl;
3748 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3749 }; 3764 };
3750} 3765}
3751 3766
3752register_command "reload" => sub { 3767register_command "reload" => sub {
3753 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
… …
3879 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3880 3895
3881 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3884 async { 3900 async {
3885 $Coro::current->{desc} = "abt $msg"; 3901 $Coro::current->{desc} = "abt $msg";
3886 3902
3887 my @bt = fork_call { 3903 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
… …
3899 } 3915 }
3900 3916
3901 @funcs 3917 @funcs
3902 }; 3918 };
3903 3919
3904 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 3923 --$_log_backtrace;
3907 }; 3924 };
3908 } else { 3925 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 3928 }
3912} 3929}
3913 3930
3914# load additional modules 3931# load additional modules
3915use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3916 3933
3917END { cf::emergency_save } 3934END { cf::emergency_save }
3918 3935
39191 39361
3920 3937

Diff Legend

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