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.400 by root, Mon Dec 17 06:36:34 2007 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines