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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5; 58use Digest::MD5;
52use Fcntl; 59use Fcntl;
53use YAML (); 60use YAML::XS ();
54use IO::AIO 2.51 (); 61use IO::AIO ();
55use Time::HiRes; 62use Time::HiRes;
56use Compress::LZF; 63use Compress::LZF;
57use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
58 67
59# configure various modules to our taste 68# configure various modules to our taste
60# 69#
61$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 78
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 81
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 83
69our %COMMAND = (); 84our %COMMAND = ();
70our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
73our %EXTCMD = (); 88our %EXTCMD = ();
74our %EXTICMD = (); 89our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
77 92
78our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
80 97
81our $CONFDIR = confdir; 98our $CONFDIR = confdir;
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
92our %RESOURCE; 112our %RESOURCE;
93 113
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 116our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
99 118
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 122our $DB_ENV;
105 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
106our %CFG; 126our %CFG;
107 127
108our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 129our $RUNTIME;
110our $NOW; 130our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 141our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
123 143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
148
124binmode STDOUT; 149binmode STDOUT;
125binmode STDERR; 150binmode STDERR;
126 151
127# read virtual server time, if available 152# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
132} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
133 160
134mkdir $_ 161mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 163
137our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
138 165
139sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 178
141############################################################################# 179#############################################################################
142 180
143=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
144 182
191returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 231
194=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
195 233
196This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 236that call.
199 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
200=back 244=back
201 245
202=cut 246=cut
203 247
204BEGIN { 248$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 249 my $msg = join "", @_;
207 250
208 $msg .= "\n" 251 $msg .= "\n"
209 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
210 253
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 255
213 LOG llevError, $msg; 256 LOG llevError, $msg;
214 }; 257};
215}
216 258
217$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
219 263
220 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 266 return;#d#
223 }#d# 267 }#d#
224 268
225 # kill coroutine otherwise 269 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 270 Coro::terminate
228}; 271};
229
230$SIG{__DIE__} = sub { }; #d#?
231 272
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 283for my $pkg (qw(
243 cf::global cf::attachable 284 cf::global cf::attachable
244 cf::object cf::object::player 285 cf::object cf::object::player
245 cf::client cf::player 286 cf::client cf::player
246 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
247 cf::map cf::party cf::region 289 cf::party cf::region
248)) { 290)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 292}
252 293
253$EV::DIED = sub { 294$EV::DIED = sub {
254 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
255}; 296};
256 297
257############################################################################# 298#############################################################################
258 299
259=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 338
298sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
300 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
301=item cf::lock_wait $string 356=item cf::lock_wait $string
302 357
303Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
304 359
305=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
306 361
307Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
310returned. 365returned.
311 366
312Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 368deadlocked coro.
319 374
320Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
321 376
322=cut 377=cut
323 378
324our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 380
327sub lock_wait($) { 381sub lock_wait($) {
328 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 383}
341 384
342sub lock_acquire($) { 385sub lock_acquire($) {
343 my ($key) = @_; 386 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 387}
357 388
358sub lock_active($) { 389sub lock_active($) {
359 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 391}
363 392
364sub freeze_mainloop { 393sub freeze_mainloop {
365 tick_inhibit_inc; 394 tick_inhibit_inc;
366 395
367 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
368} 397}
369 398
370=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
371 400
372Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
427 } 456 }
428 } 457 }
429}; 458};
430 459
431sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
432 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
433 464
434 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
436 467
547 reset_signals; 578 reset_signals;
548 &$cb 579 &$cb
549 }, @args; 580 }, @args;
550 581
551 wantarray ? @res : $res[-1] 582 wantarray ? @res : $res[-1]
583}
584
585=item $coin = coin_from_name $name
586
587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
552} 610}
553 611
554=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
555 613
556Returns a single value from the environment database. 614Returns a single value from the environment database.
695 753
696############################################################################# 754#############################################################################
697 755
698=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
699 757
700Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
703 761
704In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
756 814
757Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
759 817
760Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
762 820
763These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
764 822
765=over 4 823=over 4
1056 1114
1057sub reattach { 1115sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1117 my ($obj) = @_;
1060 1118
1119 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1121
1063 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1064 1123
1065 @$registry = (); 1124 @$registry = ();
1066 1125
1112 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1115 1174
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1180 aio_fsync $fh;
1181 }
1120 close $fh; 1182 aio_close $fh;
1121 1183
1122 if (@$objs) { 1184 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1191 aio_fsync $fh;
1192 }
1128 close $fh; 1193 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1195 }
1131 } else { 1196 } else {
1132 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1133 } 1198 }
1134 1199
1135 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1204 } else {
1137 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1138 } 1206 }
1139 } else { 1207 } else {
1140 aio_unlink $filename; 1208 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1142 } 1210 }
1233 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1234 1302
1235 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1236} 1304}
1237 1305
1306use File::Glob ();
1307
1238cf::player->attach ( 1308cf::player->attach (
1239 on_command => sub { 1309 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1241 1311
1242 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1274 1344
1275 cf::override; 1345 cf::override;
1276 }, 1346 },
1277); 1347);
1278 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1279sub load_extensions { 1362sub load_extensions {
1280 cf::sync_job { 1363 cf::sync_job {
1281 my %todo; 1364 my %todo;
1282 1365
1283 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1302 1385
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1388
1306 $ext{source} = 1389 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1309 . $source 1392 . $source
1310 . "\n};\n1"; 1393 . "\n};\n1";
1311 1394
1312 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1352 1435
1353=back 1436=back
1354 1437
1355=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1356 1439
1357Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1358 1441
1359=cut 1442=cut
1360 1443
1361package cf::player; 1444package cf::player;
1362 1445
1405 1488
1406sub exists($) { 1489sub exists($) {
1407 my ($login) = @_; 1490 my ($login) = @_;
1408 1491
1409 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1411} 1494}
1412 1495
1413sub find($) { 1496sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1498 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1511 or return;
1429 1512
1430 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1431 or return; 1514 or return;
1515
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1435 } 1519 }
1436 } 1520 }
1446 1530
1447 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1448 1532
1449 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1451 1537
1452 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1539 cf::cede_to_tick;
1454} 1540}
1455 1541
1487 my ($pl) = @_; 1573 my ($pl) = @_;
1488 1574
1489 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1490 1576
1491 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1579
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1498 1586
1499 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1627
1540 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1541 my $path = path $login; 1629 my $path = path $login;
1542 1630
1543 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1637 }
1549 1638
1580 } 1669 }
1581 1670
1582 \@paths 1671 \@paths
1583} 1672}
1584 1673
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1675
1587Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1677
1678=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1679 1679
1680Sends an ext reply to the player. 1680Sends an ext reply to the player.
1681 1681
1748our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1750 1750
1751sub generate_random_map { 1751sub generate_random_map {
1752 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1753 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1757 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1882
1880# the temporary/swap location 1883# the temporary/swap location
1881sub save_path { 1884sub save_path {
1882 my ($self) = @_; 1885 my ($self) = @_;
1883 1886
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1886} 1889}
1887 1890
1888# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1889sub uniq_path { 1892sub uniq_path {
1890 my ($self) = @_; 1893 my ($self) = @_;
1891 1894
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1897}
1904 1898
1905sub decay_objects { 1899sub decay_objects {
1906 my ($self) = @_; 1900 my ($self) = @_;
1907 1901
1991sub find { 1985sub find {
1992 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1993 1987
1994 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1995 1989
1996 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1998 1992
1999 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2004 or return; 1995 or return;
2005 1996
2006 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2007 1998
2009 or return; 2000 or return;
2010 2001
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2014 undef $guard1; 2006 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2007 $map->reset;
2017 return find $path; 2008 return find $path;
2018 } 2009 }
2019 2010
2020 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2039 $f->skip_block;
2049 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2050 or return; 2041 or return;
2051 2042
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2053 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2054 2045
2055 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2047 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2067 $self->decay_objects;
2077 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2078 $self->update_buttons; 2069 $self->update_buttons;
2079 cf::cede_to_tick; 2070 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2071 $self->activate;
2083 } 2072 }
2084 2073
2085 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2087 2076
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2078 }
2090 2079
2091 $self->post_load; 2080 $self->post_load;
2092} 2081}
2093 2082
2151 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2152 2141
2153 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2154 2143
2155 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2146 }
2158 2147
2159 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2160 2149
2161 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2187 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2201 }; 2190 };
2202 2191
2192 cf::get_slot 0.02;
2193
2203 if ($uniq) { 2194 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2197 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2206 $self->save;
2216 2207
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2209
2219 return if $self->players; 2210 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2222 2213
2223 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2224 2215
2225 $self->deactivate; 2216 $self->deactivate;
2250 2241
2251 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252 2243
2253 return if $self->players; 2244 return if $self->players;
2254 2245
2255 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2256 2247
2257 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2258 2249
2259 # need to save uniques path 2250 # need to save uniques path
2260 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2343 2334
2344sub unique_maps() { 2335sub unique_maps() {
2345 [ 2336 [
2346 map { 2337 map {
2347 utf8::decode $_; 2338 utf8::decode $_;
2348 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2349 ? normalise $_ 2342 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2344 ]
2353} 2345}
2354 2346
2355package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2356 2378
2357=back 2379=back
2358 2380
2359=head3 cf::object 2381=head3 cf::object
2360 2382
2364 2386
2365=over 4 2387=over 4
2366 2388
2367=item $ob->inv_recursive 2389=item $ob->inv_recursive
2368 2390
2369Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2370 2393
2371=cut 2394=cut
2372 2395
2373sub inv_recursive_; 2396sub inv_recursive_;
2374sub inv_recursive_ { 2397sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2380} 2403}
2381 2404
2382=item $ref = $ob->ref 2405=item $ref = $ob->ref
2383 2406
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2407Creates and returns a persistent reference to an object that can be stored as a string.
2385 2408
2386=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2387 2410
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2412even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2445dialogue with the given NPC character.
2423 2446
2424=cut 2447=cut
2425 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2426# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2464# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2480
2444 } else { 2481 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2484 }
2448 } 2485 }
2449} 2486}
2450 2487
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2513
2477=item $player_object->enter_link 2514=item $player_object->enter_link
2478 2515
2479Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2480 2517
2481The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2483 2522
2484Will never block. 2523Will never block.
2485 2524
2486=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2487 2526
2539 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2541 2580
2542 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2545 2584
2546 $map->load; 2585 $map->load;
2547 $map->load_neighbours; 2586 $map->load_neighbours;
2548 2587
2549 return unless $self->contr->active; 2588 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2589
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2554} 2595}
2555 2596
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2557 2598
2558Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2563 2607
2564=cut 2608=cut
2565 2609
2566our $GOTOGEN; 2610our $GOTOGEN;
2567 2611
2646} 2690}
2647 2691
2648sub prepare_random_map { 2692sub prepare_random_map {
2649 my ($exit) = @_; 2693 my ($exit) = @_;
2650 2694
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2697 # that depends on the exit object
2656 2698
2657 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2701 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2664 } 2708 }
2665 2709
2666 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2667 2711
2668 my $data = cf::encode_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2671 2715
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2718 undef $fh;
2675 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2676 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2679 } 2727 }
2680} 2728}
2681 2729
2682sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2684 2732
2685 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2686 2734
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2735 $self->enter_link;
2699 2736
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2737 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2706 2739
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2709 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2710 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2711 1; 2761 1
2712 }) { 2762 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2767
2718 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2748 2798
2749=cut 2799=cut
2750 2800
2751# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2753 "c/identify" => { 2809 "c/identify" => {
2754 id => "infobox", 2810 id => "infobox",
2755 title => "Identify", 2811 title => "Identify",
2756 reply => undef, 2812 reply => undef,
2757 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2759 "c/examine" => { 2815 "c/examine" => {
2760 id => "infobox", 2816 id => "infobox",
2761 title => "Examine", 2817 title => "Examine",
2762 reply => undef, 2818 reply => undef,
2763 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2826 },
2765 "c/book" => { 2827 "c/book" => {
2766 id => "infobox", 2828 id => "infobox",
2767 title => "Book", 2829 title => "Book",
2768 reply => undef, 2830 reply => undef,
2784 id => "infobox", 2846 id => "infobox",
2785 title => "Body Parts", 2847 title => "Body Parts",
2786 reply => undef, 2848 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2788 }, 2850 },
2851 "c/statistics" => {
2852 id => "infobox",
2853 title => "Statistics",
2854 reply => undef,
2855 tooltip => "Shows your primary statistics",
2856 },
2857 "c/skills" => {
2858 id => "infobox",
2859 title => "Skills",
2860 reply => undef,
2861 tooltip => "Shows your experience per skill and item power",
2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2869 "c/resistances" => {
2870 id => "infobox",
2871 title => "Resistances",
2872 reply => undef,
2873 tooltip => "Shows your resistances",
2874 },
2875 "c/pets" => {
2876 id => "infobox",
2877 title => "Pets",
2878 reply => undef,
2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2886 },
2789 "c/uptime" => { 2887 "c/uptime" => {
2790 id => "infobox", 2888 id => "infobox",
2791 title => "Uptime", 2889 title => "Uptime",
2792 reply => undef, 2890 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2894 id => "infobox",
2797 title => "Map Info", 2895 title => "Map Info",
2798 reply => undef, 2896 reply => undef,
2799 tooltip => "Information related to the maps", 2897 tooltip => "Information related to the maps",
2800 }, 2898 },
2899 "c/party" => {
2900 id => "party",
2901 title => "Party",
2902 reply => "gsay ",
2903 tooltip => "Messages and chat related to your party",
2904 },
2905 "c/death" => {
2906 id => "death",
2907 title => "Death",
2908 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death",
2910 },
2911 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL,
2801); 2913);
2802 2914
2803sub cf::client::send_msg { 2915sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2917
2806 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2807 2920
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2922
2810 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2813 2926
2814 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2818 2929
2819 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2935 }
2826 2936
2827 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2828 } 2938 }
2829 2939
2830 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2831 2941
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2942 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2836 2945
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2949 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 2950
2851 $color &= cf::NDI_COLOR_MASK; 2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2852 2954
2853 utf8::encode $msg; 2955 # split very large packets
2854 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2855 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 # COMMAND/INFO 2958 $pkt = "frag";
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 } 2959 }
2960
2961 $self->send_packet ($pkt);
2864} 2962}
2865 2963
2866=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2867 2965
2868Sends an ext event to the client. 2966Sends an ext event to the client.
3042 3140
3043The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3044 3142
3045 cf::object 3143 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3144 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3145 insert remove name archname title slaying race decrease split
3146 value
3048 3147
3049 cf::object::player 3148 cf::object::player
3050 player 3149 player
3051 3150
3052 cf::player 3151 cf::player
3057 3156
3058=cut 3157=cut
3059 3158
3060for ( 3159for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3160 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3067) { 3166) {
3068 no strict 'refs'; 3167 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3087 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3088 3187
3089 my $qcode = $code; 3188 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3092 3193
3093 local $_; 3194 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3095 3196
3096 my $eval = 3197 my $eval =
3276 while (my ($k, $v) = each %$want) { 3377 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3378 $ns->fx_want ($k, $v);
3278 } 3379 }
3279}; 3380};
3280 3381
3382sub load_resource_file($) {
3383 my $guard = lock_acquire "load_resource_file";
3384
3385 my $status = load_resource_file_ $_[0];
3386 get_slot 0.1, 100;
3387 cf::arch::commit_load;
3388
3389 $status
3390}
3391
3281sub reload_regions { 3392sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3393 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3394 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3395 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3396
3298} 3409}
3299 3410
3300sub reload_archetypes { 3411sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3412 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3413 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3414}
3309 3415
3310sub reload_treasures { 3416sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3417 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3418 or die "unable to load treasurelists\n";
3313} 3419}
3314 3420
3315sub reload_resources { 3421sub reload_resources {
3316 warn "reloading resource files...\n"; 3422 warn "reloading resource files...\n";
3317 3423
3424 reload_facedata;
3425 reload_archetypes;
3318 reload_regions; 3426 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3427 reload_treasures;
3323 3428
3324 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3325} 3430}
3326 3431
3327sub init {
3328 reload_resources;
3329}
3330
3331sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3436 or return;
3334 3437
3335 local $/; 3438 local $/;
3336 *CFG = YAML::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3337 3440
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3339 3442
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3345 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3346 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3347 }; 3450 };
3348 warn $@ if $@; 3451 warn $@ if $@;
3349 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3455}
3456
3457sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!";
3460 flock $fh, &Fcntl::LOCK_EX
3461 or die "$PIDFILE: flock: $!";
3462 $fh
3463}
3464
3465# make sure only one server instance is running at any one time
3466sub atomic {
3467 my $fh = pidfile;
3468
3469 my $pid = <$fh>;
3470 kill 9, $pid if $pid > 0;
3471
3472 seek $fh, 0, 0;
3473 print $fh $$;
3474}
3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3350} 3483}
3351 3484
3352sub main { 3485sub main {
3486 cf::init_globals; # initialise logging
3487
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499
3353 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3503 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3360 }; 3507 };
3361 3508
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3509 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3510
3511 cf::sync_job {
3512 reload_resources;
3513 reload_config;
3514 db_init;
3515
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid;
3519 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills;
3522
3523 cf::init_beforeplay;
3524
3525 atomic;
3526
3527 load_extensions;
3528
3529 utime time, time, $RUNTIMEFILE;
3530
3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534
3535 (pop @POST_INIT)->(0) while @POST_INIT;
3536 };
3537
3538 main_loop;
3369} 3539}
3370 3540
3371############################################################################# 3541#############################################################################
3372# initialisation and cleanup 3542# initialisation and cleanup
3373 3543
3379 cf::cleanup "SIG$signal"; 3549 cf::cleanup "SIG$signal";
3380 }; 3550 };
3381 } 3551 }
3382} 3552}
3383 3553
3384sub write_runtime { 3554sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3389 3557
3390 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3559
3392 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3393 3561
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3563 or return;
3396 3564
3397 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3410 3578
3411 close $fh 3579 close $fh
3412 or return; 3580 or return;
3413 3581
3414 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3583 and return;
3416 3584
3417 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3418 3586
3419 1 3587 1
3588}
3589
3590our $uuid_lock;
3591our $uuid_skip;
3592
3593sub write_uuid_sync($) {
3594 $uuid_skip ||= $_[0];
3595
3596 return if $uuid_lock;
3597 local $uuid_lock = 1;
3598
3599 my $uuid = "$LOCALDIR/uuid";
3600
3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3602 or return;
3603
3604 my $value = uuid_seq uuid_cur;
3605
3606 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n";
3608 return;
3609 }
3610
3611 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0;
3613
3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3615 and return;
3616
3617 # always fsync - this file is important
3618 aio_fsync $fh
3619 and return;
3620
3621 close $fh
3622 or return;
3623
3624 aio_rename "$uuid~", $uuid
3625 and return;
3626
3627 warn "uuid file written ($value).\n";
3628
3629 1
3630
3631}
3632
3633sub write_uuid($$) {
3634 my ($skip, $sync) = @_;
3635
3636 $sync ? write_uuid_sync $skip
3637 : async { write_uuid_sync $skip };
3420} 3638}
3421 3639
3422sub emergency_save() { 3640sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3424 3642
3425 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3426 3644
3427 cf::sync_job { 3645 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650
3428 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3657 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3659 $pl->save;
3437 } 3660 }
3438 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3439 3662
3440 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3666 $map->valid or next;
3444 $map->save; 3667 $map->save;
3445 } 3668 }
3446 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3447 3670
3448 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3674
3675 warn "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n";
3451 }; 3678 };
3452 3679
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3453 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3454} 3686}
3455 3687
3456sub post_cleanup { 3688sub post_cleanup {
3457 my ($make_core) = @_; 3689 my ($make_core) = @_;
3458 3690
3459 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3692 if $make_core;
3693
3694 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$;
3696}
3697
3698# a safer delete_package, copied from Symbol
3699sub clear_package($) {
3700 my $pkg = shift;
3701
3702 # expand to full symbol table name if needed
3703 unless ($pkg =~ /^main::.*::$/) {
3704 $pkg = "main$pkg" if $pkg =~ /^::/;
3705 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3706 $pkg .= '::' unless $pkg =~ /::$/;
3707 }
3708
3709 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3710 my $stem_symtab = *{$stem}{HASH};
3711
3712 defined $stem_symtab and exists $stem_symtab->{$leaf}
3713 or return;
3714
3715 # clear all symbols
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 }
3721 warn "cleared package $pkg\n";#d#
3461} 3722}
3462 3723
3463sub do_reload_perl() { 3724sub do_reload_perl() {
3464 # can/must only be called in main 3725 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3467 return; 3728 return;
3468 } 3729 }
3469 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3470 warn "reloading..."; 3736 warn "reloading...";
3471 3737
3472 warn "entering sync_job"; 3738 warn "entering sync_job";
3473 3739
3474 cf::sync_job { 3740 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3742 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3478 3744
3479 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3747
3482 # if anything goes wrong in here, we should simply crash as we already saved 3748 # if anything goes wrong in here, we should simply crash as we already saved
3483 3749
3484 warn "flushing outstanding aio requests"; 3750 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3753 }
3516 3754
3517 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3519 } 3757 %EXT_CORO = ();
3520 3758
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3769
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3532 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3533 } 3779 }
3534 3780
3535 Symbol::delete_package $k; 3781 warn "unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784
3785 warn "... unloading $k";
3786 delete $INC{$k};
3787
3788 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g;
3790
3791 if (my $cb = $k->can ("unload_module")) {
3792 $cb->();
3793 }
3794
3795 clear_package $k;
3536 } 3796 }
3537 3797
3538 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3801
3542 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3805
3546 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3807 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3549 3809
3550 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3551 3811
3552 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3553 require cf; 3813 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3555 3815
3556 warn "loading config and database again"; 3816 warn "loading config and database again";
3557 cf::reload_config; 3817 cf::reload_config;
3558 3818
3559 warn "loading extensions"; 3819 warn "loading extensions";
3560 cf::load_extensions; 3820 cf::load_extensions;
3561 3821
3822 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3568 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3569 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3570 3835
3571 1 3836 1
3572 } or do { 3837 } or do {
3573 warn $@; 3838 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3575 }; 3840 };
3576 3841
3577 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3578}; 3848};
3579 3849
3580our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3581 3851
3582sub reload_perl() { 3852sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3585 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3860 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3862 };
3589 }; 3863 };
3590} 3864}
3591 3865
3592register_command "reload" => sub { 3866register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3607 3881
3608our @WAIT_FOR_TICK; 3882our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3883our @WAIT_FOR_TICK_BEGIN;
3610 3884
3611sub wait_for_tick { 3885sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3886 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3887
3615 my $signal = new Coro::Signal; 3888 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3889 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3890 $signal->wait;
3618} 3891}
3619 3892
3620sub wait_for_tick_begin { 3893sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3894 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3895
3624 my $signal = new Coro::Signal; 3896 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3897 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3898 $signal->wait;
3627} 3899}
3637 3909
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3910 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3912 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3913 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3914 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3915 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3916 };
3645 } 3917 }
3646 3918
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3938{
3667 # configure BDB 3939 # configure BDB
3668 3940
3669 BDB::min_parallel 8; 3941 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3942 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3943 $AnyEvent::BDB::WATCHER->priority (1);
3672 3944
3673 unless ($DB_ENV) { 3945 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3946 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3948 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3949 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3951 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3952
3680 cf::sync_job { 3953 cf::sync_job {
3681 eval { 3954 eval {
3707{ 3980{
3708 # configure IO::AIO 3981 # configure IO::AIO
3709 3982
3710 IO::AIO::min_parallel 8; 3983 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3984 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3985 undef $AnyEvent::AIO::WATCHER;
3713} 3986}
3714 3987
3715my $_log_backtrace; 3988my $_log_backtrace;
3716 3989
3717sub _log_backtrace { 3990sub _log_backtrace {
3720 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3721 3994
3722 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3725 async { 3999 async {
3726 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3727 4001
3728 my @bt = fork_call { 4002 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4014 }
3741 4015
3742 @funcs 4016 @funcs
3743 }; 4017 };
3744 4018
3745 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4022 --$_log_backtrace;
3748 }; 4023 };
3749 } else { 4024 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 4027 }
3753} 4028}
3754 4029
3755# load additional modules 4030# load additional modules
3756use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3757 4033
3758END { cf::emergency_save } 4034END { cf::emergency_save }
3759 4035
37601 40361
3761 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines