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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines