ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines