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.522 by root, Sat Apr 17 02:22:14 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 80
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
72 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $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 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 118our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
79 120
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 124our $DB_ENV;
85 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
86our %CFG; 128our %CFG;
87 129
88our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 131our $RUNTIME;
90our $NOW; 132our $NOW;
96# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 140
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
102 150
103binmode STDOUT; 151binmode STDOUT;
104binmode STDERR; 152binmode STDERR;
105 153
106# read virtual server time, if available 154# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
111} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
112 162
113mkdir $_ 163mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 165
116our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
117 167
118sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 184
120############################################################################# 185#############################################################################
121 186
122=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
123 188
170returns directly I<after> the tick processing (and consequently, can only wake one process 235returns 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. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 237
173=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
174 239
175This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 242that call.
178 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
179=back 250=back
180 251
181=cut 252=cut
182 253
183BEGIN { 254$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 255 my $msg = join "", @_;
186 256
187 $msg .= "\n" 257 $msg .= "\n"
188 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
189 259
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 261
192 LOG llevError, $msg; 262 LOG llevError, $msg;
193 }; 263};
194}
195 264
196$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
197 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
198 Coro::terminate; 276 Coro::terminate
199}; 277};
200 278
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 289for my $pkg (qw(
212 cf::global cf::attachable 290 cf::global cf::attachable
213 cf::object cf::object::player 291 cf::object cf::object::player
214 cf::client cf::player 292 cf::client cf::player
215 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
216 cf::map cf::party cf::region 295 cf::party cf::region
217)) { 296)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 298}
221 299
222$EV::DIED = sub { 300$EV::DIED = sub {
223 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
224}; 302};
225 303
226############################################################################# 304#############################################################################
227 305
228=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266 344
267sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
269 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
270=item cf::lock_wait $string 362=item cf::lock_wait $string
271 363
272Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
273 365
274=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
275 367
276Wait until the given lock is available and then acquires it and returns 368Wait 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, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
278for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
279returned. 371returned.
280 372
281Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro. 374deadlocked coro.
288 380
289Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
290 382
291=cut 383=cut
292 384
293our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 386
296sub lock_wait($) { 387sub lock_wait($) {
297 my ($key) = @_; 388 $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} 389}
310 390
311sub lock_acquire($) { 391sub lock_acquire($) {
312 my ($key) = @_; 392 $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} 393}
326 394
327sub lock_active($) { 395sub lock_active($) {
328 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 397}
332 398
333sub freeze_mainloop { 399sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
335 401
336 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 403}
342 404
343=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
344 406
345Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer. 408get spread over time.
347 409
348=cut 410=cut
349 411
350sub periodic($$) { 412sub periodic($$) {
351 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
368 430
369=cut 431=cut
370 432
371our @SLOT_QUEUE; 433our @SLOT_QUEUE;
372our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
373 436
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
377 440
378 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
379 443
380 while () { 444 while () {
381 next_job: 445 next_job:
446
382 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 448
384 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 453 $job->[2]->send;
388 Coro::cede; 454 Coro::cede;
389 goto next_job; 455 goto next_job;
390 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 458 }
392 } 459 }
393 460
394 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait; 464 $signal->wait;
398 } else { 465 } else {
466 $busy = 0;
399 Coro::schedule; 467 Coro::schedule;
400 } 468 }
401 } 469 }
402}; 470};
403 471
404sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
405 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
406 476
407 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
408 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
409 480
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
439 510
440sub sync_job(&) { 511sub sync_job(&) {
441 my ($job) = @_; 512 my ($job) = @_;
442 513
443 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
444 my $time = EV::time; 515 my $time = AE::time;
445 516
446 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
448 519
449 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
450 521
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
454 523
455 my $busy = 1; 524 my $busy = 1;
456 my @res; 525 my @res;
457 526
468 } else { 537 } else {
469 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
470 } 539 }
471 } 540 }
472 541
473 $time = EV::time - $time; 542 my $time = AE::time - $time;
474 543
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 544 $TICK_START += $time; # do not account sync jobs to server load
479 545
480 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
481 } else { 547 } else {
482 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
483 549
525 reset_signals; 591 reset_signals;
526 &$cb 592 &$cb
527 }, @args; 593 }, @args;
528 594
529 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
530} 634}
531 635
532=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
533 637
534Returns a single value from the environment database. 638Returns a single value from the environment database.
673 777
674############################################################################# 778#############################################################################
675 779
676=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
677 781
678Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
679attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
681 785
682In the following description, CLASS can be any of C<global>, C<object> 786In 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 787C<player>, C<client> or C<map> (i.e. the attachable objects in
733=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
734 838
735Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
737 841
738Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
739that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
740 844
741These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
742 846
743=over 4 847=over 4
1034 1138
1035sub reattach { 1139sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1141 my ($obj) = @_;
1038 1142
1143 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1145
1041 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1042 1147
1043 @$registry = (); 1148 @$registry = ();
1044 1149
1090 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1093 1198
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1098 close $fh; 1206 aio_close $fh;
1099 1207
1100 if (@$objs) { 1208 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1105 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 }
1106 close $fh; 1217 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1219 }
1109 } else { 1220 } else {
1110 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1111 } 1222 }
1112 1223
1113 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1228 } else {
1115 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1116 } 1230 }
1117 } else { 1231 } else {
1118 aio_unlink $filename; 1232 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1120 } 1234 }
1211 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1212 1326
1213 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1214} 1328}
1215 1329
1330use File::Glob ();
1331
1216cf::player->attach ( 1332cf::player->attach (
1217 on_command => sub { 1333 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1219 1335
1220 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1221 or return; 1337 or return;
1222 1338
1252 1368
1253 cf::override; 1369 cf::override;
1254 }, 1370 },
1255); 1371);
1256 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1257sub load_extensions { 1386sub load_extensions {
1258 cf::sync_job { 1387 cf::sync_job {
1259 my %todo; 1388 my %todo;
1260 1389
1261 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1280 1409
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1412
1284 $ext{source} = 1413 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1287 . $source 1416 . $source
1288 . "\n};\n1"; 1417 . "\n};\n1";
1289 1418
1290 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1291 } 1420 }
1292 1421
1422 my $pass = 0;
1293 my %done; 1423 my %done;
1294 while (%todo) { 1424 while (%todo) {
1295 my $progress; 1425 my $progress;
1296 1426
1427 ++$pass;
1428
1429 ext:
1297 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1432 next ext
1300 unless exists $done{$_}; 1433 unless exists $done{$_};
1301 } 1434 }
1302 1435
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1437
1305 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1310 warn $msg; 1445
1311 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1447 delete $todo{$k};
1313 } 1448 } else {
1314 1449 $done{$k} = delete $todo{$k};
1315 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1316 } 1455 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1456 }
1322 1457
1323 skip: 1458 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1326 } 1466 }
1327 }; 1467 };
1328} 1468}
1329 1469
1330############################################################################# 1470#############################################################################
1331 1471
1332=back 1472=back
1333 1473
1334=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1335 1475
1336Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1337 1477
1338=cut 1478=cut
1339 1479
1340package cf::player; 1480package cf::player;
1341 1481
1384 1524
1385sub exists($) { 1525sub exists($) {
1386 my ($login) = @_; 1526 my ($login) = @_;
1387 1527
1388 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1390} 1530}
1391 1531
1392sub find($) { 1532sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1534 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1547 or return;
1408 1548
1409 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1410 or return; 1550 or return;
1551
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1414 } 1555 }
1415 } 1556 }
1416} 1557}
1417 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1418sub save($) { 1572sub save($) {
1419 my ($pl) = @_; 1573 my ($pl) = @_;
1420 1574
1421 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1422 1576
1425 1579
1426 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1427 1581
1428 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1589
1431 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1591 cf::cede_to_tick;
1433} 1592}
1434 1593
1466 my ($pl) = @_; 1625 my ($pl) = @_;
1467 1626
1468 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1469 1628
1470 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1631
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1477 1638
1478 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1679
1519 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1520 my $path = path $login; 1681 my $path = path $login;
1521 1682
1522 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1689 }
1528 1690
1559 } 1721 }
1560 1722
1561 \@paths 1723 \@paths
1562} 1724}
1563 1725
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1727
1566Expand crossfire pod fragments into protocol xml. 1728Expand 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 1729
1657=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1658 1731
1659Sends an ext reply to the player. 1732Sends an ext reply to the player.
1660 1733
1727our $MAX_RESET = 3600; 1800our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1801our $DEFAULT_RESET = 3000;
1729 1802
1730sub generate_random_map { 1803sub generate_random_map {
1731 my ($self, $rmp) = @_; 1804 my ($self, $rmp) = @_;
1805
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807
1732 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1809 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1858 1934
1859# the temporary/swap location 1935# the temporary/swap location
1860sub save_path { 1936sub save_path {
1861 my ($self) = @_; 1937 my ($self) = @_;
1862 1938
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1939 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1940 "$TMPDIR/$path.map"
1865} 1941}
1866 1942
1867# the unique path, undef == no special unique path 1943# the unique path, undef == no special unique path
1868sub uniq_path { 1944sub uniq_path {
1869 my ($self) = @_; 1945 my ($self) = @_;
1870 1946
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1948 "$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} 1949}
1883 1950
1884sub decay_objects { 1951sub decay_objects {
1885 my ($self) = @_; 1952 my ($self) = @_;
1886 1953
1970sub find { 2037sub find {
1971 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
1972 2039
1973 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
1974 2041
1975 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2044
1978 $cf::MAP{$path} || do { 2045 $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 2046 my $map = new_from_path cf::map $path
1983 or return; 2047 or return;
1984 2048
1985 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
1986 2050
1988 or return; 2052 or return;
1989 2053
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2054 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2055 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2056 #$cf::WAIT_FOR_TICK->wait;
2057 undef $guard2;
1993 undef $guard1; 2058 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2059 $map->reset;
1996 return find $path; 2060 return find $path;
1997 } 2061 }
1998 2062
1999 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2000 } 2064 }
2001} 2065}
2002 2066
2003sub pre_load { } 2067sub pre_load { }
2004sub post_load { } 2068#sub post_load { } # XS
2005 2069
2006sub load { 2070sub load {
2007 my ($self) = @_; 2071 my ($self) = @_;
2008 2072
2009 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2090 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2091 $f->skip_block;
2028 $self->_load_objects ($f) 2092 $self->_load_objects ($f)
2029 or return; 2093 or return;
2030 2094
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2095 $self->post_load_original
2032 if delete $self->{load_original}; 2096 if delete $self->{load_original};
2033 2097
2034 if (my $uniq = $self->uniq_path) { 2098 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2099 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2100 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2119 $self->decay_objects;
2056 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2057 $self->update_buttons; 2121 $self->update_buttons;
2058 cf::cede_to_tick; 2122 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2123 $self->activate;
2062 } 2124 }
2063 2125
2064 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2066 2128
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2130 }
2069 2131
2070 $self->post_load; 2132 $self->post_load;
2071} 2133}
2072 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2073sub customise_for { 2138sub customise_for {
2074 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2075 2140
2076 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2142 if $self->per_player;
2130 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2131 2196
2132 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2133 2198
2134 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2201 }
2137 2202
2138 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2139 2204
2140 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2155 2220
2156 () 2221 ()
2157} 2222}
2158 2223
2224# common code, used by both ->save and ->swapout
2159sub save { 2225sub _save {
2160 my ($self) = @_; 2226 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2227
2164 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2165 2229
2166 return unless $self->dirty; 2230 return unless $self->dirty;
2167 2231
2176 2240
2177 cf::async { 2241 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2242 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2243 $_->contr->save for $self->players;
2180 }; 2244 };
2245
2246 cf::get_slot 0.02;
2181 2247
2182 if ($uniq) { 2248 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2250 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2251 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2253 }
2188} 2254}
2189 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2190sub swap_out { 2264sub swap_out {
2191 my ($self) = @_; 2265 my ($self) = @_;
2192 2266
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2268
2269 return if $self->in_memory != cf::MAP_ACTIVE;
2270 return if $self->{deny_save};
2198 return if $self->players; 2271 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2272
2202 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2203
2204 $self->deactivate; 2274 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2206 $self->clear; 2282 $self->clear;
2207} 2283}
2208 2284
2209sub reset_at { 2285sub reset_at {
2210 my ($self) = @_; 2286 my ($self) = @_;
2229 2305
2230 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231 2307
2232 return if $self->players; 2308 return if $self->players;
2233 2309
2234 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2235 2311
2236 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2237 2313
2238 # need to save uniques path 2314 # need to save uniques path
2239 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2322 2398
2323sub unique_maps() { 2399sub unique_maps() {
2324 [ 2400 [
2325 map { 2401 map {
2326 utf8::decode $_; 2402 utf8::decode $_;
2327 /\.map$/ 2403 s/\.map$//; # TODO future compatibility hack
2404 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2405 ? ()
2328 ? normalise $_ 2406 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2408 ]
2332} 2409}
2333 2410
2334package cf; 2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2335 2442
2336=back 2443=back
2337 2444
2338=head3 cf::object 2445=head3 cf::object
2339 2446
2343 2450
2344=over 4 2451=over 4
2345 2452
2346=item $ob->inv_recursive 2453=item $ob->inv_recursive
2347 2454
2348Returns the inventory of the object _and_ their inventories, recursively. 2455Returns the inventory of the object I<and> their inventories, recursively,
2456but I<not> the object itself.
2349 2457
2350=cut 2458=cut
2351 2459
2352sub inv_recursive_; 2460sub inv_recursive_;
2353sub inv_recursive_ { 2461sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2466 inv_recursive_ inv $_[0]
2359} 2467}
2360 2468
2361=item $ref = $ob->ref 2469=item $ref = $ob->ref
2362 2470
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2471Creates and returns a persistent reference to an object that can be stored as a string.
2364 2472
2365=item $ob = cf::object::deref ($refstring) 2473=item $ob = cf::object::deref ($refstring)
2366 2474
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2475returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2476even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2508can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2509dialogue with the given NPC character.
2402 2510
2403=cut 2511=cut
2404 2512
2513our $SAY_CHANNEL = {
2514 id => "say",
2515 title => "Map",
2516 reply => "say ",
2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2518};
2519
2520our $CHAT_CHANNEL = {
2521 id => "chat",
2522 title => "Chat",
2523 reply => "chat ",
2524 tooltip => "Player chat and shouts, global to the server.",
2525};
2526
2405# rough implementation of a future "reply" method that works 2527# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2528# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2529#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2530sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2531 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2542 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2543 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2544
2423 } else { 2545 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2546 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2547 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2548 }
2427 } 2549 }
2428} 2550}
2429 2551
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2552=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2577
2456=item $player_object->enter_link 2578=item $player_object->enter_link
2457 2579
2458Freezes the player and moves him/her to a special map (C<{link}>). 2580Freezes the player and moves him/her to a special map (C<{link}>).
2459 2581
2460The player should be reasonably safe there for short amounts of time. You 2582The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2583for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link
2585map.
2462 2586
2463Will never block. 2587Will never block.
2464 2588
2465=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2466 2590
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2616
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2495 2619
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2621}
2498 2622
2499sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2501 2625
2518 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2520 2644
2521 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2524 2648
2525 $map->load; 2649 $map->load;
2526 $map->load_neighbours; 2650 $map->load_neighbours;
2527 2651
2528 return unless $self->contr->active; 2652 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2653
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2533} 2659}
2534 2660
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2662
2537Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2664her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2665that 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 2666the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2667be called at the end of this process.
2668
2669Note that $check will be called with a potentially non-loaded map, so if
2670it needs a loaded map it has to call C<< ->load >>.
2542 2671
2543=cut 2672=cut
2544 2673
2545our $GOTOGEN; 2674our $GOTOGEN;
2546 2675
2625} 2754}
2626 2755
2627sub prepare_random_map { 2756sub prepare_random_map {
2628 my ($exit) = @_; 2757 my ($exit) = @_;
2629 2758
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2759 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2760 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2761 # that depends on the exit object
2635 2762
2636 my $rmp = parse_random_map_params $exit->msg; 2763 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2765 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2766 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2767 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2768 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2769 $rmp->{origin_y} = $exit->y;
2770
2771 $exit->map->touch;
2643 } 2772 }
2644 2773
2645 $rmp->{random_seed} ||= $exit->random_seed; 2774 $rmp->{random_seed} ||= $exit->random_seed;
2646 2775
2647 my $data = cf::encode_json $rmp; 2776 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2777 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2778 my $meta = "$RANDOMDIR/$md5.meta";
2650 2779
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2780 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2781 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2782 undef $fh;
2654 aio_rename "$meta~", $meta; 2783 aio_rename "$meta~", $meta;
2655 2784
2785 my $slaying = "?random/$md5";
2786
2787 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2788 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2789 $exit->msg (undef);
2790 }
2658 } 2791 }
2659} 2792}
2660 2793
2661sub cf::object::player::enter_exit { 2794sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2795 my ($self, $exit) = @_;
2663 2796
2664 return unless $self->type == cf::PLAYER; 2797 return unless $self->type == cf::PLAYER;
2665 2798
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; 2799 $self->enter_link;
2678 2800
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 { 2801 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2802 $Coro::current->{desc} = "enter_exit";
2685 2803
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2804 unless (eval {
2805 $self->deactivate_recursive; # just to be sure
2806
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2816 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp;
2818
2688 $self->goto ($slaying, $hp, $sp); 2819 $self->goto ($map, $x, $y);
2689 2820
2821 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y)
2823 if $exit->flag (cf::FLAG_DAMNED);
2824
2690 1; 2825 1
2691 }) { 2826 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2828 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2831
2697 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
2714sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2716 2851
2717 utf8::encode $text; 2852 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2854}
2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2719} 2879}
2720 2880
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2882
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2887
2728=cut 2888=cut
2729 2889
2730# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2732 "c/identify" => { 2898 "c/identify" => {
2733 id => "infobox", 2899 id => "infobox",
2734 title => "Identify", 2900 title => "Identify",
2735 reply => undef, 2901 reply => undef,
2736 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2738 "c/examine" => { 2904 "c/examine" => {
2739 id => "infobox", 2905 id => "infobox",
2740 title => "Examine", 2906 title => "Examine",
2741 reply => undef, 2907 reply => undef,
2742 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2915 },
2744 "c/book" => { 2916 "c/book" => {
2745 id => "infobox", 2917 id => "infobox",
2746 title => "Book", 2918 title => "Book",
2747 reply => undef, 2919 reply => undef,
2763 id => "infobox", 2935 id => "infobox",
2764 title => "Body Parts", 2936 title => "Body Parts",
2765 reply => undef, 2937 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2767 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2946 "c/skills" => {
2947 id => "infobox",
2948 title => "Skills",
2949 reply => undef,
2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2768 "c/uptime" => { 2976 "c/uptime" => {
2769 id => "infobox", 2977 id => "infobox",
2770 title => "Uptime", 2978 title => "Uptime",
2771 reply => undef, 2979 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 2983 id => "infobox",
2776 title => "Map Info", 2984 title => "Map Info",
2777 reply => undef, 2985 reply => undef,
2778 tooltip => "Information related to the maps", 2986 tooltip => "Information related to the maps",
2779 }, 2987 },
2988 "c/party" => {
2989 id => "party",
2990 title => "Party",
2991 reply => "gsay ",
2992 tooltip => "Messages and chat related to your party",
2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2780); 3002);
2781 3003
2782sub cf::client::send_msg { 3004sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3006
2785 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2786 3009
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3011
2789 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2792 3015
2793 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2797 3018
2798 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3024 }
2805 3025
2806 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2807 } 3027 }
2808 3028
2809 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2810 3030
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3031 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2815 3034
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3038 );
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 3039
2830 $color &= cf::NDI_COLOR_MASK; 3040 $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} 3041}
2844 3042
2845=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2846 3044
2847Sends an ext event to the client. 3045Sends an ext event to the client.
2850 3048
2851sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2853 3051
2854 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3057 }
2860} 3058}
2861 3059
2862=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2863 3061
2867 3065
2868sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2870 3068
2871 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3072 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3075 }
2878} 3076}
2879 3077
2880=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2881 3079
2982 3180
2983 $coro 3181 $coro
2984} 3182}
2985 3183
2986cf::client->attach ( 3184cf::client->attach (
2987 on_destroy => sub { 3185 on_client_destroy => sub {
2988 my ($ns) = @_; 3186 my ($ns) = @_;
2989 3187
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3189 },
2992); 3190);
3008our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3009 3207
3010$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3011 3209
3012$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3015 sort time 3213 sort time
3016)); 3214));
3017 3215
3018# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3021 3219
3022The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3023 3221
3024 cf::object 3222 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3224 insert remove name archname title slaying race decrease split
3225 value
3027 3226
3028 cf::object::player 3227 cf::object::player
3029 player 3228 player
3030 3229
3031 cf::player 3230 cf::player
3036 3235
3037=cut 3236=cut
3038 3237
3039for ( 3238for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3046) { 3245) {
3047 no strict 'refs'; 3246 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3067 3266
3068 my $qcode = $code; 3267 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3071 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3072 local $_; 3274 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3275
3075 my $eval = 3276 my $eval =
3076 "do {\n" 3277 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3280 . $code
3080 . "\n}" 3281 . "\n}"
3081 ; 3282 ;
3082 3283
3284 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3086 3293
3087 if ($@) { 3294 if ($@) {
3088 warn "$@"; 3295 warn "$@";
3089 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3109=cut 3316=cut
3110 3317
3111sub register_script_function { 3318sub register_script_function {
3112 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3113 3320
3114 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3116} 3323}
3117 3324
3118=back 3325=back
3119 3326
3120=cut 3327=cut
3141 3348
3142 $facedata->{version} == 2 3349 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3351
3145 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3355 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3358 };
3150 cf::cede_to_tick; 3359 cf::cede_to_tick;
3151 3360
3152 { 3361 {
3153 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3366
3158 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3371
3163 cf::cede_to_tick; 3372 cf::cede_to_tick;
3164 } 3373 }
3165 3374
3166 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3190 3399
3191 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3192 } 3401 }
3193 3402
3194 { 3403 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3198 3405
3199 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3409
3204 if ($info->{type} & 1) { 3410 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}; 3411 cf::face::set_type $idx, $info->{type};
3219 } else { 3412 } else {
3220 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3221 } 3414 }
3222 3415
3255 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
3257 } 3450 }
3258}; 3451};
3259 3452
3453sub load_resource_file($) {
3454 my $guard = lock_acquire "load_resource_file";
3455
3456 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100;
3458 cf::arch::commit_load;
3459
3460 $status
3461}
3462
3260sub reload_regions { 3463sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3464 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3465 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3467
3277} 3480}
3278 3481
3279sub reload_archetypes { 3482sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3484 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} 3485}
3288 3486
3289sub reload_treasures { 3487sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3292} 3490}
3293 3491
3294sub reload_resources { 3492sub reload_resources {
3295 warn "reloading resource files...\n"; 3493 warn "reloading resource files...\n";
3296 3494
3495 reload_facedata;
3496 reload_archetypes;
3297 reload_regions; 3497 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3498 reload_treasures;
3302 3499
3303 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3304} 3501}
3305 3502
3306sub init {
3307 reload_resources;
3308}
3309
3310sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3507 or return;
3313 3508
3314 local $/; 3509 local $/;
3315 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3316 3511
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3318 3513
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $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}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3325 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3326 }; 3521 };
3327 warn $@ if $@; 3522 warn $@ if $@;
3328 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3526}
3527
3528sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!";
3531 flock $fh, &Fcntl::LOCK_EX
3532 or die "$PIDFILE: flock: $!";
3533 $fh
3534}
3535
3536# make sure only one server instance is running at any one time
3537sub atomic {
3538 my $fh = pidfile;
3539
3540 my $pid = <$fh>;
3541 kill 9, $pid if $pid > 0;
3542
3543 seek $fh, 0, 0;
3544 print $fh $$;
3545}
3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3329} 3554}
3330 3555
3331sub main { 3556sub main {
3557 cf::init_globals; # initialise logging
3558
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565
3332 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3569 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3571 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3339 }; 3573 };
3340 3574
3575 evthread_start IO::AIO::poll_fileno;
3576
3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3586 reload_resources;
3341 reload_config; 3587 reload_config;
3342 db_init; 3588 db_init;
3589
3590 cf::init_uuid;
3591 cf::init_signals;
3592 cf::init_skills;
3593
3594 cf::init_beforeplay;
3595
3596 atomic;
3597
3343 load_extensions; 3598 load_extensions;
3344 3599
3345 $TICK_WATCHER->start; 3600 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3601
3347 EV::loop; 3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605
3606 (pop @POST_INIT)->(0) while @POST_INIT;
3607 };
3608
3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3348} 3613}
3349 3614
3350############################################################################# 3615#############################################################################
3351# initialisation and cleanup 3616# initialisation and cleanup
3352 3617
3353# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3354BEGIN { 3619BEGIN {
3355 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3359 }; 3624 };
3360 } 3625 }
3361} 3626}
3362 3627
3363sub write_runtime { 3628sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3365 3630
3366 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3368 3633
3369 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3635
3371 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3372 3637
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3639 or return;
3375 3640
3376 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3389 3654
3390 close $fh 3655 close $fh
3391 or return; 3656 or return;
3392 3657
3393 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3659 and return;
3395 3660
3396 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3662
3398 1 3663 1
3664}
3665
3666our $uuid_lock;
3667our $uuid_skip;
3668
3669sub write_uuid_sync($) {
3670 $uuid_skip ||= $_[0];
3671
3672 return if $uuid_lock;
3673 local $uuid_lock = 1;
3674
3675 my $uuid = "$LOCALDIR/uuid";
3676
3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3678 or return;
3679
3680 my $value = uuid_seq uuid_cur;
3681
3682 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n";
3684 return;
3685 }
3686
3687 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0;
3689
3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3691 and return;
3692
3693 # always fsync - this file is important
3694 aio_fsync $fh
3695 and return;
3696
3697 close $fh
3698 or return;
3699
3700 aio_rename "$uuid~", $uuid
3701 and return;
3702
3703 warn "uuid file written ($value).\n";
3704
3705 1
3706
3707}
3708
3709sub write_uuid($$) {
3710 my ($skip, $sync) = @_;
3711
3712 $sync ? write_uuid_sync $skip
3713 : async { write_uuid_sync $skip };
3399} 3714}
3400 3715
3401sub emergency_save() { 3716sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3403 3718
3404 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3405 3720
3406 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3407 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3733 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3735 $pl->save;
3416 } 3736 }
3417 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3418 3738
3419 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3742 $map->valid or next;
3423 $map->save; 3743 $map->save;
3424 } 3744 }
3425 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3426 3746
3427 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3750
3751 warn "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n";
3430 }; 3754 };
3431 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3432 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3433} 3762}
3434 3763
3435sub post_cleanup { 3764sub post_cleanup {
3436 my ($make_core) = @_; 3765 my ($make_core) = @_;
3437 3766
3438 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3768 if $make_core;
3769
3770 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$;
3772}
3773
3774# a safer delete_package, copied from Symbol
3775sub clear_package($) {
3776 my $pkg = shift;
3777
3778 # expand to full symbol table name if needed
3779 unless ($pkg =~ /^main::.*::$/) {
3780 $pkg = "main$pkg" if $pkg =~ /^::/;
3781 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3782 $pkg .= '::' unless $pkg =~ /::$/;
3783 }
3784
3785 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3786 my $stem_symtab = *{$stem}{HASH};
3787
3788 defined $stem_symtab and exists $stem_symtab->{$leaf}
3789 or return;
3790
3791 # clear all symbols
3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3793 for my $name (keys %$leaf_symtab) {
3794 _gv_clear *{"$pkg$name"};
3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3796 }
3440} 3797}
3441 3798
3442sub do_reload_perl() { 3799sub do_reload_perl() {
3443 # can/must only be called in main 3800 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3445 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3446 return; 3803 return;
3447 } 3804 }
3448 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3449 warn "reloading..."; 3811 warn "reloading...";
3450 3812
3451 warn "entering sync_job"; 3813 warn "entering sync_job";
3452 3814
3453 cf::sync_job { 3815 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3817 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3457 3819
3458 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3822
3461 # if anything goes wrong in here, we should simply crash as we already saved 3823 # if anything goes wrong in here, we should simply crash as we already saved
3462 3824
3463 warn "flushing outstanding aio requests"; 3825 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; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = ();
3477
3478 warn "removing commands";
3479 %COMMAND = ();
3480
3481 warn "removing ext/exti commands";
3482 %EXTCMD = ();
3483 %EXTICMD = ();
3484
3485 warn "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg";
3488
3489 if (my $cb = $pkg->can ("unload")) {
3490 eval {
3491 $cb->($pkg);
3492 1
3493 } or warn "$pkg unloaded, but with errors: $@";
3494 } 3828 }
3495 3829
3496 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3498 } 3832 %EXT_CORO = ();
3499 3833
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3844
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3511 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3512 } 3854 }
3513 3855
3514 Symbol::delete_package $k; 3856 warn "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859
3860 warn "... unloading $k";
3861 delete $INC{$k};
3862
3863 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g;
3865
3866 if (my $cb = $k->can ("unload_module")) {
3867 $cb->();
3868 }
3869
3870 clear_package $k;
3515 } 3871 }
3516 3872
3517 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3876
3521 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3880
3525 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3882 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3528 3884
3529 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3530 3886
3531 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3532 require cf; 3888 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3534 3890
3535 warn "loading config and database again"; 3891 warn "loading config and database again";
3536 cf::reload_config; 3892 cf::reload_config;
3537 3893
3538 warn "loading extensions"; 3894 warn "loading extensions";
3539 cf::load_extensions; 3895 cf::load_extensions;
3540 3896
3897 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3547 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3548 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3549 3910
3550 1 3911 1
3551 } or do { 3912 } or do {
3552 warn $@; 3913 warn $@;
3553 warn "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3915 };
3556 3916
3557 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3558}; 3923};
3559 3924
3560our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3561 3926
3562sub reload_perl() { 3927sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3565 3930
3931 $RELOAD_WATCHER ||= cf::async {
3932 Coro::AIO::aio_wait cache_extensions;
3933
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3935 do_reload_perl;
3567 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3568 do_reload_perl; 3937 };
3569 }; 3938 };
3570} 3939}
3571 3940
3572register_command "reload" => sub { 3941register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3587 3956
3588our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3590 3959
3591sub wait_for_tick { 3960sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 3962
3595 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3965 $signal->wait;
3598} 3966}
3599 3967
3600sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 3970
3604 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3973 $signal->wait;
3607} 3974}
3608 3975
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3976sub tick {
3610 if ($Coro::current != $Coro::main) { 3977 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3978 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3613 return; 3980 return;
3614 } 3981 }
3615 3982
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3619 3984
3620 $RUNTIME += $TICK; 3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 3986
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3989 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3991 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3992 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3993 };
3630 } 3994 }
3631 3995
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3634 } 3998 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3999 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4000 $sig->send;
3637 } 4001 }
3638 4002
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4003 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4004 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4005
3642 _post_tick; 4006 if (0) {
3643}; 4007 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4008 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d#
4011 }
4012 }
4013}
3645 4014
3646{ 4015{
3647 # configure BDB 4016 # configure BDB
3648 4017
3649 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3652 4021
3653 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4026 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4027 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4028 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4029
3660 cf::sync_job { 4030 cf::sync_job {
3661 eval { 4031 eval {
3687{ 4057{
3688 # configure IO::AIO 4058 # configure IO::AIO
3689 4059
3690 IO::AIO::min_parallel 8; 4060 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4061 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4062 undef $AnyEvent::AIO::WATCHER;
3693} 4063}
3694 4064
3695my $_log_backtrace; 4065my $_log_backtrace;
3696 4066
3697sub _log_backtrace { 4067sub _log_backtrace {
3700 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3701 4071
3702 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3705 async { 4076 async {
3706 $Coro::current->{desc} = "abt $msg"; 4077 $Coro::current->{desc} = "abt $msg";
3707 4078
3708 my @bt = fork_call { 4079 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4091 }
3721 4092
3722 @funcs 4093 @funcs
3723 }; 4094 };
3724 4095
3725 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4099 --$_log_backtrace;
3728 }; 4100 };
3729 } else { 4101 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4104 }
3733} 4105}
3734 4106
3735# load additional modules 4107# load additional modules
3736use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3737 4110
3738END { cf::emergency_save } 4111END { cf::emergency_save }
3739 4112
37401 41131
3741 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines