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.402 by root, Mon Dec 17 07:03:32 2007 UTC vs.
Revision 1.545 by root, Thu May 6 22:35:41 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines