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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines