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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.519 by root, Fri Apr 16 02:32:25 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 } else {
1311 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1312 exit 1; 1443 push @EXTS, $v->{pkg};
1313 } 1444 $progress = 1;
1314 1445
1315 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1316 } 1448 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1449 }
1322 1450
1323 skip: 1451 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1326 } 1459 }
1327 }; 1460 };
1328} 1461}
1329 1462
1330############################################################################# 1463#############################################################################
1331 1464
1332=back 1465=back
1333 1466
1334=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1335 1468
1336Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1337 1470
1338=cut 1471=cut
1339 1472
1340package cf::player; 1473package cf::player;
1341 1474
1384 1517
1385sub exists($) { 1518sub exists($) {
1386 my ($login) = @_; 1519 my ($login) = @_;
1387 1520
1388 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1390} 1523}
1391 1524
1392sub find($) { 1525sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1527 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1540 or return;
1408 1541
1409 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1410 or return; 1543 or return;
1544
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1414 } 1548 }
1415 } 1549 }
1416} 1550}
1417 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1418sub save($) { 1565sub save($) {
1419 my ($pl) = @_; 1566 my ($pl) = @_;
1420 1567
1421 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1422 1569
1425 1572
1426 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1427 1574
1428 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1582
1431 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1584 cf::cede_to_tick;
1433} 1585}
1434 1586
1466 my ($pl) = @_; 1618 my ($pl) = @_;
1467 1619
1468 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1469 1621
1470 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1624
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1477 1631
1478 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1672
1519 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1520 my $path = path $login; 1674 my $path = path $login;
1521 1675
1522 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1682 }
1528 1683
1559 } 1714 }
1560 1715
1561 \@paths 1716 \@paths
1562} 1717}
1563 1718
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1720
1566Expand crossfire pod fragments into protocol xml. 1721Expand 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 1722
1657=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1658 1724
1659Sends an ext reply to the player. 1725Sends an ext reply to the player.
1660 1726
1727our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1729 1795
1730sub generate_random_map { 1796sub generate_random_map {
1731 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1732 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1802 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1858 1927
1859# the temporary/swap location 1928# the temporary/swap location
1860sub save_path { 1929sub save_path {
1861 my ($self) = @_; 1930 my ($self) = @_;
1862 1931
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1865} 1934}
1866 1935
1867# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1868sub uniq_path { 1937sub uniq_path {
1869 my ($self) = @_; 1938 my ($self) = @_;
1870 1939
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1941 "$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} 1942}
1883 1943
1884sub decay_objects { 1944sub decay_objects {
1885 my ($self) = @_; 1945 my ($self) = @_;
1886 1946
1970sub find { 2030sub find {
1971 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1972 2032
1973 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1974 2034
1975 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2037
1978 $cf::MAP{$path} || do { 2038 $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 2039 my $map = new_from_path cf::map $path
1983 or return; 2040 or return;
1984 2041
1985 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1986 2043
1988 or return; 2045 or return;
1989 2046
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1993 undef $guard1; 2051 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2052 $map->reset;
1996 return find $path; 2053 return find $path;
1997 } 2054 }
1998 2055
1999 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2000 } 2057 }
2001} 2058}
2002 2059
2003sub pre_load { } 2060sub pre_load { }
2004sub post_load { } 2061#sub post_load { } # XS
2005 2062
2006sub load { 2063sub load {
2007 my ($self) = @_; 2064 my ($self) = @_;
2008 2065
2009 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2084 $f->skip_block;
2028 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
2029 or return; 2086 or return;
2030 2087
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
2032 if delete $self->{load_original}; 2089 if delete $self->{load_original};
2033 2090
2034 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2092 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2112 $self->decay_objects;
2056 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2057 $self->update_buttons; 2114 $self->update_buttons;
2058 cf::cede_to_tick; 2115 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2116 $self->activate;
2062 } 2117 }
2063 2118
2064 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2066 2121
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2123 }
2069 2124
2070 $self->post_load; 2125 $self->post_load;
2071} 2126}
2072 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2073sub customise_for { 2131sub customise_for {
2074 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2075 2133
2076 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2135 if $self->per_player;
2130 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2131 2189
2132 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2133 2191
2134 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2194 }
2137 2195
2138 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2139 2197
2140 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2155 2213
2156 () 2214 ()
2157} 2215}
2158 2216
2217# common code, used by both ->save and ->swapout
2159sub save { 2218sub _save {
2160 my ($self) = @_; 2219 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2220
2164 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2165 2222
2166 return unless $self->dirty; 2223 return unless $self->dirty;
2167 2224
2176 2233
2177 cf::async { 2234 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2235 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2180 }; 2237 };
2238
2239 cf::get_slot 0.02;
2181 2240
2182 if ($uniq) { 2241 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2244 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2246 }
2188} 2247}
2189 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2190sub swap_out { 2257sub swap_out {
2191 my ($self) = @_; 2258 my ($self) = @_;
2192 2259
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2261
2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save};
2198 return if $self->players; 2264 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2265
2202 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2203
2204 $self->deactivate; 2267 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2206 $self->clear; 2275 $self->clear;
2207} 2276}
2208 2277
2209sub reset_at { 2278sub reset_at {
2210 my ($self) = @_; 2279 my ($self) = @_;
2229 2298
2230 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231 2300
2232 return if $self->players; 2301 return if $self->players;
2233 2302
2234 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2235 2304
2236 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2237 2306
2238 # need to save uniques path 2307 # need to save uniques path
2239 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2322 2391
2323sub unique_maps() { 2392sub unique_maps() {
2324 [ 2393 [
2325 map { 2394 map {
2326 utf8::decode $_; 2395 utf8::decode $_;
2327 /\.map$/ 2396 s/\.map$//; # TODO future compatibility hack
2397 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2398 ? ()
2328 ? normalise $_ 2399 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2401 ]
2332} 2402}
2333 2403
2334package cf; 2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2335 2435
2336=back 2436=back
2337 2437
2338=head3 cf::object 2438=head3 cf::object
2339 2439
2343 2443
2344=over 4 2444=over 4
2345 2445
2346=item $ob->inv_recursive 2446=item $ob->inv_recursive
2347 2447
2348Returns the inventory of the object _and_ their inventories, recursively. 2448Returns the inventory of the object I<and> their inventories, recursively,
2449but I<not> the object itself.
2349 2450
2350=cut 2451=cut
2351 2452
2352sub inv_recursive_; 2453sub inv_recursive_;
2353sub inv_recursive_ { 2454sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2459 inv_recursive_ inv $_[0]
2359} 2460}
2360 2461
2361=item $ref = $ob->ref 2462=item $ref = $ob->ref
2362 2463
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2464Creates and returns a persistent reference to an object that can be stored as a string.
2364 2465
2365=item $ob = cf::object::deref ($refstring) 2466=item $ob = cf::object::deref ($refstring)
2366 2467
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2468returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2469even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2501can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2502dialogue with the given NPC character.
2402 2503
2403=cut 2504=cut
2404 2505
2506our $SAY_CHANNEL = {
2507 id => "say",
2508 title => "Map",
2509 reply => "say ",
2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2511};
2512
2513our $CHAT_CHANNEL = {
2514 id => "chat",
2515 title => "Chat",
2516 reply => "chat ",
2517 tooltip => "Player chat and shouts, global to the server.",
2518};
2519
2405# rough implementation of a future "reply" method that works 2520# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2521# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2522#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2523sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2524 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2535 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2536 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2537
2423 } else { 2538 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2539 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2540 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2541 }
2427 } 2542 }
2428} 2543}
2429 2544
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2545=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2570
2456=item $player_object->enter_link 2571=item $player_object->enter_link
2457 2572
2458Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2459 2574
2460The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2462 2579
2463Will never block. 2580Will never block.
2464 2581
2465=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2466 2583
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2609
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2495 2612
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2614}
2498 2615
2499sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2501 2618
2518 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2520 2637
2521 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2524 2641
2525 $map->load; 2642 $map->load;
2526 $map->load_neighbours; 2643 $map->load_neighbours;
2527 2644
2528 return unless $self->contr->active; 2645 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2646
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2533} 2652}
2534 2653
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2655
2537Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2658that 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 2659the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2660be called at the end of this process.
2661
2662Note that $check will be called with a potentially non-loaded map, so if
2663it needs a loaded map it has to call C<< ->load >>.
2542 2664
2543=cut 2665=cut
2544 2666
2545our $GOTOGEN; 2667our $GOTOGEN;
2546 2668
2625} 2747}
2626 2748
2627sub prepare_random_map { 2749sub prepare_random_map {
2628 my ($exit) = @_; 2750 my ($exit) = @_;
2629 2751
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2752 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2753 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2754 # that depends on the exit object
2635 2755
2636 my $rmp = parse_random_map_params $exit->msg; 2756 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2758 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2759 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2760 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2761 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2762 $rmp->{origin_y} = $exit->y;
2763
2764 $exit->map->touch;
2643 } 2765 }
2644 2766
2645 $rmp->{random_seed} ||= $exit->random_seed; 2767 $rmp->{random_seed} ||= $exit->random_seed;
2646 2768
2647 my $data = cf::encode_json $rmp; 2769 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2770 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2771 my $meta = "$RANDOMDIR/$md5.meta";
2650 2772
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2773 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2774 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2775 undef $fh;
2654 aio_rename "$meta~", $meta; 2776 aio_rename "$meta~", $meta;
2655 2777
2778 my $slaying = "?random/$md5";
2779
2780 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2781 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2782 $exit->msg (undef);
2783 }
2658 } 2784 }
2659} 2785}
2660 2786
2661sub cf::object::player::enter_exit { 2787sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2788 my ($self, $exit) = @_;
2663 2789
2664 return unless $self->type == cf::PLAYER; 2790 return unless $self->type == cf::PLAYER;
2665 2791
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; 2792 $self->enter_link;
2678 2793
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 { 2794 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2795 $Coro::current->{desc} = "enter_exit";
2685 2796
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2797 unless (eval {
2798 $self->deactivate_recursive; # just to be sure
2799
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2809 my $x = $exit->stats->hp;
2810 my $y = $exit->stats->sp;
2811
2688 $self->goto ($slaying, $hp, $sp); 2812 $self->goto ($map, $x, $y);
2689 2813
2814 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y)
2816 if $exit->flag (cf::FLAG_DAMNED);
2817
2690 1; 2818 1
2691 }) { 2819 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2824
2697 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2714sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2716 2844
2717 utf8::encode $text; 2845 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2719} 2872}
2720 2873
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2875
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2880
2728=cut 2881=cut
2729 2882
2730# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2732 "c/identify" => { 2891 "c/identify" => {
2733 id => "infobox", 2892 id => "infobox",
2734 title => "Identify", 2893 title => "Identify",
2735 reply => undef, 2894 reply => undef,
2736 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2738 "c/examine" => { 2897 "c/examine" => {
2739 id => "infobox", 2898 id => "infobox",
2740 title => "Examine", 2899 title => "Examine",
2741 reply => undef, 2900 reply => undef,
2742 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2908 },
2744 "c/book" => { 2909 "c/book" => {
2745 id => "infobox", 2910 id => "infobox",
2746 title => "Book", 2911 title => "Book",
2747 reply => undef, 2912 reply => undef,
2763 id => "infobox", 2928 id => "infobox",
2764 title => "Body Parts", 2929 title => "Body Parts",
2765 reply => undef, 2930 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2767 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2768 "c/uptime" => { 2969 "c/uptime" => {
2769 id => "infobox", 2970 id => "infobox",
2770 title => "Uptime", 2971 title => "Uptime",
2771 reply => undef, 2972 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 2976 id => "infobox",
2776 title => "Map Info", 2977 title => "Map Info",
2777 reply => undef, 2978 reply => undef,
2778 tooltip => "Information related to the maps", 2979 tooltip => "Information related to the maps",
2779 }, 2980 },
2981 "c/party" => {
2982 id => "party",
2983 title => "Party",
2984 reply => "gsay ",
2985 tooltip => "Messages and chat related to your party",
2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2780); 2995);
2781 2996
2782sub cf::client::send_msg { 2997sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2784 2999
2785 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2786 3002
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3004
2789 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2792 3008
2793 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2797 3011
2798 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3017 }
2805 3018
2806 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2807 } 3020 }
2808 3021
2809 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2810 3023
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3024 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2815 3027
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3031 );
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 3032
2830 $color &= cf::NDI_COLOR_MASK; 3033 $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} 3034}
2844 3035
2845=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2846 3037
2847Sends an ext event to the client. 3038Sends an ext event to the client.
2850 3041
2851sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2853 3044
2854 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3050 }
2860} 3051}
2861 3052
2862=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2863 3054
2867 3058
2868sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2870 3061
2871 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3065 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3068 }
2878} 3069}
2879 3070
2880=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2881 3072
2982 3173
2983 $coro 3174 $coro
2984} 3175}
2985 3176
2986cf::client->attach ( 3177cf::client->attach (
2987 on_destroy => sub { 3178 on_client_destroy => sub {
2988 my ($ns) = @_; 3179 my ($ns) = @_;
2989 3180
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3182 },
2992); 3183);
3008our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3009 3200
3010$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3011 3202
3012$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3015 sort time 3206 sort time
3016)); 3207));
3017 3208
3018# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3021 3212
3022The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3023 3214
3024 cf::object 3215 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3217 insert remove name archname title slaying race decrease split
3218 value
3027 3219
3028 cf::object::player 3220 cf::object::player
3029 player 3221 player
3030 3222
3031 cf::player 3223 cf::player
3036 3228
3037=cut 3229=cut
3038 3230
3039for ( 3231for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3046) { 3238) {
3047 no strict 'refs'; 3239 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3067 3259
3068 my $qcode = $code; 3260 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3071 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3072 local $_; 3267 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3268
3075 my $eval = 3269 my $eval =
3076 "do {\n" 3270 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3273 . $code
3080 . "\n}" 3274 . "\n}"
3081 ; 3275 ;
3082 3276
3277 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3086 3286
3087 if ($@) { 3287 if ($@) {
3088 warn "$@"; 3288 warn "$@";
3089 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3109=cut 3309=cut
3110 3310
3111sub register_script_function { 3311sub register_script_function {
3112 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3113 3313
3114 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3116} 3316}
3117 3317
3118=back 3318=back
3119 3319
3120=cut 3320=cut
3141 3341
3142 $facedata->{version} == 2 3342 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3344
3145 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3348 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3351 };
3150 cf::cede_to_tick; 3352 cf::cede_to_tick;
3151 3353
3152 { 3354 {
3153 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3359
3158 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3364
3163 cf::cede_to_tick; 3365 cf::cede_to_tick;
3164 } 3366 }
3165 3367
3166 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3190 3392
3191 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3192 } 3394 }
3193 3395
3194 { 3396 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3198 3398
3199 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3402
3204 if ($info->{type} & 1) { 3403 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}; 3404 cf::face::set_type $idx, $info->{type};
3219 } else { 3405 } else {
3220 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3221 } 3407 }
3222 3408
3255 while (my ($k, $v) = each %$want) { 3441 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3442 $ns->fx_want ($k, $v);
3257 } 3443 }
3258}; 3444};
3259 3445
3446sub load_resource_file($) {
3447 my $guard = lock_acquire "load_resource_file";
3448
3449 my $status = load_resource_file_ $_[0];
3450 get_slot 0.1, 100;
3451 cf::arch::commit_load;
3452
3453 $status
3454}
3455
3260sub reload_regions { 3456sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3457 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3458 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3459 %ext::player_env::MUSIC_FACE_CACHE = ();
3264 3460
3277} 3473}
3278 3474
3279sub reload_archetypes { 3475sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3476 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3477 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} 3478}
3288 3479
3289sub reload_treasures { 3480sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3481 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3482 or die "unable to load treasurelists\n";
3292} 3483}
3293 3484
3294sub reload_resources { 3485sub reload_resources {
3295 warn "reloading resource files...\n"; 3486 warn "reloading resource files...\n";
3296 3487
3488 reload_facedata;
3489 reload_archetypes;
3297 reload_regions; 3490 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3491 reload_treasures;
3302 3492
3303 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3304} 3494}
3305 3495
3306sub init {
3307 reload_resources;
3308}
3309
3310sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3500 or return;
3313 3501
3314 local $/; 3502 local $/;
3315 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3316 3504
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3318 3506
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $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}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3325 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3326 }; 3514 };
3327 warn $@ if $@; 3515 warn $@ if $@;
3328 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3329} 3547}
3330 3548
3331sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3332 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3562 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3339 }; 3566 };
3340 3567
3568 evthread_start IO::AIO::poll_fileno;
3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3341 reload_config; 3580 reload_config;
3342 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3343 load_extensions; 3591 load_extensions;
3344 3592
3345 $TICK_WATCHER->start; 3593 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3594
3347 EV::loop; 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3348} 3606}
3349 3607
3350############################################################################# 3608#############################################################################
3351# initialisation and cleanup 3609# initialisation and cleanup
3352 3610
3353# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3354BEGIN { 3612BEGIN {
3355 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3359 }; 3617 };
3360 } 3618 }
3361} 3619}
3362 3620
3363sub write_runtime { 3621sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3365 3623
3366 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3368 3626
3369 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3628
3371 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3372 3630
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3632 or return;
3375 3633
3376 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3389 3647
3390 close $fh 3648 close $fh
3391 or return; 3649 or return;
3392 3650
3393 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3652 and return;
3395 3653
3396 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3655
3398 1 3656 1
3657}
3658
3659our $uuid_lock;
3660our $uuid_skip;
3661
3662sub write_uuid_sync($) {
3663 $uuid_skip ||= $_[0];
3664
3665 return if $uuid_lock;
3666 local $uuid_lock = 1;
3667
3668 my $uuid = "$LOCALDIR/uuid";
3669
3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3671 or return;
3672
3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0;
3682
3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3684 and return;
3685
3686 # always fsync - this file is important
3687 aio_fsync $fh
3688 and return;
3689
3690 close $fh
3691 or return;
3692
3693 aio_rename "$uuid~", $uuid
3694 and return;
3695
3696 warn "uuid file written ($value).\n";
3697
3698 1
3699
3700}
3701
3702sub write_uuid($$) {
3703 my ($skip, $sync) = @_;
3704
3705 $sync ? write_uuid_sync $skip
3706 : async { write_uuid_sync $skip };
3399} 3707}
3400 3708
3401sub emergency_save() { 3709sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3403 3711
3404 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3405 3713
3406 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3407 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3726 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3728 $pl->save;
3416 } 3729 }
3417 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3418 3731
3419 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3735 $map->valid or next;
3423 $map->save; 3736 $map->save;
3424 } 3737 }
3425 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3426 3739
3427 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3743
3744 warn "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n";
3430 }; 3747 };
3431 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3432 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3433} 3755}
3434 3756
3435sub post_cleanup { 3757sub post_cleanup {
3436 my ($make_core) = @_; 3758 my ($make_core) = @_;
3437 3759
3438 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3790 warn "cleared package $pkg\n";#d#
3440} 3791}
3441 3792
3442sub do_reload_perl() { 3793sub do_reload_perl() {
3443 # can/must only be called in main 3794 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3795 if ($Coro::current != $Coro::main) {
3445 warn "can only reload from main coroutine"; 3796 warn "can only reload from main coroutine";
3446 return; 3797 return;
3447 } 3798 }
3448 3799
3800 return if $RELOAD++;
3801
3802 my $t1 = AE::time;
3803
3804 while ($RELOAD) {
3449 warn "reloading..."; 3805 warn "reloading...";
3450 3806
3451 warn "entering sync_job"; 3807 warn "entering sync_job";
3452 3808
3453 cf::sync_job { 3809 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark 3810 cf::write_runtime_sync; # external watchdog should not bark
3455 cf::emergency_save; 3811 cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3457 3813
3458 warn "syncing database to disk"; 3814 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV; 3815 BDB::db_env_txn_checkpoint $DB_ENV;
3460 3816
3461 # if anything goes wrong in here, we should simply crash as we already saved 3817 # if anything goes wrong in here, we should simply crash as we already saved
3462 3818
3463 warn "flushing outstanding aio requests"; 3819 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; 3820 while (IO::AIO::nreqs || BDB::nreqs) {
3469 warn "iterate..."; 3821 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 } 3822 }
3495 3823
3496 warn "... nuking $pkg"; 3824 warn "cancelling all extension coros";
3497 Symbol::delete_package $pkg; 3825 $_->cancel for values %EXT_CORO;
3498 } 3826 %EXT_CORO = ();
3499 3827
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3828 warn "removing commands";
3501 while (my ($k, $v) = each %INC) { 3829 %COMMAND = ();
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3830
3831 warn "removing ext/exti commands";
3832 %EXTCMD = ();
3833 %EXTICMD = ();
3834
3835 warn "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) {
3504 warn "... unloading $k"; 3837 warn "... unloading $pkg";
3505 delete $INC{$k};
3506 3838
3507 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g;
3509
3510 if (my $cb = $k->can ("unload_module")) { 3839 if (my $cb = $pkg->can ("unload")) {
3840 eval {
3511 $cb->(); 3841 $cb->($pkg);
3842 1
3843 } or warn "$pkg unloaded, but with errors: $@";
3844 }
3845
3846 warn "... clearing $pkg";
3847 clear_package $pkg;
3512 } 3848 }
3513 3849
3514 Symbol::delete_package $k; 3850 warn "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853
3854 warn "... unloading $k";
3855 delete $INC{$k};
3856
3857 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g;
3859
3860 if (my $cb = $k->can ("unload_module")) {
3861 $cb->();
3862 }
3863
3864 clear_package $k;
3515 } 3865 }
3516 3866
3517 warn "getting rid of safe::, as good as possible"; 3867 warn "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3868 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3870
3521 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3874
3525 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3876 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3528 3878
3529 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3530 3880
3531 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3532 require cf; 3882 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3534 3884
3535 warn "loading config and database again"; 3885 warn "loading config and database again";
3536 cf::reload_config; 3886 cf::reload_config;
3537 3887
3538 warn "loading extensions"; 3888 warn "loading extensions";
3539 cf::load_extensions; 3889 cf::load_extensions;
3540 3890
3891 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3892 warn "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3893 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3894 warn "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3895 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3896 warn "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3897 reattach $_ for values %PLAYER;
3898 }
3547 3899
3900 warn "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902
3548 warn "leaving sync_job"; 3903 warn "leaving sync_job";
3549 3904
3550 1 3905 1
3551 } or do { 3906 } or do {
3552 warn $@; 3907 warn $@;
3553 warn "error while reloading, exiting."; 3908 cf::cleanup "error while reloading, exiting.";
3554 exit 1;
3555 }; 3909 };
3556 3910
3557 warn "reloaded"; 3911 warn "reloaded";
3912 --$RELOAD;
3913 }
3914
3915 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n";
3558}; 3917};
3559 3918
3560our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3561 3920
3562sub reload_perl() { 3921sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3922 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3565 3924
3925 $RELOAD_WATCHER ||= cf::async {
3926 Coro::AIO::aio_wait cache_extensions;
3927
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3567 do_reload_perl; 3929 do_reload_perl;
3568 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3931 };
3569 }; 3932 };
3570} 3933}
3571 3934
3572register_command "reload" => sub { 3935register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3936 my ($who, $arg) = @_;
3587 3950
3588our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3590 3953
3591sub wait_for_tick { 3954sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 3956
3595 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 3959 $signal->wait;
3598} 3960}
3599 3961
3600sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 3964
3604 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 3967 $signal->wait;
3607} 3968}
3608 3969
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3970sub tick {
3610 if ($Coro::current != $Coro::main) { 3971 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3972 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3613 return; 3974 return;
3614 } 3975 }
3615 3976
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3619 3978
3620 $RUNTIME += $TICK; 3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 3980
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 3983 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 3985 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 3986 or warn "ERROR: unable to write runtime file: $!";
3629 }; 3987 };
3630 } 3988 }
3631 3989
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3634 } 3992 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 3993 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 3994 $sig->send;
3637 } 3995 }
3638 3996
3639 $LOAD = ($NOW - $tick_start) / $TICK; 3997 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3998 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 3999
3642 _post_tick; 4000 if (0) {
3643}; 4001 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4002 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d#
4005 }
4006 }
4007}
3645 4008
3646{ 4009{
3647 # configure BDB 4010 # configure BDB
3648 4011
3649 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3652 4015
3653 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4018 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4019 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4020 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4021 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4022 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4023
3660 cf::sync_job { 4024 cf::sync_job {
3661 eval { 4025 eval {
3687{ 4051{
3688 # configure IO::AIO 4052 # configure IO::AIO
3689 4053
3690 IO::AIO::min_parallel 8; 4054 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4055 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4056 undef $AnyEvent::AIO::WATCHER;
3693} 4057}
3694 4058
3695my $_log_backtrace; 4059my $_log_backtrace;
3696 4060
3697sub _log_backtrace { 4061sub _log_backtrace {
3700 $msg =~ s/\n//; 4064 $msg =~ s/\n//;
3701 4065
3702 # limit the # of concurrent backtraces 4066 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4067 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4068 ++$_log_backtrace;
4069 my $perl_bt = Carp::longmess $msg;
3705 async { 4070 async {
3706 $Coro::current->{desc} = "abt $msg"; 4071 $Coro::current->{desc} = "abt $msg";
3707 4072
3708 my @bt = fork_call { 4073 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4074 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4085 }
3721 4086
3722 @funcs 4087 @funcs
3723 }; 4088 };
3724 4089
3725 LOG llevInfo, "[ABT] $msg\n"; 4090 LOG llevInfo, "[ABT] $perl_bt\n";
4091 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4092 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4093 --$_log_backtrace;
3728 }; 4094 };
3729 } else { 4095 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4098 }
3733} 4099}
3734 4100
3735# load additional modules 4101# load additional modules
3736use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3737 4104
3738END { cf::emergency_save } 4105END { cf::emergency_save }
3739 4106
37401 41071
3741 4108

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines