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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines