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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 75
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
71our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
72 118
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 121our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
85 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
90our $NOW; 135our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
165from wherever your confdir points to. 233from wherever your confdir points to.
166 234
167=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
168 236
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
170returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
173=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
174 247
175This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 250that call.
178 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
179=back 258=back
180 259
181=cut 260=cut
182 261
183BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 269 my $msg = join "", @_;
186 270
187 $msg .= "\n" 271 $msg .= "\n"
188 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
189 273
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 275
192 LOG llevError, $msg; 276 LOG llevWarn, $msg;
193 }; 277};
194}
195 278
196$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
197 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
198 Coro::terminate; 290 Coro::terminate
199}; 291};
200 292
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 303for my $pkg (qw(
212 cf::global cf::attachable 304 cf::global cf::attachable
213 cf::object cf::object::player 305 cf::object cf::object::player
214 cf::client cf::player 306 cf::client cf::player
215 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
216 cf::map cf::party cf::region 309 cf::party cf::region
217)) { 310)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 312}
221 313
222$EV::DIED = sub { 314$EV::DIED = sub {
223 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
224}; 316};
225 317
226############################################################################# 318#############################################################################
227 319
228=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266 358
267sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
269 361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
270=item cf::lock_wait $string 376=item cf::lock_wait $string
271 377
272Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
273 379
274=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
275 381
276Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
277a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
278for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
279returned. 385returned.
280 386
281Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro. 388deadlocked coro.
288 394
289Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
290 396
291=cut 397=cut
292 398
293our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 400
296sub lock_wait($) { 401sub lock_wait($) {
297 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 403}
310 404
311sub lock_acquire($) { 405sub lock_acquire($) {
312 my ($key) = @_; 406 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 407}
326 408
327sub lock_active($) { 409sub lock_active($) {
328 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 411}
332 412
333sub freeze_mainloop { 413sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
335 415
336 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 417}
342 418
343=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
344 420
345Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer. 422get spread over time.
347 423
348=cut 424=cut
349 425
350sub periodic($$) { 426sub periodic($$) {
351 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
368 444
369=cut 445=cut
370 446
371our @SLOT_QUEUE; 447our @SLOT_QUEUE;
372our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
373 450
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
377 454
378 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
379 457
380 while () { 458 while () {
381 next_job: 459 next_job:
460
382 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 462
384 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 467 $job->[2]->send;
388 Coro::cede; 468 Coro::cede;
389 goto next_job; 469 goto next_job;
390 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 472 }
392 } 473 }
393 474
394 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait; 478 $signal->wait;
398 } else { 479 } else {
480 $busy = 0;
399 Coro::schedule; 481 Coro::schedule;
400 } 482 }
401 } 483 }
402}; 484};
403 485
404sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
405 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
406 490
407 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
408 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
409 494
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
438=cut 523=cut
439 524
440sub sync_job(&) { 525sub sync_job(&) {
441 my ($job) = @_; 526 my ($job) = @_;
442 527
443 if ($Coro::current == $Coro::main) { 528 if (in_main) {
444 my $time = EV::time; 529 my $time = AE::time;
445 530
446 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
448 533
449 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
450 535
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
454 537
455 my $busy = 1; 538 my $busy = 1;
456 my @res; 539 my @res;
457 540
458 (async { 541 (async {
459 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 543 @res = eval { $job->() };
461 warn $@ if $@; 544 error $@ if $@;
462 undef $busy; 545 undef $busy;
463 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
464 547
465 while ($busy) { 548 while ($busy) {
466 if (Coro::nready) { 549 if (Coro::nready) {
468 } else { 551 } else {
469 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
470 } 553 }
471 } 554 }
472 555
473 $time = EV::time - $time; 556 my $time = AE::time - $time;
474 557
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
479 559
480 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
481 } else { 561 } else {
482 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
483 563
512Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling. 593never block itself or use any form of event handling.
514 594
515=cut 595=cut
516 596
597sub post_fork {
598 reset_signals;
599}
600
517sub fork_call(&@) { 601sub fork_call(&@) {
518 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
519 603
520 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
521 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
523 607
524 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
525 reset_signals; 609 cf::post_fork;
526 &$cb 610 &$cb
527 }, @args; 611 }, @args;
528 612
529 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
530} 614}
531 615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
532=item $value = cf::db_get $family => $key 654=item $value = cf::db_get $family => $key
533 655
534Returns a single value from the environment database. 656Returns a single value from the environment database.
535 657
536=item cf::db_put $family => $key => $value 658=item cf::db_put $family => $key => $value
544within each server. 666within each server.
545 667
546=cut 668=cut
547 669
548sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
549 my ($name) = @_; 674 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
551 676
552 eval { 677 eval {
553 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
563} 688}
564 689
565our $DB; 690our $DB;
566 691
567sub db_init { 692sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
570 };
571} 694}
572 695
573sub db_get($$) { 696sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
575 698
576 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
577 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
578 703
579 $! ? () 704 $! ? ()
580 : $data 705 : $data
581 }
582} 706}
583 707
584sub db_put($$$) { 708sub db_put($$$) {
585 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
642 766
643 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data); 768 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
646 770
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 772
649 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
652 776
662 786
663=cut 787=cut
664 788
665sub datalog($@) { 789sub datalog($@) {
666 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 792}
669 793
670=back 794=back
671 795
672=cut 796=cut
673 797
674############################################################################# 798#############################################################################
675 799
676=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
677 801
678Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
679attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
681 805
682In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
683C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
733=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
734 858
735Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
737 861
738Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
739that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
740 864
741These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
742 866
743=over 4 867=over 4
867 991
868 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 994
871 } elsif (ref $type) { 995 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
873 997
874 } else { 998 } else {
875 shift @arg; 999 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
877 } 1001 }
878 } 1002 }
879} 1003}
880 1004
881sub _object_attach { 1005sub _object_attach {
891 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
892 } 1016 }
893 1017
894 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
895 } else { 1019 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1021 }
898 1022
899 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
900} 1024}
901 1025
960 1084
961 for (@$callbacks) { 1085 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
963 1087
964 if ($@) { 1088 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1090 override;
968 } 1091 }
969 1092
970 return 1 if $override; 1093 return 1 if $override;
971 } 1094 }
1034 1157
1035sub reattach { 1158sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1160 my ($obj) = @_;
1038 1161
1162 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1164
1041 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1042 1166
1043 @$registry = (); 1167 @$registry = ();
1044 1168
1049 for (@$attach) { 1173 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1052 } 1176 }
1053 } else { 1177 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1179 }
1056 } 1180 }
1057} 1181}
1058 1182
1059cf::attachable->attach ( 1183cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1087 1211
1088 sync_job { 1212 sync_job {
1089 if (length $$rdata) { 1213 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1093 1218
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1098 close $fh; 1226 aio_close $fh;
1099 1227
1100 if (@$objs) { 1228 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1106 close $fh; 1237 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1239 }
1109 } else { 1240 } else {
1110 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1111 } 1242 }
1112 1243
1113 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1248 } else {
1115 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1116 } 1250 }
1117 } else { 1251 } else {
1118 aio_unlink $filename; 1252 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1120 } 1254 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1279 $av = $st->{objs};
1146 } 1280 }
1147 1281
1148 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1151 1286
1152 ($data, $av) 1287 ($data, $av)
1153} 1288}
1154 1289
1155=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1211 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1212 1347
1213 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1214} 1349}
1215 1350
1351use File::Glob ();
1352
1216cf::player->attach ( 1353cf::player->attach (
1217 on_command => sub { 1354 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1219 1356
1220 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1221 or return; 1358 or return;
1222 1359
1245 1382
1246 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1247 if $reply; 1384 if $reply;
1248 1385
1249 } else { 1386 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1388 }
1252 1389
1253 cf::override; 1390 cf::override;
1254 }, 1391 },
1255); 1392);
1256 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1257sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1258 cf::sync_job { 1410 cf::sync_job {
1259 my %todo; 1411 my %todo;
1260 1412
1261 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1414 next unless -r $path;
1280 1432
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1435
1284 $ext{source} = 1436 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1287 . $source 1439 . $source
1288 . "\n};\n1"; 1440 . "\n};\n1";
1289 1441
1290 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1291 } 1443 }
1292 1444
1445 my $pass = 0;
1293 my %done; 1446 my %done;
1294 while (%todo) { 1447 while (%todo) {
1295 my $progress; 1448 my $progress;
1296 1449
1450 ++$pass;
1451
1452 ext:
1297 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1455 next ext
1300 unless exists $done{$_}; 1456 unless exists $done{$_};
1301 } 1457 }
1302 1458
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1460
1305 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1465
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1467 if exists $v->{meta}{mandatory};
1310 warn $msg; 1468
1311 warn "mandatory extension failed to load, exiting.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1470 delete $todo{$k};
1313 } 1471 } else {
1314 1472 $done{$k} = delete $todo{$k};
1315 warn $msg; 1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1316 } 1478 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1479 }
1322 1480
1323 skip: 1481 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1326 } 1489 }
1327 }; 1490 };
1328} 1491}
1329 1492
1330############################################################################# 1493#############################################################################
1331 1494
1332=back 1495=back
1333 1496
1334=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1335 1498
1336Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1337 1500
1338=cut 1501=cut
1339 1502
1340package cf::player; 1503package cf::player;
1341 1504
1384 1547
1385sub exists($) { 1548sub exists($) {
1386 my ($login) = @_; 1549 my ($login) = @_;
1387 1550
1388 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1390} 1553}
1391 1554
1392sub find($) { 1555sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1557 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1570 or return;
1408 1571
1409 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1410 or return; 1573 or return;
1574
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1414 } 1578 }
1415 } 1579 }
1416} 1580}
1417 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1418sub save($) { 1595sub save($) {
1419 my ($pl) = @_; 1596 my ($pl) = @_;
1420 1597
1421 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1422 1599
1425 1602
1426 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1427 1604
1428 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1612
1431 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1614 cf::cede_to_tick;
1433} 1615}
1434 1616
1466 my ($pl) = @_; 1648 my ($pl) = @_;
1467 1649
1468 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1469 1651
1470 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1654
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1477 1663
1478 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1704
1519 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1520 my $path = path $login; 1706 my $path = path $login;
1521 1707
1522 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1714 }
1528 1715
1532 1719
1533 \@logins 1720 \@logins
1534} 1721}
1535 1722
1536=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1537 1726
1538Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1539player. May block. 1728player. May block.
1540 1729
1541=cut 1730=cut
1559 } 1748 }
1560 1749
1561 \@paths 1750 \@paths
1562} 1751}
1563 1752
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1754
1566Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1756
1657=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1658 1758
1659Sends an ext reply to the player. 1759Sends an ext reply to the player.
1660 1760
1692 1792
1693=cut 1793=cut
1694 1794
1695sub find_by_path($) { 1795sub find_by_path($) {
1696 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1697 1799
1698 my ($match, $specificity); 1800 my ($match, $specificity);
1699 1801
1700 for my $region (list) { 1802 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1729 1831
1730sub generate_random_map { 1832sub generate_random_map {
1731 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1732 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1838 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1755 1860
1756sub register { 1861sub register {
1757 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1863 my $pkg = caller;
1759 1864
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1866
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1868}
1765 1869
1766# also paths starting with '/' 1870# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1872
1769sub thawer_merge { 1873sub thawer_merge {
1770 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1771 1875
1772 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1777} 1881}
1778 1882
1779sub normalise { 1883sub normalise {
1780 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1781 1885
1782 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1783 1887
1784 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1785 1889
1786 # map plan: 1890 # map plan:
1787 # 1891 #
1826 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1827 return $self; 1931 return $self;
1828 } 1932 }
1829 } 1933 }
1830 1934
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1936 ()
1833} 1937}
1834 1938
1835sub init { 1939sub init {
1836 my ($self) = @_; 1940 my ($self) = @_;
1858 1962
1859# the temporary/swap location 1963# the temporary/swap location
1860sub save_path { 1964sub save_path {
1861 my ($self) = @_; 1965 my ($self) = @_;
1862 1966
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1865} 1969}
1866 1970
1867# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1868sub uniq_path { 1972sub uniq_path {
1869 my ($self) = @_; 1973 my ($self) = @_;
1870 1974
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 1977}
1883 1978
1884sub decay_objects { 1979sub decay_objects {
1885 my ($self) = @_; 1980 my ($self) = @_;
1886 1981
1968 2063
1969sub find; 2064sub find;
1970sub find { 2065sub find {
1971 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1972 2067
2068 cf::cede_to_tick;
2069
1973 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1974 2071
1975 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2074
1978 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1983 or return; 2077 or return;
1984 2078
1985 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1986 2080
1988 or return; 2082 or return;
1989 2083
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
1993 undef $guard1; 2088 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2089 $map->reset;
1996 return find $path; 2090 return find $path;
1997 } 2091 }
1998 2092
1999 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
2000 } 2094 }
2001} 2095}
2002 2096
2003sub pre_load { } 2097sub pre_load { }
2004sub post_load { } 2098#sub post_load { } # XS
2005 2099
2006sub load { 2100sub load {
2007 my ($self) = @_; 2101 my ($self) = @_;
2008 2102
2009 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2121 $f->skip_block;
2028 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
2029 or return; 2123 or return;
2030 2124
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
2032 if delete $self->{load_original}; 2126 if delete $self->{load_original};
2033 2127
2034 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2129 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2149 $self->decay_objects;
2056 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
2057 $self->update_buttons; 2151 $self->update_buttons;
2058 cf::cede_to_tick; 2152 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2153 $self->activate;
2062 } 2154 }
2063 2155
2064 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2066 2158
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2160 }
2069 2161
2070 $self->post_load; 2162 $self->post_load;
2071} 2163}
2072 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2073sub customise_for { 2168sub customise_for {
2074 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2075 2170
2076 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2172 if $self->per_player;
2093 or next; 2188 or next;
2094 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2095 or next; 2190 or next;
2096 $neigh->load; 2191 $neigh->load;
2097 2192
2193 # now find the diagonal neighbours
2098 push @neigh, 2194 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2197 }
2102 2198
2109} 2205}
2110 2206
2111sub find_sync { 2207sub find_sync {
2112 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2113 2209
2114 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2115} 2214}
2116 2215
2117sub do_load_sync { 2216sub do_load_sync {
2118 my ($map) = @_; 2217 my ($map) = @_;
2119 2218
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2122 2221
2123 cf::sync_job { $map->load }; 2222 $map->load;
2124} 2223}
2125 2224
2126our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2128 2227
2130 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
2131 2230
2132 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
2133 2232
2134 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2235 }
2137 2236
2138 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
2139 2238
2140 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2155 2254
2156 () 2255 ()
2157} 2256}
2158 2257
2258# common code, used by both ->save and ->swapout
2159sub save { 2259sub _save {
2160 my ($self) = @_; 2260 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2261
2164 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2165 2263
2166 return unless $self->dirty; 2264 return unless $self->dirty;
2167 2265
2176 2274
2177 cf::async { 2275 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2276 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2180 }; 2278 };
2279
2280 cf::get_slot 0.02;
2181 2281
2182 if ($uniq) { 2282 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2285 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2287 }
2188} 2288}
2189 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2190sub swap_out { 2298sub swap_out {
2191 my ($self) = @_; 2299 my ($self) = @_;
2192 2300
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2198 return if $self->players; 2305 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2203 2357
2204 $self->deactivate; 2358 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2360 $self->clear;
2207}
2208
2209sub reset_at {
2210 my ($self) = @_;
2211
2212 # TODO: safety, remove and allow resettable per-player maps
2213 return 1e99 if $self->{deny_reset};
2214
2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2217
2218 $time + $to
2219}
2220
2221sub should_reset {
2222 my ($self) = @_;
2223
2224 $self->reset_at <= $cf::RUNTIME
2225}
2226
2227sub reset {
2228 my ($self) = @_;
2229
2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231
2232 return if $self->players;
2233
2234 warn "resetting map ", $self->path;
2235
2236 $self->in_memory (cf::MAP_SWAPPED);
2237
2238 # need to save uniques path
2239 unless ($self->{deny_save}) {
2240 my $uniq = $self->uniq_path; utf8::encode $uniq;
2241
2242 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2243 if $uniq;
2244 }
2245
2246 delete $cf::MAP{$self->path};
2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->clear;
2251 2361
2252 $self->unlink_save; 2362 $self->unlink_save;
2253 $self->destroy; 2363 $self->destroy;
2254} 2364}
2255 2365
2263 2373
2264 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2265 2375
2266 $self->unlink_save; 2376 $self->unlink_save;
2267 2377
2268 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2383
2322 2432
2323sub unique_maps() { 2433sub unique_maps() {
2324 [ 2434 [
2325 map { 2435 map {
2326 utf8::decode $_; 2436 utf8::decode $_;
2327 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2328 ? normalise $_ 2440 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2442 ]
2332} 2443}
2333 2444
2334package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2335 2476
2336=back 2477=back
2337 2478
2338=head3 cf::object 2479=head3 cf::object
2339 2480
2343 2484
2344=over 4 2485=over 4
2345 2486
2346=item $ob->inv_recursive 2487=item $ob->inv_recursive
2347 2488
2348Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
2349 2491
2350=cut 2492=cut
2351 2493
2352sub inv_recursive_; 2494sub inv_recursive_;
2353sub inv_recursive_ { 2495sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2359} 2501}
2360 2502
2361=item $ref = $ob->ref 2503=item $ref = $ob->ref
2362 2504
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2505Creates and returns a persistent reference to an object that can be stored as a string.
2364 2506
2365=item $ob = cf::object::deref ($refstring) 2507=item $ob = cf::object::deref ($refstring)
2366 2508
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2510even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2543dialogue with the given NPC character.
2402 2544
2403=cut 2545=cut
2404 2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2560
2405# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2562# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2578
2423 } else { 2579 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2582 }
2427 } 2583 }
2428} 2584}
2429 2585
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2611
2456=item $player_object->enter_link 2612=item $player_object->enter_link
2457 2613
2458Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2459 2615
2460The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2462 2620
2463Will never block. 2621Will never block.
2464 2622
2465=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2466 2624
2486sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2487 my ($self) = @_; 2645 my ($self) = @_;
2488 2646
2489 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2490 2648
2649 ++$self->{_link_recursion};
2650
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2652
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2495 2655
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2657}
2498 2658
2499sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2501 2661
2518 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2520 2680
2521 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2524 2684
2525 $map->load; 2685 $map->load;
2526 $map->load_neighbours; 2686 $map->load_neighbours;
2527 2687
2528 return unless $self->contr->active; 2688 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2689
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2533} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2534 2697
2698}
2699
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2701
2537Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2706be called at the end of this process.
2542 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2543=cut 2711=cut
2544 2712
2545our $GOTOGEN; 2713our $GOTOGEN;
2546 2714
2547sub cf::object::player::goto { 2715sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2549 2723
2550 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2726
2553 $self->enter_link; 2727 $self->enter_link;
2577 my $map = eval { 2751 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2579 2753
2580 if ($map) { 2754 if ($map) {
2581 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2757 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2759 }
2586 2760
2587 $map 2761 $map
2595 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2598 } 2772 }
2599 2773
2600 $done->() if $done; 2774 $done->($self) if $done;
2601 })->prio (1); 2775 })->prio (1);
2602} 2776}
2603 2777
2604=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2605 2779
2625} 2799}
2626 2800
2627sub prepare_random_map { 2801sub prepare_random_map {
2628 my ($exit) = @_; 2802 my ($exit) = @_;
2629 2803
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2806 # that depends on the exit object
2635 2807
2636 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2810 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2643 } 2817 }
2644 2818
2645 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2646 2820
2647 my $data = cf::encode_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2650 2824
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2827 undef $fh;
2654 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2655 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2658 } 2836 }
2659} 2837}
2660 2838
2661sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2663 2841
2664 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2665 2843
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2844 $self->enter_link;
2678 2845
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2846 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2847 $Coro::current->{desc} = "enter_exit";
2685 2848
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2688 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2689 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2690 1; 2870 1
2691 }) { 2871 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2876
2697 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2878 $self->leave_link;
2699 } 2879 }
2700 })->prio (1); 2880 })->prio (1);
2701} 2881}
2702 2882
2714sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2716 2896
2717 utf8::encode $text; 2897 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2719} 2924}
2720 2925
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2927
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2932
2728=cut 2933=cut
2729 2934
2730# non-persistent channels (usually the info channel) 2935# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2732 "c/identify" => { 2943 "c/identify" => {
2733 id => "infobox", 2944 id => "infobox",
2734 title => "Identify", 2945 title => "Identify",
2735 reply => undef, 2946 reply => undef,
2736 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2738 "c/examine" => { 2949 "c/examine" => {
2739 id => "infobox", 2950 id => "infobox",
2740 title => "Examine", 2951 title => "Examine",
2741 reply => undef, 2952 reply => undef,
2742 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2960 },
2744 "c/book" => { 2961 "c/book" => {
2745 id => "infobox", 2962 id => "infobox",
2746 title => "Book", 2963 title => "Book",
2747 reply => undef, 2964 reply => undef,
2763 id => "infobox", 2980 id => "infobox",
2764 title => "Body Parts", 2981 title => "Body Parts",
2765 reply => undef, 2982 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2983 tooltip => "Shows which body parts you posess and are available",
2767 }, 2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
2768 "c/uptime" => { 3021 "c/uptime" => {
2769 id => "infobox", 3022 id => "infobox",
2770 title => "Uptime", 3023 title => "Uptime",
2771 reply => undef, 3024 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3025 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3028 id => "infobox",
2776 title => "Map Info", 3029 title => "Map Info",
2777 reply => undef, 3030 reply => undef,
2778 tooltip => "Information related to the maps", 3031 tooltip => "Information related to the maps",
2779 }, 3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2780); 3047);
2781 3048
2782sub cf::client::send_msg { 3049sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3051
2785 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2786 3054
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3056
2789 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2792 3060
2793 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2797 3063
2798 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3069 }
2805 3070
2806 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2807 } 3072 }
2808 3073
2809 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2810 3075
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3076 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2815 3079
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3083 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 3084
2830 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 3086}
2844 3087
2845=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2846 3089
2847Sends an ext event to the client. 3090Sends an ext event to the client.
2850 3093
2851sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2853 3096
2854 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3102 }
2860} 3103}
2861 3104
2862=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2863 3106
2867 3110
2868sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2870 3113
2871 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3117 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3120 }
2878} 3121}
2879 3122
2880=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2881 3124
2952 3195
2953 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3197 if $reply;
2955 3198
2956 } else { 3199 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3201 }
2959 3202
2960 cf::override; 3203 cf::override;
2961 }, 3204 },
2962); 3205);
2982 3225
2983 $coro 3226 $coro
2984} 3227}
2985 3228
2986cf::client->attach ( 3229cf::client->attach (
2987 on_destroy => sub { 3230 on_client_destroy => sub {
2988 my ($ns) = @_; 3231 my ($ns) = @_;
2989 3232
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3234 },
2992); 3235);
3008our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
3009 3252
3010$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
3011 3254
3012$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
3015 sort time 3258 sort time
3016)); 3259));
3017 3260
3018# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
3021 3264
3022The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
3023 3266
3024 cf::object 3267 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
3027 3271
3028 cf::object::player 3272 cf::object::player
3029 player 3273 player
3030 3274
3031 cf::player 3275 cf::player
3036 3280
3037=cut 3281=cut
3038 3282
3039for ( 3283for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3046) { 3290) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3293 for @funs;
3051} 3294}
3052 3295
3067 3310
3068 my $qcode = $code; 3311 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
3071 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
3072 local $_; 3318 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3319
3075 my $eval = 3320 my $eval =
3076 "do {\n" 3321 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3324 . $code
3080 . "\n}" 3325 . "\n}"
3081 ; 3326 ;
3082 3327
3328 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3086 3337
3087 if ($@) { 3338 if ($@) {
3088 warn "$@"; 3339 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3091 } 3342 }
3092 3343
3093 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3094} 3345}
3095 3346
3109=cut 3360=cut
3110 3361
3111sub register_script_function { 3362sub register_script_function {
3112 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3113 3364
3114 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3116} 3367}
3117 3368
3118=back 3369=back
3119 3370
3120=cut 3371=cut
3129 # for this (global event?) 3380 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3382
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3384
3134 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3135 3386
3136 my $facedata;
3137 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3138 or die "$path: $!"; 3388 or die "$path: $!";
3139 3389
3140 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3141 3391
3142 $facedata->{version} == 2 3392 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3394
3145 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3398 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3401 };
3150 cf::cede_to_tick; 3402 cf::cede_to_tick;
3151 3403
3152 { 3404 {
3153 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3409
3158 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3414
3163 cf::cede_to_tick; 3415 cf::cede_to_tick;
3164 } 3416 }
3165 3417
3166 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3171 3423
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3427 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3429 }
3178 3430
3179 cf::cede_to_tick; 3431 cf::cede_to_tick;
3180 } 3432 }
3181 } 3433 }
3190 3442
3191 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3192 } 3444 }
3193 3445
3194 { 3446 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3198 3448
3199 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3450 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3452
3204 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3219 } else { 3455 } else {
3220 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3221 } 3457 }
3222 3458
3223 cf::cede_to_tick; 3459 cf::cede_to_tick;
3224 } 3460 }
3225 } 3461 }
3226 3462
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3464
3229 1 3465 1
3230} 3466}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251 3467
3252register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3254 3470
3255 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3257 } 3473 }
3258}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3259 3485
3260sub reload_regions { 3486sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3488 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3503}
3278 3504
3279sub reload_archetypes { 3505sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3508}
3288 3509
3289sub reload_treasures { 3510sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3292} 3513}
3293 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3294sub reload_resources { 3538sub reload_resources {
3295 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3296 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3297 reload_regions; 3546 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3547 reload_treasures;
3302 3548
3303 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3550}
3309 3551
3310sub reload_config { 3552sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3312 or return;
3313 3554
3314 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3315 *CFG = YAML::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3316 3562
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3564
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3567
3322 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3326 }; 3572 };
3327 warn $@ if $@; 3573 warn $@ if $@;
3328 } 3574 }
3329} 3575}
3330 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3331sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3332 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3618 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3620 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3339 }; 3622 };
3340 3623
3624 evthread_start IO::AIO::poll_fileno;
3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3341 reload_config; 3636 reload_config;
3342 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3343 load_extensions; 3647 load_extensions;
3344 3648
3345 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3650
3347 EV::loop; 3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3348} 3667}
3349 3668
3350############################################################################# 3669#############################################################################
3351# initialisation and cleanup 3670# initialisation and cleanup
3352 3671
3353# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3354BEGIN { 3673BEGIN {
3355 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3359 }; 3678 };
3360 } 3679 }
3361} 3680}
3362 3681
3363sub write_runtime { 3682sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3365 3684
3366 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3368 3687
3369 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3689
3371 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3372 3691
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3693 or return;
3375 3694
3376 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3389 3708
3390 close $fh 3709 close $fh
3391 or return; 3710 or return;
3392 3711
3393 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3713 and return;
3395 3714
3396 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3716
3398 1 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
3399} 3768}
3400 3769
3401sub emergency_save() { 3770sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3403 3772
3404 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3405 3779
3406 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3407 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3789 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3791 $pl->save;
3416 } 3792 }
3417 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3418 3794
3419 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3800 $map->valid or next;
3423 $map->save; 3801 $map->save;
3424 } 3802 }
3425 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3426 3804
3427 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3833 };
3431 3834
3432 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3433} 3836}
3434 3837
3435sub post_cleanup { 3838sub post_cleanup {
3436 my ($make_core) = @_; 3839 my ($make_core) = @_;
3437 3840
3841 IO::AIO::flush;
3842
3438 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3440} 3873}
3441 3874
3442sub do_reload_perl() { 3875sub do_reload_perl() {
3443 # can/must only be called in main 3876 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3446 return; 3879 return;
3447 } 3880 }
3448 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3449 warn "reloading..."; 3888 info "reloading...";
3450 3889
3451 warn "entering sync_job"; 3890 trace "entering sync_job";
3452 3891
3453 cf::sync_job { 3892 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3893 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3894
3458 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV;
3460
3461 # if anything goes wrong in here, we should simply crash as we already saved
3462
3463 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs;
3469 warn "iterate...";
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3897 %EXT_CORO = ();
3477 3898
3478 warn "removing commands"; 3899 trace "removing commands";
3479 %COMMAND = (); 3900 %COMMAND = ();
3480 3901
3481 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3482 %EXTCMD = (); 3903 %EXTCMD = ();
3483 %EXTICMD = (); 3904 %EXTICMD = ();
3484 3905
3485 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3488 3909
3489 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3911 eval {
3491 $cb->($pkg); 3912 $cb->($pkg);
3492 1 3913 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3494 } 3919 }
3495 3920
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3924
3504 warn "... unloading $k"; 3925 trace "... unloading $k";
3505 delete $INC{$k}; 3926 delete $INC{$k};
3506 3927
3507 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3509 3930
3510 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3512 } 3936 }
3513 3937
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3941
3521 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3945
3525 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3947 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3528 3949
3529 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3530 3951
3531 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3532 require cf; 3953 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3534 3955
3535 warn "loading config and database again"; 3956 trace "loading config and database again";
3536 cf::reload_config; 3957 cf::reload_config;
3537 3958
3538 warn "loading extensions"; 3959 trace "loading extensions";
3539 cf::load_extensions; 3960 cf::load_extensions;
3540 3961
3962 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3547 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3548 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3549 3975
3550 1 3976 1
3551 } or do { 3977 } or do {
3552 warn $@; 3978 error $@;
3553 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3554 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3555 }; 3984 }
3556 3985
3557 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3558}; 3988};
3559 3989
3560our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3561 3991
3562sub reload_perl() { 3992sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3565 3995
3996 $RELOAD_WATCHER ||= cf::async {
3997 Coro::AIO::aio_wait cache_extensions;
3998
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3567 do_reload_perl; 4000 do_reload_perl;
3568 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
4002 };
3569 }; 4003 };
3570} 4004}
3571 4005
3572register_command "reload" => sub { 4006register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3579 reload_perl; 4013 reload_perl;
3580 }; 4014 };
3581 } 4015 }
3582}; 4016};
3583 4017
3584unshift @INC, $LIBDIR; 4018#############################################################################
3585 4019
3586my $bug_warning = 0; 4020my $bug_warning = 0;
3587 4021
3588our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3590 4024
3591sub wait_for_tick { 4025sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 4027
3595 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 4030 $signal->wait;
3598} 4031}
3599 4032
3600sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 4035
3604 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4038 $signal->wait;
3607} 4039}
3608 4040
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4041sub tick {
3610 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
3613 return; 4045 return;
3614 } 4046 }
3615 4047
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3619 4049
3620 $RUNTIME += $TICK; 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 4051
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4054 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4056 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3629 }; 4058 };
3630 } 4059 }
3631 4060
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4062 $sig->send;
3634 } 4063 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4065 $sig->send;
3637 } 4066 }
3638 4067
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4070
3642 _post_tick; 4071 if (0) {
3643}; 4072 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
4077 }
4078}
3645 4079
3646{ 4080{
3647 # configure BDB 4081 # configure BDB
3648 4082
3649 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3652 4086
3653 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4094
3660 cf::sync_job { 4095 cf::sync_job {
3661 eval { 4096 eval {
3687{ 4122{
3688 # configure IO::AIO 4123 # configure IO::AIO
3689 4124
3690 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4127 undef $AnyEvent::AIO::WATCHER;
3693} 4128}
3694 4129
3695my $_log_backtrace; 4130my $_log_backtrace;
3696 4131
3697sub _log_backtrace { 4132sub _log_backtrace {
3700 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3701 4136
3702 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3705 async { 4141 async {
3706 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3707 4143
3708 my @bt = fork_call { 4144 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4156 }
3721 4157
3722 @funcs 4158 @funcs
3723 }; 4159 };
3724 4160
3725 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4164 --$_log_backtrace;
3728 }; 4165 };
3729 } else { 4166 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4169 }
3733} 4170}
3734 4171
3735# load additional modules 4172# load additional modules
3736use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3737 4175
3738END { cf::emergency_save } 4176END { cf::emergency_save }
3739 4177
37401 41781
3741 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines