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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines