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.399 by root, Sun Dec 16 02:50:33 2007 UTC vs.
Revision 1.544 by root, Thu May 6 21:58:07 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines