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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines