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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.402 by root, Mon Dec 17 07:03:32 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines