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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 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"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1308 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1310 warn $msg; 1460
1311 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1462 delete $todo{$k};
1313 } 1463 } else {
1314 1464 $done{$k} = delete $todo{$k};
1315 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1316 } 1470 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1471 }
1322 1472
1323 skip: 1473 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1326 } 1481 }
1327 }; 1482 };
1328} 1483}
1329 1484
1330############################################################################# 1485#############################################################################
1331 1486
1332=back 1487=back
1333 1488
1334=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1335 1490
1336Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1337 1492
1338=cut 1493=cut
1339 1494
1340package cf::player; 1495package cf::player;
1341 1496
1384 1539
1385sub exists($) { 1540sub exists($) {
1386 my ($login) = @_; 1541 my ($login) = @_;
1387 1542
1388 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1390} 1545}
1391 1546
1392sub find($) { 1547sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1549 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1562 or return;
1408 1563
1409 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1410 or return; 1565 or return;
1566
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1414 } 1570 }
1415 } 1571 }
1416} 1572}
1417 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1418sub save($) { 1587sub save($) {
1419 my ($pl) = @_; 1588 my ($pl) = @_;
1420 1589
1421 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1422 1591
1425 1594
1426 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1427 1596
1428 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1604
1431 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1606 cf::cede_to_tick;
1433} 1607}
1434 1608
1466 my ($pl) = @_; 1640 my ($pl) = @_;
1467 1641
1468 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1469 1643
1470 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1646
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1477 1652
1478 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1693
1519 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1520 my $path = path $login; 1695 my $path = path $login;
1521 1696
1522 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1703 }
1528 1704
1532 1708
1533 \@logins 1709 \@logins
1534} 1710}
1535 1711
1536=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1537 1715
1538Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1539player. May block. 1717player. May block.
1540 1718
1541=cut 1719=cut
1559 } 1737 }
1560 1738
1561 \@paths 1739 \@paths
1562} 1740}
1563 1741
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1743
1566Expand crossfire pod fragments into protocol xml. 1744Expand 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 1745
1657=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1658 1747
1659Sends an ext reply to the player. 1748Sends an ext reply to the player.
1660 1749
1692 1781
1693=cut 1782=cut
1694 1783
1695sub find_by_path($) { 1784sub find_by_path($) {
1696 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1697 1788
1698 my ($match, $specificity); 1789 my ($match, $specificity);
1699 1790
1700 for my $region (list) { 1791 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1729 1820
1730sub generate_random_map { 1821sub generate_random_map {
1731 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1732 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1827 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1755 1849
1756sub register { 1850sub register {
1757 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1852 my $pkg = caller;
1759 1853
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1855
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1857}
1765 1858
1766# also paths starting with '/' 1859# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1861
1769sub thawer_merge { 1862sub thawer_merge {
1770 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1771 1864
1772 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1858 1951
1859# the temporary/swap location 1952# the temporary/swap location
1860sub save_path { 1953sub save_path {
1861 my ($self) = @_; 1954 my ($self) = @_;
1862 1955
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1865} 1958}
1866 1959
1867# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1868sub uniq_path { 1961sub uniq_path {
1869 my ($self) = @_; 1962 my ($self) = @_;
1870 1963
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1965 "$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} 1966}
1883 1967
1884sub decay_objects { 1968sub decay_objects {
1885 my ($self) = @_; 1969 my ($self) = @_;
1886 1970
1970sub find { 2054sub find {
1971 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1972 2056
1973 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1974 2058
1975 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2061
1978 $cf::MAP{$path} || do { 2062 $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 2063 my $map = new_from_path cf::map $path
1983 or return; 2064 or return;
1984 2065
1985 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1986 2067
1988 or return; 2069 or return;
1989 2070
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1993 undef $guard1; 2075 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2076 $map->reset;
1996 return find $path; 2077 return find $path;
1997 } 2078 }
1998 2079
1999 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2000 } 2081 }
2001} 2082}
2002 2083
2003sub pre_load { } 2084sub pre_load { }
2004sub post_load { } 2085#sub post_load { } # XS
2005 2086
2006sub load { 2087sub load {
2007 my ($self) = @_; 2088 my ($self) = @_;
2008 2089
2009 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2108 $f->skip_block;
2028 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
2029 or return; 2110 or return;
2030 2111
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
2032 if delete $self->{load_original}; 2113 if delete $self->{load_original};
2033 2114
2034 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2116 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2136 $self->decay_objects;
2056 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
2057 $self->update_buttons; 2138 $self->update_buttons;
2058 cf::cede_to_tick; 2139 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2140 $self->activate;
2062 } 2141 }
2063 2142
2064 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
2066 2145
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2147 }
2069 2148
2070 $self->post_load; 2149 $self->post_load;
2071} 2150}
2072 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2073sub customise_for { 2155sub customise_for {
2074 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2075 2157
2076 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2159 if $self->per_player;
2093 or next; 2175 or next;
2094 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2095 or next; 2177 or next;
2096 $neigh->load; 2178 $neigh->load;
2097 2179
2180 # now find the diagonal neighbours
2098 push @neigh, 2181 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2184 }
2102 2185
2109} 2192}
2110 2193
2111sub find_sync { 2194sub find_sync {
2112 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2113 2196
2114 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2115} 2201}
2116 2202
2117sub do_load_sync { 2203sub do_load_sync {
2118 my ($map) = @_; 2204 my ($map) = @_;
2119 2205
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2122 2208
2123 cf::sync_job { $map->load }; 2209 $map->load;
2124} 2210}
2125 2211
2126our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2128 2214
2130 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2131 2217
2132 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2133 2219
2134 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2222 }
2137 2223
2138 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2139 2225
2140 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2155 2241
2156 () 2242 ()
2157} 2243}
2158 2244
2245# common code, used by both ->save and ->swapout
2159sub save { 2246sub _save {
2160 my ($self) = @_; 2247 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2248
2164 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2165 2250
2166 return unless $self->dirty; 2251 return unless $self->dirty;
2167 2252
2176 2261
2177 cf::async { 2262 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2180 }; 2265 };
2266
2267 cf::get_slot 0.02;
2181 2268
2182 if ($uniq) { 2269 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2272 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2274 }
2188} 2275}
2189 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2190sub swap_out { 2285sub swap_out {
2191 my ($self) = @_; 2286 my ($self) = @_;
2192 2287
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2198 return if $self->players; 2292 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2203 2344
2204 $self->deactivate; 2345 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2347 $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 2348
2252 $self->unlink_save; 2349 $self->unlink_save;
2253 $self->destroy; 2350 $self->destroy;
2254} 2351}
2255 2352
2263 2360
2264 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2265 2362
2266 $self->unlink_save; 2363 $self->unlink_save;
2267 2364
2268 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2370
2322 2419
2323sub unique_maps() { 2420sub unique_maps() {
2324 [ 2421 [
2325 map { 2422 map {
2326 utf8::decode $_; 2423 utf8::decode $_;
2327 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2328 ? normalise $_ 2427 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2429 ]
2332} 2430}
2333 2431
2334package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2335 2463
2336=back 2464=back
2337 2465
2338=head3 cf::object 2466=head3 cf::object
2339 2467
2343 2471
2344=over 4 2472=over 4
2345 2473
2346=item $ob->inv_recursive 2474=item $ob->inv_recursive
2347 2475
2348Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2349 2478
2350=cut 2479=cut
2351 2480
2352sub inv_recursive_; 2481sub inv_recursive_;
2353sub inv_recursive_ { 2482sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2359} 2488}
2360 2489
2361=item $ref = $ob->ref 2490=item $ref = $ob->ref
2362 2491
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2364 2493
2365=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2366 2495
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2497even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2530dialogue with the given NPC character.
2402 2531
2403=cut 2532=cut
2404 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2405# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2549# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2565
2423 } else { 2566 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2569 }
2427 } 2570 }
2428} 2571}
2429 2572
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2598
2456=item $player_object->enter_link 2599=item $player_object->enter_link
2457 2600
2458Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2459 2602
2460The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2462 2607
2463Will never block. 2608Will never block.
2464 2609
2465=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2466 2611
2486sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2487 my ($self) = @_; 2632 my ($self) = @_;
2488 2633
2489 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2490 2635
2636 ++$self->{_link_recursion};
2637
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2639
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2495 2642
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2644}
2498 2645
2499sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2501 2648
2518 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2520 2667
2521 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2524 2671
2525 $map->load; 2672 $map->load;
2526 $map->load_neighbours; 2673 $map->load_neighbours;
2527 2674
2528 return unless $self->contr->active; 2675 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2676
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2533} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2534 2684
2685}
2686
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2688
2537Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2691that 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 2692the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2693be called at the end of this process.
2542 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2543=cut 2698=cut
2544 2699
2545our $GOTOGEN; 2700our $GOTOGEN;
2546 2701
2547sub cf::object::player::goto { 2702sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2549 2710
2550 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2713
2553 $self->enter_link; 2714 $self->enter_link;
2577 my $map = eval { 2738 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2579 2740
2580 if ($map) { 2741 if ($map) {
2581 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2744 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2746 }
2586 2747
2587 $map 2748 $map
2595 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2598 } 2759 }
2599 2760
2600 $done->() if $done; 2761 $done->($self) if $done;
2601 })->prio (1); 2762 })->prio (1);
2602} 2763}
2603 2764
2604=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2605 2766
2625} 2786}
2626 2787
2627sub prepare_random_map { 2788sub prepare_random_map {
2628 my ($exit) = @_; 2789 my ($exit) = @_;
2629 2790
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2793 # that depends on the exit object
2635 2794
2636 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2797 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2643 } 2804 }
2644 2805
2645 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2646 2807
2647 my $data = cf::encode_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2650 2811
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2814 undef $fh;
2654 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2655 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2658 } 2823 }
2659} 2824}
2660 2825
2661sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2663 2828
2664 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2665 2830
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; 2831 $self->enter_link;
2678 2832
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 { 2833 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2685 2835
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2688 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2689 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2690 1; 2857 1
2691 }) { 2858 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2863
2697 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2865 $self->leave_link;
2699 } 2866 }
2700 })->prio (1); 2867 })->prio (1);
2701} 2868}
2702 2869
2714sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2716 2883
2717 utf8::encode $text; 2884 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2719} 2911}
2720 2912
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2914
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2919
2728=cut 2920=cut
2729 2921
2730# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2732 "c/identify" => { 2930 "c/identify" => {
2733 id => "infobox", 2931 id => "infobox",
2734 title => "Identify", 2932 title => "Identify",
2735 reply => undef, 2933 reply => undef,
2736 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2738 "c/examine" => { 2936 "c/examine" => {
2739 id => "infobox", 2937 id => "infobox",
2740 title => "Examine", 2938 title => "Examine",
2741 reply => undef, 2939 reply => undef,
2742 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2947 },
2744 "c/book" => { 2948 "c/book" => {
2745 id => "infobox", 2949 id => "infobox",
2746 title => "Book", 2950 title => "Book",
2747 reply => undef, 2951 reply => undef,
2763 id => "infobox", 2967 id => "infobox",
2764 title => "Body Parts", 2968 title => "Body Parts",
2765 reply => undef, 2969 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2970 tooltip => "Shows which body parts you posess and are available",
2767 }, 2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
2768 "c/uptime" => { 3008 "c/uptime" => {
2769 id => "infobox", 3009 id => "infobox",
2770 title => "Uptime", 3010 title => "Uptime",
2771 reply => undef, 3011 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3012 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3015 id => "infobox",
2776 title => "Map Info", 3016 title => "Map Info",
2777 reply => undef, 3017 reply => undef,
2778 tooltip => "Information related to the maps", 3018 tooltip => "Information related to the maps",
2779 }, 3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2780); 3034);
2781 3035
2782sub cf::client::send_msg { 3036sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3038
2785 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2786 3041
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3043
2789 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2792 3047
2793 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2797 3050
2798 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3056 }
2805 3057
2806 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2807 } 3059 }
2808 3060
2809 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2810 3062
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3063 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2815 3066
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3070 );
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 3071
2830 $color &= cf::NDI_COLOR_MASK; 3072 $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} 3073}
2844 3074
2845=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2846 3076
2847Sends an ext event to the client. 3077Sends an ext event to the client.
2850 3080
2851sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2853 3083
2854 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3089 }
2860} 3090}
2861 3091
2862=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2863 3093
2867 3097
2868sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2870 3100
2871 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3104 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3107 }
2878} 3108}
2879 3109
2880=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2881 3111
2952 3182
2953 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3184 if $reply;
2955 3185
2956 } else { 3186 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3188 }
2959 3189
2960 cf::override; 3190 cf::override;
2961 }, 3191 },
2962); 3192);
2982 3212
2983 $coro 3213 $coro
2984} 3214}
2985 3215
2986cf::client->attach ( 3216cf::client->attach (
2987 on_destroy => sub { 3217 on_client_destroy => sub {
2988 my ($ns) = @_; 3218 my ($ns) = @_;
2989 3219
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3221 },
2992); 3222);
3008our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3009 3239
3010$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3011 3241
3012$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3015 sort time 3245 sort time
3016)); 3246));
3017 3247
3018# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
3021 3251
3022The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
3023 3253
3024 cf::object 3254 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3255 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
3027 3258
3028 cf::object::player 3259 cf::object::player
3029 player 3260 player
3030 3261
3031 cf::player 3262 cf::player
3036 3267
3037=cut 3268=cut
3038 3269
3039for ( 3270for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3046) { 3277) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3280 for @funs;
3051} 3281}
3052 3282
3067 3297
3068 my $qcode = $code; 3298 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3071 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
3072 local $_; 3305 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3306
3075 my $eval = 3307 my $eval =
3076 "do {\n" 3308 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3311 . $code
3080 . "\n}" 3312 . "\n}"
3081 ; 3313 ;
3082 3314
3315 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3086 3324
3087 if ($@) { 3325 if ($@) {
3088 warn "$@"; 3326 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3091 } 3329 }
3092 3330
3093 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3094} 3332}
3095 3333
3109=cut 3347=cut
3110 3348
3111sub register_script_function { 3349sub register_script_function {
3112 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3113 3351
3114 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3116} 3354}
3117 3355
3118=back 3356=back
3119 3357
3120=cut 3358=cut
3121 3359
3122############################################################################# 3360#############################################################################
3123# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3124 3405
3125sub load_facedata($) { 3406sub load_facedata($) {
3126 my ($path) = @_; 3407 my ($path) = @_;
3127 3408
3128 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?) 3410 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3412
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3414
3134 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3135 3416
3136 my $facedata; 3417 my $facedata;
3137 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3138 or die "$path: $!"; 3419 or die "$path: $!";
3139 3420
3141 3422
3142 $facedata->{version} == 2 3423 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3425
3145 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3429 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3432 };
3150 cf::cede_to_tick; 3433 cf::cede_to_tick;
3151 3434
3152 { 3435 {
3153 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3440
3158 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3445
3163 cf::cede_to_tick; 3446 cf::cede_to_tick;
3164 } 3447 }
3165 3448
3166 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3171 3454
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3458 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3460 }
3178 3461
3179 cf::cede_to_tick; 3462 cf::cede_to_tick;
3180 } 3463 }
3181 } 3464 }
3190 3473
3191 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3192 } 3475 }
3193 3476
3194 { 3477 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3198 3479
3199 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3483
3204 if ($info->{type} & 1) { 3484 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}; 3485 cf::face::set_type $idx, $info->{type};
3219 } else { 3486 } else {
3220 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3221 } 3488 }
3222 3489
3223 cf::cede_to_tick; 3490 cf::cede_to_tick;
3224 } 3491 }
3225 } 3492 }
3226 3493
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3495
3229 1 3496 1
3230} 3497}
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 3498
3252register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3254 3501
3255 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3503 $ns->fx_want ($k, $v);
3257 } 3504 }
3258}; 3505};
3506
3507sub load_resource_file($) {
3508 my $guard = lock_acquire "load_resource_file";
3509
3510 my $status = load_resource_file_ $_[0];
3511 get_slot 0.1, 100;
3512 cf::arch::commit_load;
3513
3514 $status
3515}
3259 3516
3260sub reload_regions { 3517sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3518 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3519 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3534}
3278 3535
3279sub reload_archetypes { 3536sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3538 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} 3539}
3288 3540
3289sub reload_treasures { 3541sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3292} 3544}
3293 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3294sub reload_resources { 3569sub reload_resources {
3295 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3296 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3297 reload_regions; 3575 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3576 reload_treasures;
3302 3577
3303 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3579}
3309 3580
3310sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3585 or return;
3313 3586
3314 local $/; 3587 local $/;
3315 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3316 3589
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3591
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $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}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3594
3322 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3324 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3325 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3326 }; 3599 };
3327 warn $@ if $@; 3600 warn $@ if $@;
3328 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3329} 3632}
3330 3633
3331sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3332 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3647 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3649 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3339 }; 3651 };
3340 3652
3653 evthread_start IO::AIO::poll_fileno;
3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3341 reload_config; 3667 reload_config;
3342 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
3343 load_extensions; 3678 load_extensions;
3344 3679
3345 $TICK_WATCHER->start; 3680 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3681
3347 EV::loop; 3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3687 };
3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3348} 3698}
3349 3699
3350############################################################################# 3700#############################################################################
3351# initialisation and cleanup 3701# initialisation and cleanup
3352 3702
3353# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3354BEGIN { 3704BEGIN {
3355 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3359 }; 3709 };
3360 } 3710 }
3361} 3711}
3362 3712
3363sub write_runtime { 3713sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3365 3715
3366 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3368 3718
3369 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3720
3371 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3372 3722
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3724 or return;
3375 3725
3376 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3389 3739
3390 close $fh 3740 close $fh
3391 or return; 3741 or return;
3392 3742
3393 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3744 and return;
3395 3745
3396 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3747
3398 1 3748 1
3749}
3750
3751our $uuid_lock;
3752our $uuid_skip;
3753
3754sub write_uuid_sync($) {
3755 $uuid_skip ||= $_[0];
3756
3757 return if $uuid_lock;
3758 local $uuid_lock = 1;
3759
3760 my $uuid = "$LOCALDIR/uuid";
3761
3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3763 or return;
3764
3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3773 $uuid_skip = 0;
3774
3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3776 and return;
3777
3778 # always fsync - this file is important
3779 aio_fsync $fh
3780 and return;
3781
3782 close $fh
3783 or return;
3784
3785 aio_rename "$uuid~", $uuid
3786 and return;
3787
3788 trace "uuid file written ($value).\n";
3789
3790 1
3791
3792}
3793
3794sub write_uuid($$) {
3795 my ($skip, $sync) = @_;
3796
3797 $sync ? write_uuid_sync $skip
3798 : async { write_uuid_sync $skip };
3399} 3799}
3400 3800
3401sub emergency_save() { 3801sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3403 3803
3404 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3405 3810
3406 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3407 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3820 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3822 $pl->save;
3416 } 3823 }
3417 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3418 3825
3419 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3831 $map->valid or next;
3423 $map->save; 3832 $map->save;
3424 } 3833 }
3425 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3426 3835
3427 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3841
3842 info "emergency_perl_save: begin write uuid\n";
3843 write_uuid_sync 1;
3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3864 };
3431 3865
3432 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3433} 3867}
3434 3868
3435sub post_cleanup { 3869sub post_cleanup {
3436 my ($make_core) = @_; 3870 my ($make_core) = @_;
3437 3871
3872 IO::AIO::flush;
3873
3438 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3879}
3880
3881# a safer delete_package, copied from Symbol
3882sub clear_package($) {
3883 my $pkg = shift;
3884
3885 # expand to full symbol table name if needed
3886 unless ($pkg =~ /^main::.*::$/) {
3887 $pkg = "main$pkg" if $pkg =~ /^::/;
3888 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3889 $pkg .= '::' unless $pkg =~ /::$/;
3890 }
3891
3892 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3893 my $stem_symtab = *{$stem}{HASH};
3894
3895 defined $stem_symtab and exists $stem_symtab->{$leaf}
3896 or return;
3897
3898 # clear all symbols
3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3900 for my $name (keys %$leaf_symtab) {
3901 _gv_clear *{"$pkg$name"};
3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3903 }
3440} 3904}
3441 3905
3442sub do_reload_perl() { 3906sub do_reload_perl() {
3443 # can/must only be called in main 3907 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3445 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3446 return; 3910 return;
3447 } 3911 }
3448 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3449 warn "reloading..."; 3918 info "reloading...";
3450 3919
3451 warn "entering sync_job"; 3920 trace "entering sync_job";
3452 3921
3453 cf::sync_job { 3922 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3923 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3924
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"; 3925 trace "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3927 %EXT_CORO = ();
3477 3928
3478 warn "removing commands"; 3929 trace "removing commands";
3479 %COMMAND = (); 3930 %COMMAND = ();
3480 3931
3481 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3482 %EXTCMD = (); 3933 %EXTCMD = ();
3483 %EXTICMD = (); 3934 %EXTICMD = ();
3484 3935
3485 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3488 3939
3489 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3941 eval {
3491 $cb->($pkg); 3942 $cb->($pkg);
3492 1 3943 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3945 }
3946
3947 trace "... clearing $pkg";
3948 clear_package $pkg;
3494 } 3949 }
3495 3950
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3954
3504 warn "... unloading $k"; 3955 trace "... unloading $k";
3505 delete $INC{$k}; 3956 delete $INC{$k};
3506 3957
3507 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3509 3960
3510 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3512 } 3966 }
3513 3967
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3971
3521 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3975
3525 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3977 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3528 3979
3529 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3530 3981
3531 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3532 require cf; 3983 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3534 3985
3535 warn "loading config and database again"; 3986 trace "loading config and database again";
3536 cf::reload_config; 3987 cf::reload_config;
3537 3988
3538 warn "loading extensions"; 3989 trace "loading extensions";
3539 cf::load_extensions; 3990 cf::load_extensions;
3540 3991
3992 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3547 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3548 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3549 4005
3550 1 4006 1
3551 } or do { 4007 } or do {
3552 warn $@; 4008 error $@;
3553 warn "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3554 exit 1; 4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3555 }; 4014 }
3556 4015
3557 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3558}; 4018};
3559 4019
3560our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3561 4021
3562sub reload_perl() { 4022sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3565 4025
4026 $RELOAD_WATCHER ||= cf::async {
4027 Coro::AIO::aio_wait cache_extensions;
4028
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4030 do_reload_perl;
3567 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3568 do_reload_perl; 4032 };
3569 }; 4033 };
3570} 4034}
3571 4035
3572register_command "reload" => sub { 4036register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3579 reload_perl; 4043 reload_perl;
3580 }; 4044 };
3581 } 4045 }
3582}; 4046};
3583 4047
3584unshift @INC, $LIBDIR; 4048#############################################################################
3585 4049
3586my $bug_warning = 0; 4050my $bug_warning = 0;
3587 4051
3588our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3590 4054
3591sub wait_for_tick { 4055sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 4057
3595 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 4060 $signal->wait;
3598} 4061}
3599 4062
3600sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 4065
3604 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4068 $signal->wait;
3607} 4069}
3608 4070
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4071sub tick {
3610 if ($Coro::current != $Coro::main) { 4072 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4073 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4074 unless ++$bug_warning > 10;
3613 return; 4075 return;
3614 } 4076 }
3615 4077
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3619 4079
3620 $RUNTIME += $TICK; 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 4081
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4084 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4086 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3629 }; 4088 };
3630 } 4089 }
3631 4090
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4092 $sig->send;
3634 } 4093 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4094 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4095 $sig->send;
3637 } 4096 }
3638 4097
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4098 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4099 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4100
3642 _post_tick; 4101 if (0) {
3643}; 4102 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4103 my $jitter = $TICK_START - $NEXT_TICK;
4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4105 debug "jitter $JITTER\n";#d#
4106 }
4107 }
4108}
3645 4109
3646{ 4110{
3647 # configure BDB 4111 # configure BDB
3648 4112
3649 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3652 4116
3653 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4120 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4121 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4123 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4124
3660 cf::sync_job { 4125 cf::sync_job {
3661 eval { 4126 eval {
3687{ 4152{
3688 # configure IO::AIO 4153 # configure IO::AIO
3689 4154
3690 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4157 undef $AnyEvent::AIO::WATCHER;
3693} 4158}
3694 4159
3695my $_log_backtrace; 4160my $_log_backtrace;
3696 4161
3697sub _log_backtrace { 4162sub _log_backtrace {
3700 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3701 4166
3702 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3705 async { 4171 async {
3706 $Coro::current->{desc} = "abt $msg"; 4172 $Coro::current->{desc} = "abt $msg";
3707 4173
3708 my @bt = fork_call { 4174 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4186 }
3721 4187
3722 @funcs 4188 @funcs
3723 }; 4189 };
3724 4190
3725 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4194 --$_log_backtrace;
3728 }; 4195 };
3729 } else { 4196 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4199 }
3733} 4200}
3734 4201
3735# load additional modules 4202# load additional modules
3736use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3737 4205
3738END { cf::emergency_save } 4206END { cf::emergency_save }
3739 4207
37401 42081
3741 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines