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.402 by root, Mon Dec 17 07:03:32 2007 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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; 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::Syck (); 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# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
74 115
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 118our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
81 120
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 124our $DB_ENV;
87 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
88our %CFG; 128our %CFG;
89 129
90our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 131our $RUNTIME;
92our $NOW; 132our $NOW;
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 140
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
103our $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 :)
104 150
105binmode STDOUT; 151binmode STDOUT;
106binmode STDERR; 152binmode STDERR;
107 153
108# read virtual server time, if available 154# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
113} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
114 162
115mkdir $_ 163mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 165
118our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
119 167
120sub 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::"} };
121 180
122############################################################################# 181#############################################################################
123 182
124=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
125 184
172returns 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
173per 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.
174 233
175=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
176 235
177This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 238that call.
180 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
181=back 246=back
182 247
183=cut 248=cut
184 249
185BEGIN { 250$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 251 my $msg = join "", @_;
188 252
189 $msg .= "\n" 253 $msg .= "\n"
190 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
191 255
192 $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;
193 257
194 LOG llevError, $msg; 258 LOG llevError, $msg;
195 }; 259};
196} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
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
272 Coro::terminate
273};
197 274
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 285for my $pkg (qw(
209 cf::global cf::attachable 286 cf::global cf::attachable
210 cf::object cf::object::player 287 cf::object cf::object::player
211 cf::client cf::player 288 cf::client cf::player
212 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
213 cf::map cf::party cf::region 291 cf::party cf::region
214)) { 292)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 294}
218 295
219$EV::DIED = sub { 296$EV::DIED = sub {
220 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
221}; 298};
222 299
223############################################################################# 300#############################################################################
224 301
225=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
262our $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
263 340
264sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
266 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
267=item cf::lock_wait $string 358=item cf::lock_wait $string
268 359
269Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
270 361
271=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
272 363
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
276returned. 367returned.
277 368
278Locks 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
279deadlocked coro. 370deadlocked coro.
285 376
286Return 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.
287 378
288=cut 379=cut
289 380
290our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 382
293sub lock_wait($) { 383sub lock_wait($) {
294 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 385}
307 386
308sub lock_acquire($) { 387sub lock_acquire($) {
309 my ($key) = @_; 388 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 389}
323 390
324sub lock_active($) { 391sub lock_active($) {
325 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 393}
329 394
330sub freeze_mainloop { 395sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
332 397
333 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 399}
339 400
340=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
341 402
342Like 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
365 426
366=cut 427=cut
367 428
368our @SLOT_QUEUE; 429our @SLOT_QUEUE;
369our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
370 432
371$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
374 436
375 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
376 439
377 while () { 440 while () {
378 next_job: 441 next_job:
442
379 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
380 if ($avail > 0.01) { 444
381 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
383 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send; 449 $job->[2]->send;
385 Coro::cede; 450 Coro::cede;
386 goto next_job; 451 goto next_job;
387 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
388 } 454 }
389 } 455 }
390 456
391 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
392 # 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
393 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait; 460 $signal->wait;
395 } else { 461 } else {
462 $busy = 0;
396 Coro::schedule; 463 Coro::schedule;
397 } 464 }
398 } 465 }
399}; 466};
400 467
401sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
402 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
403 472
404 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
405 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
406 476
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
436 506
437sub sync_job(&) { 507sub sync_job(&) {
438 my ($job) = @_; 508 my ($job) = @_;
439 509
440 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
441 my $time = EV::time; 511 my $time = AE::time;
442 512
443 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
445 515
446 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
447 517
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
451 519
452 my $busy = 1; 520 my $busy = 1;
453 my @res; 521 my @res;
454 522
465 } else { 533 } else {
466 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
467 } 535 }
468 } 536 }
469 537
470 $time = EV::time - $time; 538 my $time = AE::time - $time;
471 539
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
476 541
477 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
478 } else { 543 } else {
479 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
480 545
522 reset_signals; 587 reset_signals;
523 &$cb 588 &$cb
524 }, @args; 589 }, @args;
525 590
526 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594=item $coin = coin_from_name $name
595
596=cut
597
598our %coin_alias = (
599 "silver" => "silvercoin",
600 "silvercoin" => "silvercoin",
601 "silvercoins" => "silvercoin",
602 "gold" => "goldcoin",
603 "goldcoin" => "goldcoin",
604 "goldcoins" => "goldcoin",
605 "platinum" => "platinacoin",
606 "platinumcoin" => "platinacoin",
607 "platinumcoins" => "platinacoin",
608 "platina" => "platinacoin",
609 "platinacoin" => "platinacoin",
610 "platinacoins" => "platinacoin",
611 "royalty" => "royalty",
612 "royalties" => "royalty",
613);
614
615sub coin_from_name($) {
616 $coin_alias{$_[0]}
617 ? cf::arch::find $coin_alias{$_[0]}
618 : undef
527} 619}
528 620
529=item $value = cf::db_get $family => $key 621=item $value = cf::db_get $family => $key
530 622
531Returns a single value from the environment database. 623Returns a single value from the environment database.
670 762
671############################################################################# 763#############################################################################
672 764
673=head2 ATTACHABLE OBJECTS 765=head2 ATTACHABLE OBJECTS
674 766
675Many objects in crossfire are so-called attachable objects. That means you can 767Many objects in deliantra are so-called attachable objects. That means you can
676attach callbacks/event handlers (a collection of which is called an "attachment") 768attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 769to it. All such attachable objects support the following methods.
678 770
679In the following description, CLASS can be any of C<global>, C<object> 771In the following description, CLASS can be any of C<global>, C<object>
680C<player>, C<client> or C<map> (i.e. the attachable objects in 772C<player>, C<client> or C<map> (i.e. the attachable objects in
730=item cf::CLASS::attachment $name, ... 822=item cf::CLASS::attachment $name, ...
731 823
732Register an attachment by C<$name> through which attachable objects of the 824Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 825given CLASS can refer to this attachment.
734 826
735Some classes such as crossfire maps and objects can specify attachments 827Some classes such as deliantra maps and objects can specify attachments
736that are attached at load/instantiate time, thus the need for a name. 828that are attached at load/instantiate time, thus the need for a name.
737 829
738These calls expect any number of the following handler/hook descriptions: 830These calls expect any number of the following handler/hook descriptions:
739 831
740=over 4 832=over 4
968 } 1060 }
969 1061
970 0 1062 0
971} 1063}
972 1064
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1065=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1066
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1067=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1068
977Generate an object-specific event with the given arguments. 1069Generate an object-specific event with the given arguments.
978 1070
1031 1123
1032sub reattach { 1124sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1125 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1126 my ($obj) = @_;
1035 1127
1128 # no longer needed after getting rid of delete_package?
1036 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1129 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1037 1130
1038 my $registry = $obj->registry; 1131 my $registry = $obj->registry;
1039 1132
1040 @$registry = (); 1133 @$registry = ();
1041 1134
1087 utf8::decode (my $decname = $filename); 1180 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1181 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1090 1183
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1095 close $fh; 1191 aio_close $fh;
1096 1192
1097 if (@$objs) { 1193 if (@$objs) {
1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1099 chmod SAVE_MODE, $fh; 1195 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1102 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 }
1103 close $fh; 1202 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1204 }
1106 } else { 1205 } else {
1107 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
1108 } 1207 }
1109 1208
1110 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1210
1211 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1213 } else {
1112 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1113 } 1215 }
1114 } else { 1216 } else {
1115 aio_unlink $filename; 1217 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1117 } 1219 }
1208 my ($name, $cb) = @_; 1310 my ($name, $cb) = @_;
1209 1311
1210 $EXTICMD{$name} = $cb; 1312 $EXTICMD{$name} = $cb;
1211} 1313}
1212 1314
1315use File::Glob ();
1316
1213cf::player->attach ( 1317cf::player->attach (
1214 on_command => sub { 1318 on_unknown_command => sub {
1215 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1216 1320
1217 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1218 or return; 1322 or return;
1219 1323
1249 1353
1250 cf::override; 1354 cf::override;
1251 }, 1355 },
1252); 1356);
1253 1357
1358# "readahead" all extensions
1359sub cache_extensions {
1360 my $grp = IO::AIO::aio_group;
1361
1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1363 for (grep /\.ext$/, @{$_[0]}) {
1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1365 }
1366 };
1367
1368 $grp
1369}
1370
1254sub load_extensions { 1371sub load_extensions {
1255 cf::sync_job { 1372 cf::sync_job {
1256 my %todo; 1373 my %todo;
1257 1374
1258 for my $path (<$LIBDIR/*.ext>) { 1375 for my $path (<$LIBDIR/*.ext>) {
1277 1394
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1397
1281 $ext{source} = 1398 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1400 . "#line 1 \"$path\"\n{\n"
1284 . $source 1401 . $source
1285 . "\n};\n1"; 1402 . "\n};\n1";
1286 1403
1287 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1288 } 1405 }
1289 1406
1407 my $pass = 0;
1290 my %done; 1408 my %done;
1291 while (%todo) { 1409 while (%todo) {
1292 my $progress; 1410 my $progress;
1293 1411
1412 ++$pass;
1413
1414 ext:
1294 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip 1417 next ext
1297 unless exists $done{$_}; 1418 unless exists $done{$_};
1298 } 1419 }
1299 1420
1300 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1301 1422
1302 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1303 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1304 : "$v->{base}: extension inactive.\n";
1305 1427
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1306 if (exists $v->{meta}{mandatory}) { 1429 if exists $v->{meta}{mandatory};
1307 warn $msg; 1430 } else {
1308 warn "mandatory extension failed to load, exiting.\n"; 1431 $done{$k} = delete $todo{$k};
1309 exit 1; 1432 push @EXTS, $v->{pkg};
1310 } 1433 $progress = 1;
1311 1434
1312 warn $msg; 1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1313 } 1437 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
1318 } 1438 }
1319 1439
1320 skip: 1440 unless ($progress) {
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1322 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1323 } 1448 }
1324 }; 1449 };
1325} 1450}
1326 1451
1327############################################################################# 1452#############################################################################
1328 1453
1329=back 1454=back
1330 1455
1331=head2 CORE EXTENSIONS 1456=head2 CORE EXTENSIONS
1332 1457
1333Functions and methods that extend core crossfire objects. 1458Functions and methods that extend core deliantra objects.
1334 1459
1335=cut 1460=cut
1336 1461
1337package cf::player; 1462package cf::player;
1338 1463
1381 1506
1382sub exists($) { 1507sub exists($) {
1383 my ($login) = @_; 1508 my ($login) = @_;
1384 1509
1385 $cf::PLAYER{$login} 1510 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1511 or !aio_stat path $login
1387} 1512}
1388 1513
1389sub find($) { 1514sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1515 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1516 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1528 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1529 or return;
1405 1530
1406 my $pl = cf::player::load_pl $f 1531 my $pl = cf::player::load_pl $f
1407 or return; 1532 or return;
1533
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1534 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1535 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1411 } 1537 }
1412 } 1538 }
1413} 1539}
1414 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1415sub save($) { 1554sub save($) {
1416 my ($pl) = @_; 1555 my ($pl) = @_;
1417 1556
1418 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1419 1558
1422 1561
1423 return if $pl->{deny_save}; 1562 return if $pl->{deny_save};
1424 1563
1425 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1426 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1566
1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1427 1571
1428 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1573 cf::cede_to_tick;
1430} 1574}
1431 1575
1463 my ($pl) = @_; 1607 my ($pl) = @_;
1464 1608
1465 my $name = $pl->ob->name; 1609 my $name = $pl->ob->name;
1466 1610
1467 $pl->{deny_save} = 1; 1611 $pl->{deny_save} = 1;
1468 $pl->password ("*"); # this should lock out the player until we nuked the dir 1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1469 1613
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1615 $pl->deactivate;
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1618 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1619 $pl->ns->destroy if $pl->ns;
1474 1620
1475 my $path = playerdir $pl; 1621 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1622 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1661
1516 for my $login (@$dirs) { 1662 for my $login (@$dirs) {
1517 my $path = path $login; 1663 my $path = path $login;
1518 1664
1519 # a .pst is a dead give-away for a valid player 1665 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1666 # if no pst file found, open and chekc for blocked users
1667 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1668 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1669 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1670 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1671 }
1525 1672
1556 } 1703 }
1557 1704
1558 \@paths 1705 \@paths
1559} 1706}
1560 1707
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1708=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1709
1563Expand crossfire pod fragments into protocol xml. 1710Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1711
1654=item $player->ext_reply ($msgid, @msg) 1712=item $player->ext_reply ($msgid, @msg)
1655 1713
1656Sends an ext reply to the player. 1714Sends an ext reply to the player.
1657 1715
1724our $MAX_RESET = 3600; 1782our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1783our $DEFAULT_RESET = 3000;
1726 1784
1727sub generate_random_map { 1785sub generate_random_map {
1728 my ($self, $rmp) = @_; 1786 my ($self, $rmp) = @_;
1787
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789
1729 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1791 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1855 1916
1856# the temporary/swap location 1917# the temporary/swap location
1857sub save_path { 1918sub save_path {
1858 my ($self) = @_; 1919 my ($self) = @_;
1859 1920
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1921 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1922 "$TMPDIR/$path.map"
1862} 1923}
1863 1924
1864# the unique path, undef == no special unique path 1925# the unique path, undef == no special unique path
1865sub uniq_path { 1926sub uniq_path {
1866 my ($self) = @_; 1927 my ($self) = @_;
1867 1928
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1930 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1931}
1880 1932
1881sub decay_objects { 1933sub decay_objects {
1882 my ($self) = @_; 1934 my ($self) = @_;
1883 1935
1967sub find { 2019sub find {
1968 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
1969 2021
1970 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
1971 2023
1972 cf::lock_wait "map_data:$path";#d#remove 2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2026
1975 $cf::MAP{$path} || do { 2027 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 2028 my $map = new_from_path cf::map $path
1980 or return; 2029 or return;
1981 2030
1982 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
1983 2032
1985 or return; 2034 or return;
1986 2035
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2036 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2037 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2038 #$cf::WAIT_FOR_TICK->wait;
2039 undef $guard2;
1990 undef $guard1; 2040 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2041 $map->reset;
1993 return find $path; 2042 return find $path;
1994 } 2043 }
1995 2044
1996 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
1997 } 2046 }
1998} 2047}
1999 2048
2000sub pre_load { } 2049sub pre_load { }
2001sub post_load { } 2050#sub post_load { } # XS
2002 2051
2003sub load { 2052sub load {
2004 my ($self) = @_; 2053 my ($self) = @_;
2005 2054
2006 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2072 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2073 $f->skip_block;
2025 $self->_load_objects ($f) 2074 $self->_load_objects ($f)
2026 or return; 2075 or return;
2027 2076
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2077 $self->post_load_original
2029 if delete $self->{load_original}; 2078 if delete $self->{load_original};
2030 2079
2031 if (my $uniq = $self->uniq_path) { 2080 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2081 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2082 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2101 $self->decay_objects;
2053 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
2054 $self->update_buttons; 2103 $self->update_buttons;
2055 cf::cede_to_tick; 2104 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2105 $self->activate;
2059 } 2106 }
2060 2107
2061 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
2063 2110
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2111 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2112 }
2066 2113
2067 $self->post_load; 2114 $self->post_load;
2068} 2115}
2069 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
2070sub customise_for { 2120sub customise_for {
2071 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
2072 2122
2073 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2124 if $self->per_player;
2127 my ($path, $origin, $load) = @_; 2177 my ($path, $origin, $load) = @_;
2128 2178
2129 $path = normalise $path, $origin && $origin->{path}; 2179 $path = normalise $path, $origin && $origin->{path};
2130 2180
2131 if (my $map = $cf::MAP{$path}) { 2181 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2183 }
2134 2184
2135 $MAP_PREFETCH{$path} |= $load; 2185 $MAP_PREFETCH{$path} |= $load;
2136 2186
2137 $MAP_PREFETCHER ||= cf::async { 2187 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2224 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2225 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2226 $_->contr->save for $self->players;
2177 }; 2227 };
2178 2228
2229 cf::get_slot 0.02;
2230
2179 if ($uniq) { 2231 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2233 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2234 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2191 $self->save; 2243 $self->save;
2192 2244
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2246
2195 return if $self->players; 2247 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2248 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2249 return if $self->{deny_save};
2198 2250
2199 $self->in_memory (cf::MAP_SWAPPED); 2251 $self->in_memory (cf::MAP_SWAPPED);
2200 2252
2201 $self->deactivate; 2253 $self->deactivate;
2226 2278
2227 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2280
2229 return if $self->players; 2281 return if $self->players;
2230 2282
2231 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2232 2284
2233 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2234 2286
2235 # need to save uniques path 2287 # need to save uniques path
2236 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
2319 2371
2320sub unique_maps() { 2372sub unique_maps() {
2321 [ 2373 [
2322 map { 2374 map {
2323 utf8::decode $_; 2375 utf8::decode $_;
2324 /\.map$/ 2376 s/\.map$//; # TODO future compatibility hack
2377 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2378 ? ()
2325 ? normalise $_ 2379 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2381 ]
2329} 2382}
2330 2383
2331package cf; 2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2332 2415
2333=back 2416=back
2334 2417
2335=head3 cf::object 2418=head3 cf::object
2336 2419
2340 2423
2341=over 4 2424=over 4
2342 2425
2343=item $ob->inv_recursive 2426=item $ob->inv_recursive
2344 2427
2345Returns the inventory of the object _and_ their inventories, recursively. 2428Returns the inventory of the object I<and> their inventories, recursively,
2429but I<not> the object itself.
2346 2430
2347=cut 2431=cut
2348 2432
2349sub inv_recursive_; 2433sub inv_recursive_;
2350sub inv_recursive_ { 2434sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2439 inv_recursive_ inv $_[0]
2356} 2440}
2357 2441
2358=item $ref = $ob->ref 2442=item $ref = $ob->ref
2359 2443
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2444Creates and returns a persistent reference to an object that can be stored as a string.
2361 2445
2362=item $ob = cf::object::deref ($refstring) 2446=item $ob = cf::object::deref ($refstring)
2363 2447
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2448returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2449even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2481can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2482dialogue with the given NPC character.
2399 2483
2400=cut 2484=cut
2401 2485
2486our $SAY_CHANNEL = {
2487 id => "say",
2488 title => "Map",
2489 reply => "say ",
2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2491};
2492
2493our $CHAT_CHANNEL = {
2494 id => "chat",
2495 title => "Chat",
2496 reply => "chat ",
2497 tooltip => "Player chat and shouts, global to the server.",
2498};
2499
2402# rough implementation of a future "reply" method that works 2500# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2501# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2502#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2503sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2504 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2515 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2516 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2517
2420 } else { 2518 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2519 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2520 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2521 }
2424 } 2522 }
2425} 2523}
2426 2524
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2525=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2550
2453=item $player_object->enter_link 2551=item $player_object->enter_link
2454 2552
2455Freezes the player and moves him/her to a special map (C<{link}>). 2553Freezes the player and moves him/her to a special map (C<{link}>).
2456 2554
2457The player should be reasonably safe there for short amounts of time. You 2555The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2556for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link
2558map.
2459 2559
2460Will never block. 2560Will never block.
2461 2561
2462=item $player_object->leave_link ($map, $x, $y) 2562=item $player_object->leave_link ($map, $x, $y)
2463 2563
2515 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2517 2617
2518 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2521 2621
2522 $map->load; 2622 $map->load;
2523 $map->load_neighbours; 2623 $map->load_neighbours;
2524 2624
2525 return unless $self->contr->active; 2625 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2626
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2530} 2632}
2531 2633
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2635
2534Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2637her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2638that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2639the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2640be called at the end of this process.
2641
2642Note that $check will be called with a potentially non-loaded map, so if
2643it needs a loaded map it has to call C<< ->load >>.
2539 2644
2540=cut 2645=cut
2541 2646
2542our $GOTOGEN; 2647our $GOTOGEN;
2543 2648
2622} 2727}
2623 2728
2624sub prepare_random_map { 2729sub prepare_random_map {
2625 my ($exit) = @_; 2730 my ($exit) = @_;
2626 2731
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2732 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2733 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2734 # that depends on the exit object
2632 2735
2633 my $rmp = parse_random_map_params $exit->msg; 2736 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2738 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2739 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2740 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2741 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2742 $rmp->{origin_y} = $exit->y;
2743
2744 $exit->map->touch;
2640 } 2745 }
2641 2746
2642 $rmp->{random_seed} ||= $exit->random_seed; 2747 $rmp->{random_seed} ||= $exit->random_seed;
2643 2748
2644 my $data = cf::encode_json $rmp; 2749 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2750 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2751 my $meta = "$RANDOMDIR/$md5.meta";
2647 2752
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2753 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2754 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2755 undef $fh;
2651 aio_rename "$meta~", $meta; 2756 aio_rename "$meta~", $meta;
2652 2757
2758 my $slaying = "?random/$md5";
2759
2760 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2761 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2762 $exit->msg (undef);
2763 }
2655 } 2764 }
2656} 2765}
2657 2766
2658sub cf::object::player::enter_exit { 2767sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2768 my ($self, $exit) = @_;
2660 2769
2661 return unless $self->type == cf::PLAYER; 2770 return unless $self->type == cf::PLAYER;
2662 2771
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2772 $self->enter_link;
2675 2773
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2774 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2775 $Coro::current->{desc} = "enter_exit";
2682 2776
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2777 unless (eval {
2778 $self->deactivate_recursive; # just to be sure
2779
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2789 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp;
2791
2685 $self->goto ($slaying, $hp, $sp); 2792 $self->goto ($map, $x, $y);
2686 2793
2794 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y)
2796 if $exit->flag (cf::FLAG_DAMNED);
2797
2687 1; 2798 1
2688 }) { 2799 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2800 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2801 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2802 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2803 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2804
2694 warn "ERROR in enter_exit: $@"; 2805 warn "ERROR in enter_exit: $@";
2711sub cf::client::send_drawinfo { 2822sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2823 my ($self, $text, $flags) = @_;
2713 2824
2714 utf8::encode $text; 2825 utf8::encode $text;
2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2716} 2852}
2717 2853
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 2855
2720Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2724 2860
2725=cut 2861=cut
2726 2862
2727# non-persistent channels (usually the info channel) 2863# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2729 "c/identify" => { 2871 "c/identify" => {
2730 id => "infobox", 2872 id => "infobox",
2731 title => "Identify", 2873 title => "Identify",
2732 reply => undef, 2874 reply => undef,
2733 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
2735 "c/examine" => { 2877 "c/examine" => {
2736 id => "infobox", 2878 id => "infobox",
2737 title => "Examine", 2879 title => "Examine",
2738 reply => undef, 2880 reply => undef,
2739 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2740 }, 2888 },
2741 "c/book" => { 2889 "c/book" => {
2742 id => "infobox", 2890 id => "infobox",
2743 title => "Book", 2891 title => "Book",
2744 reply => undef, 2892 reply => undef,
2760 id => "infobox", 2908 id => "infobox",
2761 title => "Body Parts", 2909 title => "Body Parts",
2762 reply => undef, 2910 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2911 tooltip => "Shows which body parts you posess and are available",
2764 }, 2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2919 "c/skills" => {
2920 id => "infobox",
2921 title => "Skills",
2922 reply => undef,
2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2948 },
2765 "c/uptime" => { 2949 "c/uptime" => {
2766 id => "infobox", 2950 id => "infobox",
2767 title => "Uptime", 2951 title => "Uptime",
2768 reply => undef, 2952 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2953 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2956 id => "infobox",
2773 title => "Map Info", 2957 title => "Map Info",
2774 reply => undef, 2958 reply => undef,
2775 tooltip => "Information related to the maps", 2959 tooltip => "Information related to the maps",
2776 }, 2960 },
2961 "c/party" => {
2962 id => "party",
2963 title => "Party",
2964 reply => "gsay ",
2965 tooltip => "Messages and chat related to your party",
2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2777); 2975);
2778 2976
2779sub cf::client::send_msg { 2977sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2979
2782 $msg = $self->pl->expand_cfpod ($msg); 2980 $msg = $self->pl->expand_cfpod ($msg)
2981 unless $color & cf::NDI_VERBATIM;
2783 2982
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2983 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2984
2786 # check predefined channels, for the benefit of C 2985 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2986 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2987 $channel = $CHANNEL{$channel};
2789 2988
2790 $self->ext_msg (channel_info => $channel) 2989 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2990 $channel = $channel->{id};
2794 2991
2795 } elsif (ref $channel) { 2992 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2996 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2997 }
2802 2998
2803 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2804 } 3000 }
2805 3001
2806 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2807 3003
2808 if ($self->can_msg) {
2809 # default colour, mask it out 3004 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2812 3007
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3008 my $pkt = "msg "
3009 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 3011 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 3012
2827 $color &= cf::NDI_COLOR_MASK; 3013 $self->send_big_packet ($pkt);
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840} 3014}
2841 3015
2842=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2843 3017
2844Sends an ext event to the client. 3018Sends an ext event to the client.
2847 3021
2848sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2850 3024
2851 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 3030 }
2857} 3031}
2858 3032
2859=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2860 3034
2864 3038
2865sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2867 3041
2868 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3045 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3048 }
2875} 3049}
2876 3050
2877=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2878 3052
2979 3153
2980 $coro 3154 $coro
2981} 3155}
2982 3156
2983cf::client->attach ( 3157cf::client->attach (
2984 on_destroy => sub { 3158 on_client_destroy => sub {
2985 my ($ns) = @_; 3159 my ($ns) = @_;
2986 3160
2987 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2988 }, 3162 },
2989); 3163);
3005our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
3006 3180
3007$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
3008 3182
3009$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
3011 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
3012 sort time 3186 sort time
3013)); 3187));
3014 3188
3015# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
3018 3192
3019The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
3020 3194
3021 cf::object 3195 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3196 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3197 insert remove name archname title slaying race decrease split
3198 value
3024 3199
3025 cf::object::player 3200 cf::object::player
3026 player 3201 player
3027 3202
3028 cf::player 3203 cf::player
3033 3208
3034=cut 3209=cut
3035 3210
3036for ( 3211for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3214 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
3043) { 3218) {
3044 no strict 'refs'; 3219 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 3239
3065 my $qcode = $code; 3240 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
3068 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
3069 local $_; 3247 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars;
3071 3248
3072 my $eval = 3249 my $eval =
3073 "do {\n" 3250 "do {\n"
3074 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3075 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
3076 . $code 3253 . $code
3077 . "\n}" 3254 . "\n}"
3078 ; 3255 ;
3079 3256
3257 if ($CFG{safe_eval}) {
3080 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
3081 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3082 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
3083 3266
3084 if ($@) { 3267 if ($@) {
3085 warn "$@"; 3268 warn "$@";
3086 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
3087 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
3106=cut 3289=cut
3107 3290
3108sub register_script_function { 3291sub register_script_function {
3109 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
3110 3293
3111 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
3112 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
3113} 3296}
3114 3297
3115=back 3298=back
3116 3299
3117=cut 3300=cut
3138 3321
3139 $facedata->{version} == 2 3322 $facedata->{version} == 2
3140 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141 3324
3142 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3143 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC, 3328 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3146 }; 3331 };
3147 cf::cede_to_tick; 3332 cf::cede_to_tick;
3148 3333
3149 { 3334 {
3150 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
3151 3336
3152 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339
3154 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3158 3344
3159 cf::cede_to_tick; 3345 cf::cede_to_tick;
3160 } 3346 }
3161 3347
3162 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3349 next unless $info->{smooth};
3350
3164 my $idx = cf::face::find $face 3351 my $idx = cf::face::find $face
3165 or next; 3352 or next;
3353
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3354 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3355 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3357 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3358 warn "smooth face '$info->{smooth}' not found for face '$face'";
3184 3372
3185 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3186 } 3374 }
3187 3375
3188 { 3376 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3192 3378
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3380 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198 3382
3199 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3200 # prepend meta info 3384 cf::face::set_type $idx, $info->{type};
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else { 3385 } else {
3209 $data = $info->{data}; 3386 $RESOURCE{$name} = $info;
3210 } 3387 }
3211 3388
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3389 cf::cede_to_tick;
3216 } 3390 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3391 }
3392
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3394
3237 1 3395 1
3238} 3396}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3239 3417
3240register_exticmd fx_want => sub { 3418register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3419 my ($ns, $want) = @_;
3242 3420
3243 while (my ($k, $v) = each %$want) { 3421 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3422 $ns->fx_want ($k, $v);
3245 } 3423 }
3246}; 3424};
3425
3426sub load_resource_file($) {
3427 my $guard = lock_acquire "load_resource_file";
3428
3429 my $status = load_resource_file_ $_[0];
3430 get_slot 0.1, 100;
3431 cf::arch::commit_load;
3432
3433 $status
3434}
3247 3435
3248sub reload_regions { 3436sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3437 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3438 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3439 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3453}
3266 3454
3267sub reload_archetypes { 3455sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3456 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3457 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3458}
3276 3459
3277sub reload_treasures { 3460sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3461 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3462 or die "unable to load treasurelists\n";
3280} 3463}
3281 3464
3282sub reload_resources { 3465sub reload_resources {
3283 warn "reloading resource files...\n"; 3466 warn "reloading resource files...\n";
3284 3467
3468 reload_facedata;
3469 reload_archetypes;
3285 reload_regions; 3470 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3471 reload_treasures;
3290 3472
3291 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3292} 3474}
3293 3475
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3480 or return;
3301 3481
3302 local $/; 3482 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3304 3484
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3486
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3494 };
3315 warn $@ if $@; 3495 warn $@ if $@;
3316 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3499}
3500
3501sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!";
3504 flock $fh, &Fcntl::LOCK_EX
3505 or die "$PIDFILE: flock: $!";
3506 $fh
3507}
3508
3509# make sure only one server instance is running at any one time
3510sub atomic {
3511 my $fh = pidfile;
3512
3513 my $pid = <$fh>;
3514 kill 9, $pid if $pid > 0;
3515
3516 seek $fh, 0, 0;
3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3317} 3527}
3318 3528
3319sub main { 3529sub main {
3530 cf::init_globals; # initialise logging
3531
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543
3320 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3547 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3548 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3549 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3550 })->prio (Coro::PRIO_MAX);
3327 }; 3551 };
3328 3552
3553 evthread_start IO::AIO::poll_fileno;
3554
3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3559 reload_resources;
3329 reload_config; 3560 reload_config;
3330 db_init; 3561 db_init;
3562
3563 cf::init_uuid;
3564 cf::init_signals;
3565 cf::init_skills;
3566
3567 cf::init_beforeplay;
3568
3569 atomic;
3570
3331 load_extensions; 3571 load_extensions;
3332 3572
3333 $TICK_WATCHER->start; 3573 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3574
3335 EV::loop; 3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578
3579 (pop @POST_INIT)->(0) while @POST_INIT;
3580 };
3581
3582 main_loop;
3336} 3583}
3337 3584
3338############################################################################# 3585#############################################################################
3339# initialisation and cleanup 3586# initialisation and cleanup
3340 3587
3341# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3342BEGIN { 3589BEGIN {
3343 our %SIGWATCHER = (); 3590 our %SIGWATCHER = ();
3344 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3345 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3346 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3347 }; 3594 };
3348 } 3595 }
3349} 3596}
3350 3597
3351sub write_runtime { 3598sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3599 my $t0 = AE::time;
3353 3600
3354 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3356 3603
3357 IO::AIO::aio_utime $runtime, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3605
3359 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3360 3607
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3362 or return; 3609 or return;
3363 3610
3364 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3623 aio_utime $fh, undef, undef;
3377 3624
3378 close $fh 3625 close $fh
3379 or return; 3626 or return;
3380 3627
3381 aio_rename "$runtime~", $runtime 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3629 and return;
3383 3630
3384 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3385 3632
3386 1 3633 1
3634}
3635
3636our $uuid_lock;
3637our $uuid_skip;
3638
3639sub write_uuid_sync($) {
3640 $uuid_skip ||= $_[0];
3641
3642 return if $uuid_lock;
3643 local $uuid_lock = 1;
3644
3645 my $uuid = "$LOCALDIR/uuid";
3646
3647 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3648 or return;
3649
3650 my $value = uuid_seq uuid_cur;
3651
3652 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n";
3654 return;
3655 }
3656
3657 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0;
3659
3660 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3661 and return;
3662
3663 # always fsync - this file is important
3664 aio_fsync $fh
3665 and return;
3666
3667 close $fh
3668 or return;
3669
3670 aio_rename "$uuid~", $uuid
3671 and return;
3672
3673 warn "uuid file written ($value).\n";
3674
3675 1
3676
3677}
3678
3679sub write_uuid($$) {
3680 my ($skip, $sync) = @_;
3681
3682 $sync ? write_uuid_sync $skip
3683 : async { write_uuid_sync $skip };
3387} 3684}
3388 3685
3389sub emergency_save() { 3686sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3687 my $freeze_guard = cf::freeze_mainloop;
3391 3688
3392 warn "enter emergency perl save\n"; 3689 warn "emergency_perl_save: enter\n";
3393 3690
3394 cf::sync_job { 3691 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696
3395 # use a peculiar iteration method to avoid tripping on perl 3697 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3698 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3699 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3700 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3701 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3702 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3703 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3705 $pl->save;
3404 } 3706 }
3405 warn "end emergency player save\n"; 3707 warn "emergency_perl_save: end player save\n";
3406 3708
3407 warn "begin emergency map save\n"; 3709 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3710 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3711 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3712 $map->valid or next;
3411 $map->save; 3713 $map->save;
3412 } 3714 }
3413 warn "end emergency map save\n"; 3715 warn "emergency_perl_save: end map save\n";
3414 3716
3415 warn "begin emergency database checkpoint\n"; 3717 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3718 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3719 warn "emergency_perl_save: end database checkpoint\n";
3720
3721 warn "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n";
3418 }; 3724 };
3419 3725
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3420 warn "leave emergency perl save\n"; 3731 warn "emergency_perl_save: leave\n";
3421} 3732}
3422 3733
3423sub post_cleanup { 3734sub post_cleanup {
3424 my ($make_core) = @_; 3735 my ($make_core) = @_;
3425 3736
3426 warn Carp::longmess "post_cleanup backtrace" 3737 warn Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3738 if $make_core;
3739
3740 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$;
3742}
3743
3744# a safer delete_package, copied from Symbol
3745sub clear_package($) {
3746 my $pkg = shift;
3747
3748 # expand to full symbol table name if needed
3749 unless ($pkg =~ /^main::.*::$/) {
3750 $pkg = "main$pkg" if $pkg =~ /^::/;
3751 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3752 $pkg .= '::' unless $pkg =~ /::$/;
3753 }
3754
3755 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3756 my $stem_symtab = *{$stem}{HASH};
3757
3758 defined $stem_symtab and exists $stem_symtab->{$leaf}
3759 or return;
3760
3761 # clear all symbols
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 }
3767 warn "cleared package $pkg\n";#d#
3428} 3768}
3429 3769
3430sub do_reload_perl() { 3770sub do_reload_perl() {
3431 # can/must only be called in main 3771 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3773 warn "can only reload from main coroutine";
3434 return; 3774 return;
3435 } 3775 }
3436 3776
3777 return if $RELOAD++;
3778
3779 my $t1 = AE::time;
3780
3781 while ($RELOAD) {
3437 warn "reloading..."; 3782 warn "reloading...";
3438 3783
3439 warn "entering sync_job"; 3784 warn "entering sync_job";
3440 3785
3441 cf::sync_job { 3786 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3787 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3788 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3789 cf::write_runtime_sync; # external watchdog should not bark
3445 3790
3446 warn "syncing database to disk"; 3791 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3792 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3793
3449 # if anything goes wrong in here, we should simply crash as we already saved 3794 # if anything goes wrong in here, we should simply crash as we already saved
3450 3795
3451 warn "flushing outstanding aio requests"; 3796 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3797 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3799 }
3483 3800
3484 warn "... nuking $pkg"; 3801 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3802 $_->cancel for values %EXT_CORO;
3486 } 3803 %EXT_CORO = ();
3487 3804
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3805 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3806 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3807
3808 warn "removing ext/exti commands";
3809 %EXTCMD = ();
3810 %EXTICMD = ();
3811
3812 warn "unloading/nuking all extensions";
3813 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3814 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3815
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3816 if (my $cb = $pkg->can ("unload")) {
3817 eval {
3499 $cb->(); 3818 $cb->($pkg);
3819 1
3820 } or warn "$pkg unloaded, but with errors: $@";
3821 }
3822
3823 warn "... clearing $pkg";
3824 clear_package $pkg;
3500 } 3825 }
3501 3826
3502 Symbol::delete_package $k; 3827 warn "unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830
3831 warn "... unloading $k";
3832 delete $INC{$k};
3833
3834 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g;
3836
3837 if (my $cb = $k->can ("unload_module")) {
3838 $cb->();
3839 }
3840
3841 clear_package $k;
3503 } 3842 }
3504 3843
3505 warn "getting rid of safe::, as good as possible"; 3844 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3845 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 3847
3509 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3851
3513 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3853 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3516 3855
3517 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3518 3857
3519 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3520 require cf; 3859 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3522 3861
3523 warn "loading config and database again"; 3862 warn "loading config and database again";
3524 cf::reload_config; 3863 cf::reload_config;
3525 3864
3526 warn "loading extensions"; 3865 warn "loading extensions";
3527 cf::load_extensions; 3866 cf::load_extensions;
3528 3867
3868 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3869 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3870 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3871 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3872 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3873 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3874 reattach $_ for values %PLAYER;
3875 }
3535 3876
3877 warn "running post_init jobs";
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879
3536 warn "leaving sync_job"; 3880 warn "leaving sync_job";
3537 3881
3538 1 3882 1
3539 } or do { 3883 } or do {
3540 warn $@; 3884 warn $@;
3541 warn "error while reloading, exiting."; 3885 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3886 };
3544 3887
3545 warn "reloaded"; 3888 warn "reloaded";
3889 --$RELOAD;
3890 }
3891
3892 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n";
3546}; 3894};
3547 3895
3548our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3549 3897
3550sub reload_perl() { 3898sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3899 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3553 3901
3902 $RELOAD_WATCHER ||= cf::async {
3903 Coro::AIO::aio_wait cache_extensions;
3904
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3906 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3908 };
3557 }; 3909 };
3558} 3910}
3559 3911
3560register_command "reload" => sub { 3912register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3913 my ($who, $arg) = @_;
3575 3927
3576our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3578 3930
3579sub wait_for_tick { 3931sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3933
3583 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3936 $signal->wait;
3586} 3937}
3587 3938
3588sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3941
3592 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3944 $signal->wait;
3595} 3945}
3596 3946
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3947sub tick {
3598 if ($Coro::current != $Coro::main) { 3948 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3949 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3601 return; 3951 return;
3602 } 3952 }
3603 3953
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3607 3955
3608 $RUNTIME += $TICK; 3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3609 $NEXT_TICK += $TICK;
3610 3957
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3960 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3962 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3963 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3964 };
3618 } 3965 }
3619 3966
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3969 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3970 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3971 $sig->send;
3625 } 3972 }
3626 3973
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3974 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3976
3630 _post_tick; 3977 if (0) {
3631}; 3978 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 3979 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d#
3982 }
3983 }
3984}
3633 3985
3634{ 3986{
3635 # configure BDB 3987 # configure BDB
3636 3988
3637 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3638 BDB::max_poll_reqs $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3991 $AnyEvent::BDB::WATCHER->priority (1);
3639 3992
3640 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643 | BDB::LOG_AUTOREMOVE, 1); 3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3997 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3998 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3999 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646 4000
3647 cf::sync_job { 4001 cf::sync_job {
3648 eval { 4002 eval {
3674{ 4028{
3675 # configure IO::AIO 4029 # configure IO::AIO
3676 4030
3677 IO::AIO::min_parallel 8; 4031 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 4032 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER;
3679} 4034}
3680 4035
3681my $_log_backtrace; 4036my $_log_backtrace;
3682 4037
3683sub _log_backtrace { 4038sub _log_backtrace {
3686 $msg =~ s/\n//; 4041 $msg =~ s/\n//;
3687 4042
3688 # limit the # of concurrent backtraces 4043 # limit the # of concurrent backtraces
3689 if ($_log_backtrace < 2) { 4044 if ($_log_backtrace < 2) {
3690 ++$_log_backtrace; 4045 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg;
3691 async { 4047 async {
3692 $Coro::current->{desc} = "abt $msg"; 4048 $Coro::current->{desc} = "abt $msg";
3693 4049
3694 my @bt = fork_call { 4050 my @bt = fork_call {
3695 @addr = map { sprintf "%x", $_ } @addr; 4051 @addr = map { sprintf "%x", $_ } @addr;
3706 } 4062 }
3707 4063
3708 @funcs 4064 @funcs
3709 }; 4065 };
3710 4066
3711 LOG llevInfo, "[ABT] $msg\n"; 4067 LOG llevInfo, "[ABT] $perl_bt\n";
4068 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712 LOG llevInfo, "[ABT] $_\n" for @bt; 4069 LOG llevInfo, "[ABT] $_\n" for @bt;
3713 --$_log_backtrace; 4070 --$_log_backtrace;
3714 }; 4071 };
3715 } else { 4072 } else {
3716 LOG llevInfo, "[ABT] $msg\n"; 4073 LOG llevInfo, "[ABT] $msg\n";
3717 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3718 } 4075 }
3719} 4076}
3720 4077
3721# load additional modules 4078# load additional modules
3722use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3723 4081
3724END { cf::emergency_save } 4082END { cf::emergency_save }
3725 4083
37261 40841
3727 4085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines