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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines