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.280 by root, Sat Jun 16 14:35:41 2007 UTC vs.
Revision 1.564 by elmex, Thu Apr 28 14:58:08 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
71 120
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 123our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
79 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
82 132
83our %CFG; 133our %CFG;
84 134
85our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 136our $RUNTIME;
137our $NOW;
87 138
88our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
91 142
92# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 145
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
98 155
99binmode STDOUT; 156binmode STDOUT;
100binmode STDERR; 157binmode STDERR;
101 158
102# read virtual server time, if available 159# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
107} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
108 167
109mkdir $_ 168mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 170
112our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
113 172
114sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
115 189
116############################################################################# 190#############################################################################
117 191
118=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
119 193
155 229
156The raw value load value from the last tick. 230The raw value load value from the last tick.
157 231
158=item %cf::CFG 232=item %cf::CFG
159 233
160Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 235from wherever your confdir points to.
162 236
163=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
164 238
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
248=item @cf::INVOKE_RESULTS
249
250This array contains the results of the last C<invoke ()> call. When
251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252that call.
253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
169=back 260=back
170 261
171=cut 262=cut
172 263
173BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
174 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
175 my $msg = join "", @_; 271 my $msg = join "", @_;
176 272
177 $msg .= "\n" 273 $msg .= "\n"
178 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
179 275
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 277
182 utf8::encode $msg;
183 LOG llevError, $msg; 278 LOG llevWarn, $msg;
184 }; 279};
185} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
186 294
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 305for my $pkg (qw(
198 cf::global cf::attachable 306 cf::global cf::attachable
199 cf::object cf::object::player 307 cf::object cf::object::player
200 cf::client cf::player 308 cf::client cf::player
201 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
202 cf::map cf::party cf::region 311 cf::party cf::region
203)) { 312)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 314}
207 315
208$Event::DIED = sub { 316$EV::DIED = sub {
209 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
210}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
324
325#############################################################################
211 326
212=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
213 328
214=over 4 329=over 4
215 330
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 350 $d
236 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
237} 352}
238 353
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working 354=item $scalar = load_file $path
240 355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
241=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
242 369
243Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
244 371
245=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
246 373
247Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
248 375
376=cut
377
378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
379
380sub encode_json($) { $json_coder->encode ($_[0]) }
381sub decode_json($) { $json_coder->decode ($_[0]) }
382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
249=item cf::lock_wait $string 445=item cf::lock_wait $string
250 446
251Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
252 448
253=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
254 450
255Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
258returned. 454returned.
259 455
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
260Lock names should begin with a unique identifier (for example, cf::map::find 459Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
262 461
263=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
264 463
265Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
266 465
267=cut 466=cut
268 467
269our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
270 469
271sub lock_wait($) { 470sub lock_wait($) {
272 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
273
274 # wait for lock, if any
275 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule;
278 }
279} 472}
280 473
281sub lock_acquire($) { 474sub lock_acquire($) {
282 my ($key) = @_; 475 $LOCKS->guard ($_[0])
283
284 # wait, to be sure we are not locked
285 lock_wait $key;
286
287 $LOCK{$key} = [];
288
289 Coro::guard {
290 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} };
292 }
293} 476}
294 477
295sub lock_active($) { 478sub lock_active($) {
296 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 480}
300 481
301sub freeze_mainloop { 482sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
303 484
304 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
305 $TICK_WATCHER->start; 486}
487
488=item cf::periodic $interval, $cb
489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
501}
502
503=item cf::get_slot $time[, $priority[, $name]]
504
505Allocate $time seconds of blocking CPU time at priority C<$priority>
506(default: 0): This call blocks and returns only when you have at least
507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
512
513The optional C<$name> can be used to identify the job to run. It might be
514used for statistical purposes and should identify the same time-class.
515
516Useful for short background jobs.
517
518=cut
519
520our @SLOT_QUEUE;
521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
523
524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
528 my $signal = new Coro::Signal;
529 my $busy;
530
531 while () {
532 next_job:
533
534 my $avail = cf::till_tick;
535
536 for (0 .. $#SLOT_QUEUE) {
537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
539 my $job = splice @SLOT_QUEUE, $_, 1, ();
540 $job->[2]->send;
541 Coro::cede;
542 goto next_job;
543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545 }
546 }
547
548 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal;
551 $signal->wait;
552 } else {
553 $busy = 0;
554 Coro::schedule;
555 }
306 }; 556 }
307 $TICK_WATCHER->stop; 557};
308 $guard 558
559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
562 my ($time, $pri, $name) = @_;
563
564 $time = clamp $time, 0.01, $TICK * .6;
565
566 my $sig = new Coro::Signal;
567
568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
570 $SLOT_QUEUE->ready;
571 $sig->wait;
309} 572}
310 573
311=item cf::async { BLOCK } 574=item cf::async { BLOCK }
312 575
313Currently the same as Coro::async_pool, meaning you cannot use 576Currently the same as Coro::async_pool, meaning you cannot use
318 581
319BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
320 583
321=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
322 585
323The design of crossfire+ requires that the main coro ($Coro::main) is 586The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 587is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
589acceptable.
326 590
327If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 593server will be frozen during this time, so the block should either finish
330fast or be very important. 594fast or be very important.
332=cut 596=cut
333 597
334sub sync_job(&) { 598sub sync_job(&) {
335 my ($job) = @_; 599 my ($job) = @_;
336 600
337 if ($Coro::current == $Coro::main) { 601 if (in_main) {
338 my $time = Event::time; 602 my $time = AE::time;
339 603
340 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
342 606
343 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 608
345 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
346 610
347 my $busy = 1; 611 my $busy = 1;
348 my @res; 612 my @res;
349 613
350 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 616 @res = eval { $job->() };
352 warn $@ if $@; 617 error $@ if $@;
353 undef $busy; 618 undef $busy;
354 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
355 620
356 while ($busy) { 621 while ($busy) {
357 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
358 } 626 }
627 }
359 628
360 $time = Event::time - $time; 629 my $time = AE::time - $time;
361 630
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
366 632
367 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
368 } else { 634 } else {
369 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
370 636
390 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
391 657
392 $coro 658 $coro
393} 659}
394 660
395sub write_runtime { 661=item fork_call { }, @args
396 my $runtime = "$LOCALDIR/runtime";
397 662
398 # first touch the runtime file to show we are still running: 663Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 664process, returning the results. Everything must be serialisable with
665Coro::Storable. May, of course, block. Note that the executed sub may
666never block itself or use any form of event handling.
400 667
401 IO::AIO::aio_utime $runtime, undef, undef; 668=cut
402 669
403 my $guard = cf::lock_acquire "write_runtime"; 670sub post_fork {
671 reset_signals;
672}
404 673
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 674sub fork_call(&@) {
406 or return; 675 my ($cb, @args) = @_;
407 676
408 my $value = $cf::RUNTIME + 90 + 10; 677 # we seemingly have to make a local copy of the whole thing,
409 # 10 is the runtime save interval, for a monotonic clock 678 # otherwise perl prematurely frees the stuff :/
410 # 60 allows for the watchdog to kill the server. 679 # TODO: investigate and fix (likely this will be rather laborious)
411 680
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 681 my @res = Coro::Util::fork_eval {
413 and return; 682 cf::post_fork;
683 &$cb
684 } @args;
414 685
415 # always fsync - this file is important 686 wantarray ? @res : $res[-1]
416 aio_fsync $fh 687}
417 and return;
418 688
419 # touch it again to show we are up-to-date 689sub objinfo {
420 aio_utime $fh, undef, undef;
421
422 close $fh
423 or return;
424
425 aio_rename "$runtime~", $runtime
426 and return;
427
428 warn "runtime file written.\n";
429
430 1 690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
725}
726
727=item $value = cf::db_get $family => $key
728
729Returns a single value from the environment database.
730
731=item cf::db_put $family => $key => $value
732
733Stores the given C<$value> in the family. It can currently store binary
734data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
735
736=item $db = cf::db_table "name"
737
738Create and/or open a new database table. The string must not be "db" and must be unique
739within each server.
740
741=cut
742
743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
747 my ($name) = @_;
748 my $db = BDB::db_create $DB_ENV;
749
750 eval {
751 $db->set_flags (BDB::CHKSUM);
752
753 utf8::encode $name;
754 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
755 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
756 cf::cleanup "db_open(db): $!" if $!;
757 };
758 cf::cleanup "db_open(db): $@" if $@;
759
760 $db
761}
762
763our $DB;
764
765sub db_init {
766 $DB ||= db_table "db";
767}
768
769sub db_get($$) {
770 my $key = "$_[0]/$_[1]";
771
772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
775 BDB::db_get $DB, undef, $key, my $data;
776
777 $! ? ()
778 : $data
779}
780
781sub db_put($$$) {
782 BDB::dbreq_pri 4;
783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
784}
785
786=item cf::cache $id => [$paths...], $processversion => $process
787
788Generic caching function that returns the value of the resource $id,
789caching and regenerating as required.
790
791This function can block.
792
793=cut
794
795sub cache {
796 my ($id, $src, $processversion, $process) = @_;
797
798 my $meta =
799 join "\x00",
800 $processversion,
801 map {
802 aio_stat $_
803 and Carp::croak "$_: $!";
804
805 ($_, (stat _)[7,9])
806 } @$src;
807
808 my $dbmeta = db_get cache => "$id/meta";
809 if ($dbmeta ne $meta) {
810 # changed, we may need to process
811
812 my @data;
813 my $md5;
814
815 for (0 .. $#$src) {
816 $data[$_] = load_file $src->[$_];
817 }
818
819 # if processing is expensive, check
820 # checksum first
821 if (1) {
822 $md5 =
823 join "\x00",
824 $processversion,
825 map {
826 cf::cede_to_tick;
827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
828 } 0.. $#$src;
829
830
831 my $dbmd5 = db_get cache => "$id/md5";
832 if ($dbmd5 eq $md5) {
833 db_put cache => "$id/meta", $meta;
834
835 return db_get cache => "$id/data";
836 }
837 }
838
839 my $t1 = Time::HiRes::time;
840 my $data = $process->(\@data);
841 my $t2 = Time::HiRes::time;
842
843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844
845 db_put cache => "$id/data", $data;
846 db_put cache => "$id/md5" , $md5;
847 db_put cache => "$id/meta", $meta;
848
849 return $data;
850 }
851
852 db_get cache => "$id/data"
431} 853}
432 854
433=item cf::datalog type => key => value, ... 855=item cf::datalog type => key => value, ...
434 856
435Log a datalog packet of the given type with the given key-value pairs. 857Log a datalog packet of the given type with the given key-value pairs.
436 858
437=cut 859=cut
438 860
439sub datalog($@) { 861sub datalog($@) {
440 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
442} 864}
443 865
444=back 866=back
445 867
446=cut 868=cut
447 869
448############################################################################# 870#############################################################################
449 871
450=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
451 873
452Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
455 877
456In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 880Deliantra).
459 881
460=over 4 882=over 4
461 883
462=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
463 885
507=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
508 930
509Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
511 933
512Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
514 936
515These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
516 938
517=over 4 939=over 4
641 1063
642 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
643 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
644 1066
645 } elsif (ref $type) { 1067 } elsif (ref $type) {
646 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
647 1069
648 } else { 1070 } else {
649 shift @arg; 1071 shift @arg;
650 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
651 } 1073 }
652 } 1074 }
653} 1075}
654 1076
655sub _object_attach { 1077sub _object_attach {
665 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
666 } 1088 }
667 1089
668 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
669 } else { 1091 } else {
670 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
671 } 1093 }
672 1094
673 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
674} 1096}
675 1097
715 "; 1137 ";
716 die if $@; 1138 die if $@;
717} 1139}
718 1140
719our $override; 1141our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1142our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1143
722sub override { 1144sub override {
723 $override = 1; 1145 $override = 1;
724 @invoke_results = (); 1146 @INVOKE_RESULTS = (@_);
725} 1147}
726 1148
727sub do_invoke { 1149sub do_invoke {
728 my $event = shift; 1150 my $event = shift;
729 my $callbacks = shift; 1151 my $callbacks = shift;
730 1152
731 @invoke_results = (); 1153 @INVOKE_RESULTS = ();
732 1154
733 local $override; 1155 local $override;
734 1156
735 for (@$callbacks) { 1157 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
737 1159
738 if ($@) { 1160 if ($@) {
739 warn "$@";
740 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
741 override; 1162 override;
742 } 1163 }
743 1164
744 return 1 if $override; 1165 return 1 if $override;
745 } 1166 }
746 1167
747 0 1168 0
748} 1169}
749 1170
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1172
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1174
754Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
755 1176
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1177This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1178removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1179results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1180
760=back 1181=back
761 1182
762=cut 1183=cut
763 1184
764############################################################################# 1185#############################################################################
765# object support 1186# object support
1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
1221sub _can_merge {
1222 my ($ob1, $ob2) = @_;
1223
1224 ++$SLOW_MERGES;#d#
1225
1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
1228}
766 1229
767sub reattach { 1230sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1232 my ($obj) = @_;
770 1233
1234 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1236
773 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
774 1238
775 @$registry = (); 1239 @$registry = ();
776 1240
781 for (@$attach) { 1245 for (@$attach) {
782 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
783 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
784 } 1248 }
785 } else { 1249 } else {
786 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
787 } 1251 }
788 } 1252 }
789} 1253}
790 1254
791cf::attachable->attach ( 1255cf::attachable->attach (
792 prio => -1000000, 1256 prio => -1000000,
793 on_instantiate => sub { 1257 on_instantiate => sub {
794 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
795 1259
796 $data = from_json $data; 1260 $data = decode_json $data;
797 1261
798 for (@$data) { 1262 for (@$data) {
799 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
800 1264
801 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
817sub object_freezer_save { 1281sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
819 1283
820 sync_job { 1284 sync_job {
821 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
824 1290
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
829 close $fh; 1298 aio_close $fh;
830 1299
831 if (@$objs) { 1300 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
837 close $fh; 1309 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
839 } 1311 }
840 } else { 1312 } else {
841 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
842 } 1314 }
843 1315
844 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1320 } else {
846 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
847 } 1322 }
848 } else { 1323 } else {
849 aio_unlink $filename; 1324 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
851 } 1326 }
852 } 1327 };
853} 1328}
854 1329
855sub object_freezer_as_string { 1330sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
857 1332
869 or return; 1344 or return;
870 1345
871 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
873 or return; 1348 or return;
1349
874 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
875 } 1352 }
876 1353
1354 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
879 return ($data, $av); 1359 ($data, $av)
880} 1360}
1361
1362=head2 COMMAND CALLBACKS
1363
1364=over 4
1365
1366=cut
881 1367
882############################################################################# 1368#############################################################################
883# command handling &c 1369# command handling &c
884 1370
885=item cf::register_command $name => \&callback($ob,$args); 1371=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1384 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1385}
900 1386
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1387=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1388
903Register a callbackf ro execution when the client sends an extcmd packet. 1389Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is
1392the logged-in player. Ext commands can only be processed after a player
1393has logged in successfully.
904 1394
905If the callback returns something, it is sent back as if reply was being 1395If the callback returns something, it is sent back as if reply was being
906called. 1396called.
907 1397
1398=item cf::register_exticmd $name => \&callback($ns,$packet);
1399
1400Register a callback for execution when the client sends an (asynchronous)
1401exticmd packet. Exti commands are processed by the server as soon as they
1402are received, i.e. out of order w.r.t. other commands. The first argument
1403is a client socket. Exti commands can be received anytime, even before
1404log-in.
1405
1406If the callback returns something, it is sent back as if reply was being
1407called.
1408
908=cut 1409=cut
909 1410
910sub register_extcmd { 1411sub register_extcmd {
911 my ($name, $cb) = @_; 1412 my ($name, $cb) = @_;
912 1413
913 $EXTCMD{$name} = $cb; 1414 $EXTCMD{$name} = $cb;
914} 1415}
915 1416
1417sub register_exticmd {
1418 my ($name, $cb) = @_;
1419
1420 $EXTICMD{$name} = $cb;
1421}
1422
1423use File::Glob ();
1424
916cf::player->attach ( 1425cf::player->attach (
917 on_command => sub { 1426 on_unknown_command => sub {
918 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
919 1428
920 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
921 or return; 1430 or return;
922 1431
927 cf::override; 1436 cf::override;
928 }, 1437 },
929 on_extcmd => sub { 1438 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1439 my ($pl, $buf) = @_;
931 1440
932 my $msg = eval { from_json $buf }; 1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1442
934 if (ref $msg) { 1443 if (ref $msg) {
1444 my ($type, $reply, @payload) =
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448
1449 my @reply;
1450
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1451 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1452 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
940 } else { 1458 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1460 }
943 1461
944 cf::override; 1462 cf::override;
945 }, 1463 },
946); 1464);
947 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
948sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
949 cf::sync_job { 1482 cf::sync_job {
950 my %todo; 1483 my %todo;
951 1484
952 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
953 next unless -r $path; 1486 next unless -r $path;
971 1504
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1507
975 $ext{source} = 1508 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
977 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
978 . $source 1511 . $source
979 . "\n};\n1"; 1512 . "\n};\n1";
980 1513
981 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
982 } 1515 }
983 1516
1517 my $pass = 0;
984 my %done; 1518 my %done;
985 while (%todo) { 1519 while (%todo) {
986 my $progress; 1520 my $progress;
987 1521
1522 ++$pass;
1523
1524 ext:
988 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1527 next ext
991 unless exists $done{$_}; 1528 unless exists $done{$_};
992 } 1529 }
993 1530
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
995 1532
996 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
998 : "$v->{base}: extension inactive.\n";
999 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1000 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1001 warn $msg; 1540
1002 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1003 exit 1; 1542 delete $todo{$k};
1004 } 1543 } else {
1005 1544 $done{$k} = delete $todo{$k};
1006 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1007 } 1550 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 $progress = 1;
1012 } 1551 }
1013 1552
1014 skip: 1553 unless ($progress) {
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1016 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1017 } 1563 }
1018 }; 1564 };
1019} 1565}
1020 1566
1021############################################################################# 1567#############################################################################
1022 1568
1569=back
1570
1023=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1024 1572
1025Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1026 1574
1027=cut 1575=cut
1028 1576
1029package cf::player; 1577package cf::player;
1030 1578
1031use Coro::AIO; 1579use Coro::AIO;
1032 1580
1033=head3 cf::player 1581=head3 cf::player
1034 1582
1035=over 4 1583=over 4
1584
1585=item cf::player::num_playing
1586
1587Returns the official number of playing players, as per the Crossfire metaserver rules.
1588
1589=cut
1590
1591sub num_playing {
1592 scalar grep
1593 $_->ob->map
1594 && !$_->hidden
1595 && !$_->ob->flag (cf::FLAG_WIZ),
1596 cf::player::list
1597}
1036 1598
1037=item cf::player::find $login 1599=item cf::player::find $login
1038 1600
1039Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1040 1602
1059 1621
1060sub exists($) { 1622sub exists($) {
1061 my ($login) = @_; 1623 my ($login) = @_;
1062 1624
1063 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1064 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1065} 1627}
1066 1628
1067sub find($) { 1629sub find($) {
1068 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1069 my $login = $_[0]; 1631 my $login = $_[0];
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1080 1642
1081 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1082 or return; 1644 or return;
1645
1646 my $pl = cf::player::load_pl $f
1647 or return;
1648
1649 local $cf::PLAYER_LOADING{$login} = $pl;
1650 $f->resolve_delayed_derefs;
1083 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1084 } 1652 }
1085 } 1653 }
1086} 1654}
1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1087 1668
1088sub save($) { 1669sub save($) {
1089 my ($pl) = @_; 1670 my ($pl) = @_;
1090 1671
1091 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1096 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1097 1678
1098 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1099 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1100 1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1686
1101 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1102 Coro::cede; 1688 cf::cede_to_tick;
1103} 1689}
1104 1690
1105sub new($) { 1691sub new($) {
1106 my ($login) = @_; 1692 my ($login) = @_;
1107 1693
1113 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1114 1700
1115 $self 1701 $self
1116} 1702}
1117 1703
1704=item $player->send_msg ($channel, $msg, $color, [extra...])
1705
1706=cut
1707
1708sub send_msg {
1709 my $ns = shift->ns
1710 or return;
1711 $ns->send_msg (@_);
1712}
1713
1118=item $pl->quit_character 1714=item $pl->quit_character
1119 1715
1120Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1121be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1122 1718
1126 my ($pl) = @_; 1722 my ($pl) = @_;
1127 1723
1128 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1129 1725
1130 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1131 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1132 1728
1133 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1134 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1135 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1136 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1137 1737
1138 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1139 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1140 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1175 or return []; 1775 or return [];
1176 1776
1177 my @logins; 1777 my @logins;
1178 1778
1179 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1780 my $path = path $login;
1781
1782 # a .pst is a dead give-away for a valid player
1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1180 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1181 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1182 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1183 1789
1184 utf8::decode $login; 1790 utf8::decode $login;
1185 push @logins, $login; 1791 push @logins, $login;
1186 } 1792 }
1187 1793
1188 \@logins 1794 \@logins
1189} 1795}
1190 1796
1191=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1192 1800
1193Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1194player. May block. 1802player. May block.
1195 1803
1196=cut 1804=cut
1208 for (@$files) { 1816 for (@$files) {
1209 utf8::decode $_; 1817 utf8::decode $_;
1210 next if /\.(?:pl|pst)$/; 1818 next if /\.(?:pl|pst)$/;
1211 next unless /^$PATH_SEP/o; 1819 next unless /^$PATH_SEP/o;
1212 1820
1213 push @paths, cf::map::normalise "~$pl/$_"; 1821 push @paths, cf::map::normalise "~$pl/$_", $pl->map;
1214 } 1822 }
1215 1823
1216 \@paths 1824 \@paths
1217} 1825}
1218 1826
1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828
1829Expand deliantra pod fragments into protocol xml.
1830
1219=item $player->ext_reply ($msgid, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1220 1832
1221Sends an ext reply to the player. 1833Sends an ext reply to the player.
1222 1834
1223=cut 1835=cut
1224 1836
1225sub ext_reply($$%) { 1837sub ext_reply($$@) {
1226 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1227 1839
1228 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1229
1230 $self->send ("ext " . cf::to_json \%msg);
1231} 1841}
1232 1842
1233=item $player->ext_event ($type, %msg) 1843=item $player->ext_msg ($type, @msg)
1234 1844
1235Sends an ext event to the client. 1845Sends an ext event to the client.
1236 1846
1237=cut 1847=cut
1238 1848
1239sub ext_event($$%) { 1849sub ext_msg($$@) {
1240 my ($self, $type, %msg) = @_; 1850 my ($self, $type, @msg) = @_;
1241 1851
1242 $self->ns->ext_event ($type, %msg); 1852 $self->ns->ext_msg ($type, @msg);
1243} 1853}
1244 1854
1245=head3 cf::region 1855=head3 cf::region
1246 1856
1247=over 4 1857=over 4
1250 1860
1251package cf::region; 1861package cf::region;
1252 1862
1253=item cf::region::find_by_path $path 1863=item cf::region::find_by_path $path
1254 1864
1255Tries to decuce the probable region for a map knowing only its path. 1865Tries to decuce the likely region for a map knowing only its path.
1256 1866
1257=cut 1867=cut
1258 1868
1259sub find_by_path($) { 1869sub find_by_path($) {
1260 my ($path) = @_; 1870 my ($path) = @_;
1261 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1262 my ($match, $specificity); 1874 my ($match, $specificity);
1263 1875
1264 for my $region (list) { 1876 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1266 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity; 1879 if $region->specificity > $specificity;
1268 } 1880 }
1269 } 1881 }
1270 1882
1291our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1292our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1293 1905
1294sub generate_random_map { 1906sub generate_random_map {
1295 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1296 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1297 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1298 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1299 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1300 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1301 $rmp->{exit_on_final_map},
1302 $rmp->{xsize}, $rmp->{ysize},
1303 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1304 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1305 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1306 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1307 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1308 (cf::region::find $rmp->{region}), $rmp->{custom}
1309 )
1310} 1912}
1311 1913
1312=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1313 1915
1314Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1319 1921
1320sub register { 1922sub register {
1321 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1322 my $pkg = caller; 1924 my $pkg = caller;
1323 1925
1324 no strict;
1325 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1326 1927
1327 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1328} 1929}
1329 1930
1330# also paths starting with '/' 1931# also paths starting with '/'
1331$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1332 1933
1333sub thawer_merge { 1934sub thawer_merge {
1334 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1335 1936
1336 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1341} 1942}
1342 1943
1343sub normalise { 1944sub normalise {
1344 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1345 1946
1346 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1347 1948
1348 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1349 1950
1350 # map plan: 1951 # map plan:
1351 # 1952 #
1353 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1354 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1355 # ?random/... random maps 1956 # ?random/... random maps
1356 # /... normal maps 1957 # /... normal maps
1357 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1358 1960
1359 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1360 1962
1361 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1362 # something that looks reasonable 1964 # something that looks reasonable
1363 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1364 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1365 1967
1366 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1367 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1368 } 1984 }
1369 1985
1370 for ($path) { 1986 for ($path) {
1371 redo if s{//}{/};
1372 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1373 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1374 } 1989 }
1375 1990
1376 $path 1991 $path
1390 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1391 return $self; 2006 return $self;
1392 } 2007 }
1393 } 2008 }
1394 2009
1395 Carp::carp "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1396 () 2011 ()
1397} 2012}
1398 2013
2014# may re-bless or do other evil things
1399sub init { 2015sub init {
1400 my ($self) = @_; 2016 my ($self) = @_;
1401 2017
1402 $self 2018 $self
1403} 2019}
1422 2038
1423# the temporary/swap location 2039# the temporary/swap location
1424sub save_path { 2040sub save_path {
1425 my ($self) = @_; 2041 my ($self) = @_;
1426 2042
1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1428 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1429} 2045}
1430 2046
1431# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1432sub uniq_path { 2048sub uniq_path {
1433 my ($self) = @_; 2049 my ($self) = @_;
1434 2050
1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1436 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1437}
1438
1439# and all this just because we cannot iterate over
1440# all maps in C++...
1441sub change_all_map_light {
1442 my ($change) = @_;
1443
1444 $_->change_map_light ($change)
1445 for grep $_->outdoor, values %cf::MAP;
1446} 2053}
1447 2054
1448sub decay_objects { 2055sub decay_objects {
1449 my ($self) = @_; 2056 my ($self) = @_;
1450 2057
1463 2070
1464sub load_header_from($) { 2071sub load_header_from($) {
1465 my ($self, $path) = @_; 2072 my ($self, $path) = @_;
1466 2073
1467 utf8::encode $path; 2074 utf8::encode $path;
1468 #aio_open $path, O_RDONLY, 0 2075 my $f = new_from_file cf::object::thawer $path
1469 # or return;
1470
1471 $self->_load_header ($path)
1472 or return; 2076 or return;
2077
2078 $self->_load_header ($f)
2079 or return;
2080
2081 local $MAP_LOADING{$self->{path}} = $self;
2082 $f->resolve_delayed_derefs;
1473 2083
1474 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1475 2085
1476 1 2086 1
1477} 2087}
1529 2139
1530sub find; 2140sub find;
1531sub find { 2141sub find {
1532 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1533 2143
2144 cf::cede_to_tick;
2145
1534 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1535 2147
2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1536 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1537 2150
1538 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1539 my $guard = cf::lock_acquire "map_find:$path";
1540 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1541 or return; 2153 or return;
1542 2154
1543 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1544 2156
1546 or return; 2158 or return;
1547 2159
1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1549 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1550 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
2164 undef $guard1;
1551 $map->reset; 2165 $map->reset;
1552 undef $guard;
1553 return find $path; 2166 return find $path;
1554 } 2167 }
1555 2168
1556 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1557 } 2170 }
1558} 2171}
1559 2172
1560sub pre_load { } 2173sub pre_load { }
1561sub post_load { } 2174#sub post_load { } # XS
1562 2175
1563sub load { 2176sub load {
1564 my ($self) = @_; 2177 my ($self) = @_;
1565 2178
1566 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
1567 2180
1568 my $path = $self->{path}; 2181 my $path = $self->{path};
1569 2182
1570 { 2183 {
1571 my $guard = cf::lock_acquire "map_load:$path"; 2184 my $guard = cf::lock_acquire "map_data:$path";
1572 2185
2186 return unless $self->valid;
1573 return if $self->in_memory != cf::MAP_SWAPPED; 2187 return unless $self->in_memory == cf::MAP_SWAPPED;
1574 2188
1575 $self->in_memory (cf::MAP_LOADING); 2189 $self->in_memory (cf::MAP_LOADING);
1576 2190
1577 $self->alloc; 2191 $self->alloc;
1578 2192
1579 $self->pre_load; 2193 $self->pre_load;
1580 Coro::cede; 2194 cf::cede_to_tick;
1581 2195
1582 $self->_load_objects ($self->{load_path}, 1) 2196 if (exists $self->{load_path}) {
2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2198 $f->skip_block;
2199 $self->_load_objects ($f)
1583 or return; 2200 or return;
1584 2201
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
1586 if delete $self->{load_original}; 2203 if delete $self->{load_original};
1587 2204
1588 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq; 2206 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) { 2207 unless (aio_stat $uniq) {
2208 if (my $f = new_from_file cf::object::thawer $uniq) {
1591 $self->clear_unique_items; 2209 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0); 2210 $self->_load_objects ($f);
2211 $f->resolve_delayed_derefs;
2212 }
2213 }
1593 } 2214 }
1594 }
1595 2215
1596 Coro::cede; 2216 $f->resolve_delayed_derefs;
2217 }
2218
2219 cf::cede_to_tick;
1597 # now do the right thing for maps 2220 # now do the right thing for maps
1598 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
1599 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
1600 unless $self->difficulty; 2223 unless $self->difficulty;
1601 Coro::cede; 2224 cf::cede_to_tick;
1602 2225
1603 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
1604 $self->decay_objects; 2227 $self->decay_objects;
1605 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
1606 $self->update_buttons; 2229 $self->update_buttons;
1607 Coro::cede; 2230 cf::cede_to_tick;
1608 $self->set_darkness_map;
1609 Coro::cede;
1610 $self->activate; 2231 $self->activate;
1611 } 2232 }
1612 2233
2234 $self->{last_save} = $cf::RUNTIME;
2235 $self->last_access ($cf::RUNTIME);
2236
1613 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
1614 } 2238 }
1615 2239
1616 $self->post_load; 2240 $self->post_load;
1617}
1618 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
1619sub customise_for { 2248sub customise_for {
1620 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
1621 2250
1622 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
1623 if $self->per_player; 2252 if $self->per_player;
1627 2256
1628 $self 2257 $self
1629} 2258}
1630 2259
1631# find and load all maps in the 3x3 area around a map 2260# find and load all maps in the 3x3 area around a map
1632sub load_diag { 2261sub load_neighbours {
1633 my ($map) = @_; 2262 my ($map) = @_;
1634 2263
1635 my @diag; # diagonal neighbours 2264 my @neigh; # diagonal neighbours
1636 2265
1637 for (0 .. 3) { 2266 for (0 .. 3) {
1638 my $neigh = $map->tile_path ($_) 2267 my $neigh = $map->tile_path ($_)
1639 or next; 2268 or next;
1640 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
1641 or next; 2270 or next;
1642 $neigh->load; 2271 $neigh->load;
1643 2272
2273 # now find the diagonal neighbours
2274 push @neigh,
1644 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1645 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1646 } 2277 }
1647 2278
1648 for (@diag) { 2279 for (grep defined $_->[0], @neigh) {
2280 my ($path, $origin) = @$_;
1649 my $neigh = find @$_ 2281 my $neigh = find $path, $origin
1650 or next; 2282 or next;
1651 $neigh->load; 2283 $neigh->load;
1652 } 2284 }
1653} 2285}
1654 2286
1655sub find_sync { 2287sub find_sync {
1656 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
1657 2289
1658 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
1659} 2294}
1660 2295
1661sub do_load_sync { 2296sub do_load_sync {
1662 my ($map) = @_; 2297 my ($map) = @_;
1663 2298
1664 cf::sync_job { $map->load }; 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2300 if $Coro::current == $Coro::main;
2301
2302 $map->load;
1665} 2303}
1666 2304
1667our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
1668our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
1669 2307
1670sub find_async { 2308sub find_async {
1671 my ($path, $origin) = @_; 2309 my ($path, $origin, $load) = @_;
1672 2310
1673 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
1674 2312
1675 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1677 } 2315 }
1678 2316
1679 undef $MAP_PREFETCH{$path}; 2317 $MAP_PREFETCH{$path} |= $load;
2318
1680 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2320 $Coro::current->{desc} = "map prefetcher";
2321
1681 while (%MAP_PREFETCH) { 2322 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) { 2323 while (my ($k, $v) = each %MAP_PREFETCH) {
1683 my $map = find $path 2324 if (my $map = find $k) {
1684 or next;
1685 $map->load; 2325 $map->load if $v;
2326 }
1686 2327
1687 delete $MAP_PREFETCH{$path}; 2328 delete $MAP_PREFETCH{$k};
1688 } 2329 }
1689 } 2330 }
1690 undef $MAP_PREFETCHER; 2331 undef $MAP_PREFETCHER;
1691 }; 2332 };
1692 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
1693 2334
1694 () 2335 ()
1695} 2336}
1696 2337
2338# common code, used by both ->save and ->swapout
1697sub save { 2339sub _save {
1698 my ($self) = @_; 2340 my ($self) = @_;
1699
1700 my $lock = cf::lock_acquire "map_data:" . $self->path;
1701 2341
1702 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
1703 2343
1704 return unless $self->dirty; 2344 return unless $self->dirty;
1705 2345
1711 return if $self->{deny_save}; 2351 return if $self->{deny_save};
1712 2352
1713 local $self->{last_access} = $self->last_access;#d# 2353 local $self->{last_access} = $self->last_access;#d#
1714 2354
1715 cf::async { 2355 cf::async {
2356 $Coro::current->{desc} = "map player save";
1716 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
1717 }; 2358 };
2359
2360 cf::get_slot 0.02;
1718 2361
1719 if ($uniq) { 2362 if ($uniq) {
1720 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1721 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1722 } else { 2365 } else {
1723 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1724 } 2367 }
1725} 2368}
1726 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
1727sub swap_out { 2378sub swap_out {
1728 my ($self) = @_; 2379 my ($self) = @_;
1729 2380
1730 # save first because save cedes
1731 $self->save;
1732
1733 my $lock = cf::lock_acquire "map_data:" . $self->path; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
1734 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
1735 return if $self->players; 2385 return if $self->players;
1736 return if $self->in_memory != cf::MAP_IN_MEMORY;
1737 return if $self->{deny_save};
1738 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
1739 $self->clear; 2396 $self->clear;
1740 $self->in_memory (cf::MAP_SWAPPED);
1741} 2397}
1742 2398
1743sub reset_at { 2399sub reset_at {
1744 my ($self) = @_; 2400 my ($self) = @_;
1745 2401
1763 2419
1764 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
1765 2421
1766 return if $self->players; 2422 return if $self->players;
1767 2423
1768 warn "resetting map ", $self->path; 2424 cf::trace "resetting map ", $self->path, "\n";
1769 2425
1770 $self->in_memory (cf::MAP_SWAPPED); 2426 $self->in_memory (cf::MAP_SWAPPED);
1771 2427
1772 # need to save uniques path 2428 # need to save uniques path
1773 unless ($self->{deny_save}) { 2429 unless ($self->{deny_save}) {
1777 if $uniq; 2433 if $uniq;
1778 } 2434 }
1779 2435
1780 delete $cf::MAP{$self->path}; 2436 delete $cf::MAP{$self->path};
1781 2437
2438 $self->deactivate;
2439 $_->clear_links_to ($self) for values %cf::MAP;
1782 $self->clear; 2440 $self->clear;
1783
1784 $_->clear_links_to ($self) for values %cf::MAP;
1785 2441
1786 $self->unlink_save; 2442 $self->unlink_save;
1787 $self->destroy; 2443 $self->destroy;
1788} 2444}
1789 2445
1790my $nuke_counter = "aaaa"; 2446my $nuke_counter = "aaaa";
1791 2447
1792sub nuke { 2448sub nuke {
1793 my ($self) = @_; 2449 my ($self) = @_;
1794 2450
2451 {
2452 my $lock = cf::lock_acquire "map_data:$self->{path}";
2453
1795 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
1796 2455
1797 $self->unlink_save; 2456 $self->unlink_save;
1798 2457
1799 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
1800 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
1801 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
1802 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
1803 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1804 2463
1805 $cf::MAP{$self->path} = $self; 2464 $cf::MAP{$self->path} = $self;
2465 }
1806 2466
1807 $self->reset; # polite request, might not happen 2467 $self->reset; # polite request, might not happen
1808} 2468}
1809 2469
1810=item $maps = cf::map::tmp_maps 2470=item $maps = cf::map::tmp_maps
1852 2512
1853sub unique_maps() { 2513sub unique_maps() {
1854 [ 2514 [
1855 map { 2515 map {
1856 utf8::decode $_; 2516 utf8::decode $_;
1857 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
1858 ? normalise $_ 2520 : normalise $_
1859 : ()
1860 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
1861 ] 2522 ]
1862} 2523}
1863 2524
1864package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
1865 2556
1866=back 2557=back
1867 2558
1868=head3 cf::object 2559=head3 cf::object
1869 2560
1873 2564
1874=over 4 2565=over 4
1875 2566
1876=item $ob->inv_recursive 2567=item $ob->inv_recursive
1877 2568
1878Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
1879 2571
1880=cut 2572=cut
1881 2573
1882sub inv_recursive_; 2574sub inv_recursive_;
1883sub inv_recursive_ { 2575sub inv_recursive_ {
1886 2578
1887sub inv_recursive { 2579sub inv_recursive {
1888 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
1889} 2581}
1890 2582
2583=item $ref = $ob->ref
2584
2585Creates and returns a persistent reference to an object that can be stored as a string.
2586
2587=item $ob = cf::object::deref ($refstring)
2588
2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2590even if the object actually exists. May block.
2591
2592=cut
2593
2594sub deref {
2595 my ($ref) = @_;
2596
2597 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2598 my ($uuid, $name) = ($1, $2);
2599 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2600 or return;
2601 $pl->ob->uuid eq $uuid
2602 or return;
2603
2604 $pl->ob
2605 } else {
2606 warn "$ref: cannot resolve object reference\n";
2607 undef
2608 }
2609}
2610
1891package cf; 2611package cf;
1892 2612
1893=back 2613=back
1894 2614
1895=head3 cf::object::player 2615=head3 cf::object::player
1901Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2621Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1902can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
1903dialogue with the given NPC character. 2623dialogue with the given NPC character.
1904 2624
1905=cut 2625=cut
2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
1906 2640
1907# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
1908# with dialog boxes. 2642# with dialog boxes.
1909#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
1910sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
1912 2646
1913 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2647 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1914 2648
1915 if ($self->{record_replies}) { 2649 if ($self->{record_replies}) {
1916 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2650 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2651
1917 } else { 2652 } else {
2653 my $pl = $self->contr;
2654
2655 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2656 my $dialog = $pl->{npc_dialog};
2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2658
2659 } else {
1918 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
1919 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2662 }
1920 } 2663 }
2664}
2665
2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2667
2668=cut
2669
2670sub cf::object::send_msg {
2671 my $pl = shift->contr
2672 or return;
2673 $pl->send_msg (@_);
1921} 2674}
1922 2675
1923=item $player_object->may ("access") 2676=item $player_object->may ("access")
1924 2677
1925Returns wether the given player is authorized to access resource "access" 2678Returns wether the given player is authorized to access resource "access"
1938 2691
1939=item $player_object->enter_link 2692=item $player_object->enter_link
1940 2693
1941Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
1942 2695
1943The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
1944I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
1945 2700
1946Will never block. 2701Will never block.
1947 2702
1948=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
1949 2704
1969sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
1970 my ($self) = @_; 2725 my ($self) = @_;
1971 2726
1972 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
1973 2728
2729 ++$self->{_link_recursion};
2730
1974 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
1975 2732
1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1977 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
1978 2735
1979 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1980} 2737}
1981 2738
1982sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
1983 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
1984 2741
2001 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2002 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2003 2760
2004 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2005 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2006 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2007 2764
2008 $map->load; 2765 $map->load;
2009 $map->load_diag; 2766 $map->load_neighbours;
2010 2767
2011 return unless $self->contr->active; 2768 return unless $self->contr->active;
2012 $self->activate_recursive;
2013 2769
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2016} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2017 2777
2778}
2779
2018=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2019 2781
2020Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position. 2785the new (success) or old (failed) map position. In either case, $done will
2786be called at the end of this process.
2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2024 2790
2025=cut 2791=cut
2026 2792
2027our $GOTOGEN; 2793our $GOTOGEN;
2028 2794
2029sub cf::object::player::goto { 2795sub cf::object::player::goto {
2030 my ($self, $path, $x, $y, $check) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2031 2803
2032 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034 2806
2035 $self->enter_link; 2807 $self->enter_link;
2036 2808
2037 (async { 2809 (async {
2810 $Coro::current->{desc} = "player::goto $path $x $y";
2811
2812 # *tag paths override both path and x|y
2813 if ($path =~ /^\*(.*)$/) {
2814 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2815 my $ob = $obs[rand @obs];
2816
2817 # see if we actually can go there
2818 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2819 $ob = $obs[rand @obs];
2820 } else {
2821 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2822 }
2823 # else put us there anyways for now #d#
2824
2825 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2826 } else {
2827 ($path, $x, $y) = (undef, undef, undef);
2828 }
2829 }
2830
2038 my $map = eval { 2831 my $map = eval {
2039 my $map = cf::map::find $path; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2040 2833
2041 if ($map) { 2834 if ($map) {
2042 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2044 } else { 2837 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2046 } 2839 }
2047 2840
2048 $map 2841 $map
2049 }; 2842 };
2050 2843
2055 2848
2056 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2058 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2059 } 2852 }
2853
2854 $done->($self) if $done;
2060 })->prio (1); 2855 })->prio (1);
2061} 2856}
2062 2857
2063=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2064 2859
2084} 2879}
2085 2880
2086sub prepare_random_map { 2881sub prepare_random_map {
2087 my ($exit) = @_; 2882 my ($exit) = @_;
2088 2883
2089 my $guard = cf::lock_acquire "exit_prepare:$exit";
2090
2091 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2092 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2093 # that depends on the exit object 2886 # that depends on the exit object
2094 2887
2095 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2097 if ($exit->map) { 2890 if ($exit->map) {
2098 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2099 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2100 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2101 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2102 } 2897 }
2103 2898
2104 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2105 2900
2106 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2107 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2108 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2109 2904
2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2111 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2112 undef $fh; 2907 undef $fh;
2113 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2114 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2115 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2116 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2117 } 2916 }
2118} 2917}
2119 2918
2120sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2121 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2122 2921
2123 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2124 2923
2125 if ($exit->slaying eq "/!") {
2126 #TODO: this should de-fi-ni-te-ly not be a sync-job
2127 # the problem is that $exit might not survive long enough
2128 # so it needs to be done right now, right here
2129 cf::sync_job { prepare_random_map $exit };
2130 }
2131
2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2133 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp;
2135
2136 $self->enter_link; 2924 $self->enter_link;
2137 2925
2138 (async { 2926 (async {
2139 $self->deactivate_recursive; # just to be sure 2927 $Coro::current->{desc} = "enter_exit";
2928
2140 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2141 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2142 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2143 1; 2950 1
2144 }) { 2951 }) {
2145 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2146 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2147 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2148 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2149 2956
2150 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2151 $self->leave_link; 2958 $self->leave_link;
2152 } 2959 }
2153 })->prio (1); 2960 })->prio (1);
2154} 2961}
2155 2962
2169 2976
2170 utf8::encode $text; 2977 utf8::encode $text;
2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2172} 2979}
2173 2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
3004}
3005
3006=item $client->send_msg ($channel, $msg, $color, [extra...])
3007
3008Send a drawinfo or msg packet to the client, formatting the msg for the
3009client if neccessary. C<$type> should be a string identifying the type of
3010the message, with C<log> being the default. If C<$color> is negative, suppress
3011the message unless the client supports the msg packet.
3012
3013=cut
3014
3015# non-persistent channels (usually the info channel)
3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
3023 "c/identify" => {
3024 id => "infobox",
3025 title => "Identify",
3026 reply => undef,
3027 tooltip => "Items recently identified",
3028 },
3029 "c/examine" => {
3030 id => "infobox",
3031 title => "Examine",
3032 reply => undef,
3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
3040 },
3041 "c/book" => {
3042 id => "infobox",
3043 title => "Book",
3044 reply => undef,
3045 tooltip => "The contents of a note or book",
3046 },
3047 "c/lookat" => {
3048 id => "infobox",
3049 title => "Look",
3050 reply => undef,
3051 tooltip => "What you saw there",
3052 },
3053 "c/who" => {
3054 id => "infobox",
3055 title => "Players",
3056 reply => undef,
3057 tooltip => "Shows players who are currently online",
3058 },
3059 "c/body" => {
3060 id => "infobox",
3061 title => "Body Parts",
3062 reply => undef,
3063 tooltip => "Shows which body parts you posess and are available",
3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
3101 "c/uptime" => {
3102 id => "infobox",
3103 title => "Uptime",
3104 reply => undef,
3105 tooltip => "How long the server has been running since last restart",
3106 },
3107 "c/mapinfo" => {
3108 id => "infobox",
3109 title => "Map Info",
3110 reply => undef,
3111 tooltip => "Information related to the maps",
3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
3127);
3128
3129sub cf::client::send_msg {
3130 my ($self, $channel, $msg, $color, @extra) = @_;
3131
3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
3134
3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
3136
3137 # check predefined channels, for the benefit of C
3138 if ($CHANNEL{$channel}) {
3139 $channel = $CHANNEL{$channel};
3140
3141 $self->ext_msg (channel_info => $channel);
3142 $channel = $channel->{id};
3143
3144 } elsif (ref $channel) {
3145 # send meta info to client, if not yet sent
3146 unless (exists $self->{channel}{$channel->{id}}) {
3147 $self->{channel}{$channel->{id}} = $channel;
3148 $self->ext_msg (channel_info => $channel);
3149 }
3150
3151 $channel = $channel->{id};
3152 }
3153
3154 return unless @extra || length $msg;
3155
3156 # default colour, mask it out
3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3158 if $color & cf::NDI_DEF;
3159
3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3163 );
3164
3165 $self->send_big_packet ($pkt);
3166}
3167
2174=item $client->ext_event ($type, %msg) 3168=item $client->ext_msg ($type, @msg)
2175 3169
2176Sends an exti event to the client. 3170Sends an ext event to the client.
2177 3171
2178=cut 3172=cut
2179 3173
2180sub cf::client::ext_event($$%) { 3174sub cf::client::ext_msg($$@) {
2181 my ($self, $type, %msg) = @_; 3175 my ($self, $type, @msg) = @_;
2182 3176
3177 if ($self->extcmd == 2) {
3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3179 } elsif ($self->extcmd == 1) { # TODO: remove
2183 $msg{msgtype} = "event_$type"; 3180 push @msg, msgtype => "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3182 }
3183}
3184
3185=item $client->ext_reply ($msgid, @msg)
3186
3187Sends an ext reply to the client.
3188
3189=cut
3190
3191sub cf::client::ext_reply($$@) {
3192 my ($self, $id, @msg) = @_;
3193
3194 if ($self->extcmd == 2) {
3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3196 } elsif ($self->extcmd == 1) {
3197 #TODO: version 1, remove
3198 unshift @msg, msgtype => "reply", msgid => $id;
3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3200 }
2185} 3201}
2186 3202
2187=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2188 3204
2189Queues a query to the client, calling the given callback with 3205Queues a query to the client, calling the given callback with
2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3206the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3207C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192 3208
2193Queries can fail, so check the return code. Or don't, as queries will become 3209Queries can fail, so check the return code. Or don't, as queries will
2194reliable at some point in the future. 3210become reliable at some point in the future.
2195 3211
2196=cut 3212=cut
2197 3213
2198sub cf::client::query { 3214sub cf::client::query {
2199 my ($self, $flags, $text, $cb) = @_; 3215 my ($self, $flags, $text, $cb) = @_;
2207 utf8::encode $text; 3223 utf8::encode $text;
2208 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3224 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209 3225
2210 $self->send_packet ($self->{query_queue}[0][0]) 3226 $self->send_packet ($self->{query_queue}[0][0])
2211 if @{ $self->{query_queue} } == 1; 3227 if @{ $self->{query_queue} } == 1;
3228
3229 1
2212} 3230}
2213 3231
2214cf::client->attach ( 3232cf::client->attach (
3233 on_connect => sub {
3234 my ($ns) = @_;
3235
3236 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3237 },
2215 on_reply => sub { 3238 on_reply => sub {
2216 my ($ns, $msg) = @_; 3239 my ($ns, $msg) = @_;
2217 3240
2218 # this weird shuffling is so that direct followup queries 3241 # this weird shuffling is so that direct followup queries
2219 # get handled first 3242 # get handled first
2231 } else { 3254 } else {
2232 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3255 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233 } 3256 }
2234 } 3257 }
2235 }, 3258 },
3259 on_exticmd => sub {
3260 my ($ns, $buf) = @_;
3261
3262 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3263
3264 if (ref $msg) {
3265 my ($type, $reply, @payload) =
3266 "ARRAY" eq ref $msg
3267 ? @$msg
3268 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3269
3270 my @reply;
3271
3272 if (my $cb = $EXTICMD{$type}) {
3273 @reply = $cb->($ns, @payload);
3274 }
3275
3276 $ns->ext_reply ($reply, @reply)
3277 if $reply;
3278
3279 } else {
3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3281 }
3282
3283 cf::override;
3284 },
2236); 3285);
2237 3286
2238=item $client->async (\&cb) 3287=item $client->async (\&cb)
2239 3288
2240Create a new coroutine, running the specified callback. The coroutine will 3289Create a new coroutine, running the specified callback. The coroutine will
2256 3305
2257 $coro 3306 $coro
2258} 3307}
2259 3308
2260cf::client->attach ( 3309cf::client->attach (
2261 on_destroy => sub { 3310 on_client_destroy => sub {
2262 my ($ns) = @_; 3311 my ($ns) = @_;
2263 3312
2264 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2265 }, 3314 },
2266); 3315);
2281our $safe = new Safe "safe"; 3330our $safe = new Safe "safe";
2282our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2283 3332
2284$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2285 3334
2286$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3335$safe->permit_only (Opcode::opset qw(
3336 :base_core :base_mem :base_orig :base_math :base_loop
3337 grepstart grepwhile mapstart mapwhile
3338 sort time
3339));
2287 3340
2288# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
2289 3342
2290=pod 3343=pod
2291 3344
2292The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
2293 3346
2294 cf::object contr pay_amount pay_player map 3347 cf::object
3348 contr pay_amount pay_player map x y force_find force_add destroy
3349 insert remove name archname title slaying race decrease split
3350 value
3351
2295 cf::object::player player 3352 cf::object::player
2296 cf::player peaceful 3353 player
2297 cf::map trigger 3354
3355 cf::player
3356 peaceful
3357
3358 cf::map
3359 trigger
2298 3360
2299=cut 3361=cut
2300 3362
2301for ( 3363for (
2302 ["cf::object" => qw(contr pay_amount pay_player map)], 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3365 insert remove inv nrof name archname title slaying race
3366 decrease split destroy change_exp value msg lore send_msg)],
2303 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
2304 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
2305 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
2306) { 3370) {
2307 no strict 'refs';
2308 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
2309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2310 for @funs; 3373 for @funs;
2311} 3374}
2312 3375
2327 3390
2328 my $qcode = $code; 3391 my $qcode = $code;
2329 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2330 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
2331 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
2332 local $_; 3398 local $_;
2333 local @safe::cf::_safe_eval_args = values %vars;
2334 3399
2335 my $eval = 3400 my $eval =
2336 "do {\n" 3401 "do {\n"
2337 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2338 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
2339 . $code 3404 . $code
2340 . "\n}" 3405 . "\n}"
2341 ; 3406 ;
2342 3407
3408 if ($CFG{safe_eval}) {
2343 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
2344 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2345 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
2346 3417
2347 if ($@) { 3418 if ($@) {
2348 warn "$@"; 3419 warn "$@",
2349 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
2350 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
2351 } 3422 }
2352 3423
2353 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
2354} 3425}
2355 3426
2369=cut 3440=cut
2370 3441
2371sub register_script_function { 3442sub register_script_function {
2372 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
2373 3444
2374 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
2375 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
2376} 3447}
2377 3448
2378=back 3449=back
2379 3450
2380=cut 3451=cut
2381
2382#############################################################################
2383
2384=head2 EXTENSION DATABASE SUPPORT
2385
2386Crossfire maintains a very simple database for extension use. It can
2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388convert to/from binary).
2389
2390The parameter C<$family> should best start with the name of the extension
2391using it, it should be unique.
2392
2393=over 4
2394
2395=item $value = cf::db_get $family => $key
2396
2397Returns a single value from the database.
2398
2399=item cf::db_put $family => $key => $value
2400
2401Stores the given C<$value> in the family.
2402
2403=cut
2404
2405our $DB;
2406
2407sub db_init {
2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2410
2411 cf::sync_job {
2412 eval {
2413 $DB->set_flags (BDB::CHKSUM);
2414
2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2417 cf::cleanup "db_open(db): $!" if $!;
2418 };
2419 cf::cleanup "db_open(db): $@" if $@;
2420 };
2421 }
2422}
2423
2424sub db_get($$) {
2425 my $key = "$_[0]/$_[1]";
2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2435sub db_put($$$) {
2436 BDB::dbreq_pri 4;
2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2552}
2553 3452
2554############################################################################# 3453#############################################################################
2555# the server's init and main functions 3454# the server's init and main functions
2556 3455
2557sub load_facedata($) { 3456sub load_facedata($) {
2558 my ($path) = @_; 3457 my ($path) = @_;
2559 3458
3459 # HACK to clear player env face cache, we need some signal framework
3460 # for this (global event?)
3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3462
3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3464
2560 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
2561 3466
2562 my $facedata; 3467 my $facedata = decode_storable load_file $path;
2563 0 < aio_load $path, $facedata
2564 or die "$path: $!";
2565
2566 $facedata = Coro::Storable::thaw $facedata;
2567 3468
2568 $facedata->{version} == 2 3469 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570 3471
3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3474 $facedata->{resource}{"res/exp_table"} = {
3475 type => FT_RSRC,
3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3478 };
3479 cf::cede_to_tick;
3480
2571 { 3481 {
2572 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
2573 3483
2574 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3488 cf::face::set_magicmap $idx, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2579 Coro::cede; 3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3492
3493 cf::cede_to_tick;
2580 } 3494 }
2581 3495
2582 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
2584 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
2585 or next; 3500 or next;
3501
2586 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3503 cf::face::set_smooth $idx, $smooth;
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588 } else { 3505 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
2590 } 3507 }
2591 Coro::cede; 3508
3509 cf::cede_to_tick;
2592 } 3510 }
2593 } 3511 }
2594 3512
2595 { 3513 {
2596 my $anims = $facedata->{animinfo}; 3514 my $anims = $facedata->{animinfo};
2597 3515
2598 while (my ($anim, $info) = each %$anims) { 3516 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3517 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede; 3518 cf::cede_to_tick;
2601 } 3519 }
2602 3520
2603 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
2604 } 3522 }
2605 3523
3524 {
3525 my $res = $facedata->{resource};
3526
3527 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) {
3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3530
3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3532 cf::face::set_type $idx, $info->{type};
3533 } else {
3534 $RESOURCE{$name} = $info; # unused
3535 }
3536
3537 cf::cede_to_tick;
3538 }
3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3542
2606 1 3543 1
2607} 3544}
2608 3545
3546register_exticmd fx_want => sub {
3547 my ($ns, $want) = @_;
3548
3549 while (my ($k, $v) = each %$want) {
3550 $ns->fx_want ($k, $v);
3551 }
3552};
3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3563
2609sub reload_regions { 3564sub reload_regions {
3565 # HACK to clear player env face cache, we need some signal framework
3566 # for this (global event?)
3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3568
2610 load_resource_file "$MAPDIR/regions" 3569 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n"; 3570 or die "unable to load regions file\n";
3571
3572 for (cf::region::list) {
3573 $_->{match} = qr/$_->{match}/
3574 if exists $_->{match};
3575 }
2612} 3576}
2613 3577
2614sub reload_facedata { 3578sub reload_facedata {
2615 load_facedata "$DATADIR/facedata" 3579 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n"; 3580 or die "unable to load facedata\n";
2624sub reload_treasures { 3588sub reload_treasures {
2625 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
2626 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
2627} 3591}
2628 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
2629sub reload_resources { 3613sub reload_resources {
2630 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
2631 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
2632 reload_regions; 3621 reload_regions;
2633 reload_facedata;
2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures; 3622 reload_treasures;
2637 3623
2638 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
2639} 3625}
2640 3626
2641sub init { 3627sub reload_config {
2642 reload_resources; 3628 trace "reloading config file...\n";
2643}
2644 3629
2645sub cfg_load { 3630 my $config = load_file "$CONFDIR/config";
2646 open my $fh, "<:utf8", "$CONFDIR/config" 3631 utf8::decode $config;
2647 or return; 3632 *CFG = decode_yaml $config;
2648 3633
2649 local $/;
2650 *CFG = YAML::Syck::Load <$fh>;
2651
2652 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2653 3635
2654 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2655 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2656 3638
2657 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
2661 }; 3643 };
2662 warn $@ if $@; 3644 warn $@ if $@;
2663 } 3645 }
2664} 3646}
2665 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
2666sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
2667 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
2668 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
2669 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2670 (async { 3689 (async {
2671 Event::one_event; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3691 EV::loop EV::LOOP_ONESHOT;
2672 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
2673 }; 3693 };
2674 3694
2675 cfg_load; 3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3707 reload_config;
2676 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
2677 load_extensions; 3718 load_extensions;
2678 3719
2679 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
2680 Event::loop; 3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
2681} 3738}
2682 3739
2683############################################################################# 3740#############################################################################
2684# initialisation and cleanup 3741# initialisation and cleanup
2685 3742
2686# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
2687BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
2688 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
2689 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2690 reentrant => 0,
2691 data => WF_AUTOCANCEL,
2692 signal => $signal,
2693 prio => 0,
2694 cb => sub {
2695 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
2696 },
2697 ); 3749 };
3750 }
3751}
3752
3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3756 # first touch the runtime file to show we are still running:
3757 # the fsync below can take a very very long time.
3758
3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3760
3761 my $guard = cf::lock_acquire "write_runtime";
3762
3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3764 or return;
3765
3766 my $value = $cf::RUNTIME + 90 + 10;
3767 # 10 is the runtime save interval, for a monotonic clock
3768 # 60 allows for the watchdog to kill the server.
3769
3770 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3771 and return;
3772
3773 # always fsync - this file is important
3774 aio_fsync $fh
3775 and return;
3776
3777 # touch it again to show we are up-to-date
3778 aio_utime $fh, undef, undef;
3779
3780 close $fh
3781 or return;
3782
3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3784 and return;
3785
3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3787
2698 } 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
2699} 3839}
2700 3840
2701sub emergency_save() { 3841sub emergency_save() {
2702 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
2703 3843
2704 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
2705 3850
2706 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
2707 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
2708 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
2709 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
2710 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
2711 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
2712 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
2713 $pl->valid or next; 3860 $pl->valid or next;
3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2714 $pl->save; 3862 $pl->save;
2715 } 3863 }
2716 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
2717 3865
2718 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
2719 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
2720 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
2721 $map->valid or next; 3871 $map->valid or next;
2722 $map->save; 3872 $map->save;
2723 } 3873 }
2724 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
2725 3875
2726 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
2727 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
2728 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
2729 }; 3904 };
2730 3905
2731 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
2732} 3907}
2733 3908
2734sub post_cleanup { 3909sub post_cleanup {
2735 my ($make_core) = @_; 3910 my ($make_core) = @_;
2736 3911
3912 IO::AIO::flush;
3913
2737 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
2738 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
2739} 3944}
2740 3945
2741sub do_reload_perl() { 3946sub do_reload_perl() {
2742 # can/must only be called in main 3947 # can/must only be called in main
2743 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
2744 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
2745 return; 3950 return;
2746 } 3951 }
2747 3952
2748 warn "reloading..."; 3953 return if $RELOAD++;
2749 3954
2750 warn "entering sync_job"; 3955 my $t1 = AE::time;
2751 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
2752 cf::sync_job { 3963 cf::sync_job {
2753 cf::write_runtime; # external watchdog should not bark
2754 cf::emergency_save; 3964 #cf::emergency_save;
2755 cf::write_runtime; # external watchdog should not bark
2756 3965
2757 warn "syncing database to disk";
2758 BDB::db_env_txn_checkpoint $DB_ENV;
2759
2760 # if anything goes wrong in here, we should simply crash as we already saved
2761
2762 warn "cancelling all WF_AUTOCANCEL watchers";
2763 for (Event::all_watchers) {
2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2765 }
2766
2767 warn "flushing outstanding aio requests";
2768 for (;;) {
2769 BDB::flush;
2770 IO::AIO::flush;
2771 Coro::cede;
2772 last unless IO::AIO::nreqs || BDB::nreqs;
2773 warn "iterate...";
2774 }
2775
2776 ++$RELOAD;
2777
2778 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
2779 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
2780 %EXT_CORO = (); 3968 %EXT_CORO = ();
2781 3969
2782 warn "removing commands"; 3970 trace "perl_reload: removing commands";
2783 %COMMAND = (); 3971 %COMMAND = ();
2784 3972
2785 warn "removing ext commands"; 3973 trace "perl_reload: removing ext/exti commands";
2786 %EXTCMD = (); 3974 %EXTCMD = ();
3975 %EXTICMD = ();
2787 3976
2788 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
2789 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
2790 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
2791 3980
2792 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
2793 eval { 3982 eval {
2794 $cb->($pkg); 3983 $cb->($pkg);
2795 1 3984 1
2796 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
2797 } 3990 }
2798 3991
2799 warn "... nuking $pkg";
2800 Symbol::delete_package $pkg;
2801 }
2802
2803 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2804 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
2805 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2806 3995
2807 warn "... unloading $k"; 3996 trace "... unloading $k";
2808 delete $INC{$k}; 3997 delete $INC{$k};
2809 3998
2810 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
2811 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
2812 4001
2813 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
2814 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
2815 } 4007 }
2816 4008
2817 Symbol::delete_package $k;
2818 }
2819
2820 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
2821 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2823 4012
2824 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
2825 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2827 4016
2828 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
2829 # and global variables created in xs 4018 # and global variables created in xs
2830 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
2831 4020
2832 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
2833 4022
2834 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
2835 require cf; 4024 require cf;
2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
2837 4026
2838 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
2839 cf::cfg_load; 4028 cf::reload_config;
2840 4029
2841 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
2842 cf::load_extensions; 4031 cf::load_extensions;
2843 4032
4033 if ($REATTACH_ON_RELOAD) {
2844 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
2845 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
2846 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
2847 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
2848 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
2849 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
2850 4041
2851 warn "leaving sync_job"; 4042 cf::_post_init 1;
2852 4043
4044 trace "perl_reload: leaving sync_job";
4045
2853 1 4046 1
2854 } or do { 4047 } or do {
2855 warn $@; 4048 error $@;
2856 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
2857 exit 1; 4050 };
4051
4052 --$RELOAD;
2858 }; 4053 }
2859 4054
2860 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
2861}; 4057};
2862 4058
2863our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
2864 4060
2865sub reload_perl() { 4061sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
2868 4064
2869 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
2870 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
2871 after => 0, 4067
2872 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2873 cb => sub {
2874 do_reload_perl; 4069 do_reload_perl;
2875 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
2876 }, 4071 };
2877 ); 4072 };
2878} 4073}
2879 4074
2880register_command "reload" => sub { 4075register_command "reload" => sub {
2881 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
2882 4077
2883 if ($who->flag (FLAG_WIZ)) { 4078 if ($who->flag (FLAG_WIZ)) {
2884 $who->message ("reloading server."); 4079 $who->message ("reloading server.");
4080 async {
4081 $Coro::current->{desc} = "perl_reload";
2885 async { reload_perl }; 4082 reload_perl;
4083 };
2886 } 4084 }
2887}; 4085};
2888 4086
2889unshift @INC, $LIBDIR; 4087#############################################################################
2890 4088
2891my $bug_warning = 0; 4089my $bug_warning = 0;
2892 4090
2893our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
2895 4093
2896sub wait_for_tick { 4094sub wait_for_tick() {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2899 4096
2900 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait; 4099 $signal->wait;
2903} 4100}
2904 4101
2905sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2908 4104
2909 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait; 4107 $signal->wait;
2912} 4108}
2913 4109
2914 my $min = 1e6;#d# 4110sub tick {
2915 my $avg = 10;
2916$TICK_WATCHER = Event->timer (
2917 reentrant => 0,
2918 parked => 1,
2919 prio => 0,
2920 at => $NEXT_TICK || $TICK,
2921 data => WF_AUTOCANCEL,
2922 cb => sub {
2923 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2925 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
2926 return; 4114 return;
2927 } 4115 }
2928 4116
2929 $NOW = $tick_start = Event::time;
2930
2931 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
2932 4118
2933 0 && sync_job {#d# 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938 4120
2939 $map->width (50); 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2940 $map->height (50); 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2941 $map->alloc; 4123 Coro::async_pool {
2942 $map->_load_objects ("/tmp/x.map", 1); 4124 $Coro::current->{desc} = "runtime saver";
2943 my $t = Event::time - $t; 4125 write_runtime_sync
2944 4126 or error "ERROR: unable to write runtime file: $!";
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 }; 4127 };
4128 }
2955 4129
2956 $RUNTIME += $TICK;
2957 $NEXT_TICK += $TICK;
2958
2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send; 4131 $sig->send;
2972 } 4132 }
2973 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send; 4134 $sig->send;
2975 } 4135 }
2976 4136
2977 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
2978
2979 # if we are delayed by four ticks or more, skip them all
2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2981
2982 $TICK_WATCHER->at ($NEXT_TICK);
2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987 4139
2988 _post_tick; 4140 if (0) {
2989 4141 if ($NEXT_TICK) {
2990 4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
2991 }, 4146 }
2992); 4147}
2993 4148
2994{ 4149{
2995 BDB::max_poll_time $TICK * 0.1; 4150 # configure BDB
2996 $BDB_POLL_WATCHER = Event->io ( 4151
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3005 4153 BDB::max_poll_reqs $TICK * 0.1;
3006 BDB::set_sync_prepare { 4154 $AnyEvent::BDB::WATCHER->priority (1);
3007 my $status;
3008 my $current = $Coro::current;
3009 (
3010 sub {
3011 $status = $!;
3012 $current->ready; undef $current;
3013 },
3014 sub {
3015 Coro::schedule while defined $current;
3016 $! = $status;
3017 },
3018 )
3019 };
3020 4155
3021 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3022 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3023 4163
3024 cf::sync_job { 4164 cf::sync_job {
3025 eval { 4165 eval {
3026 BDB::db_env_open 4166 BDB::db_env_open
3027 $DB_ENV, 4167 $DB_ENV,
3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4169 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4170 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666; 4171 0666;
3032 4172
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4173 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 }; 4174 };
3038 4175
3039 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3040 }; 4177 };
3041 } 4178 }
4179
4180 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4181 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4182 };
4183 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4185 };
4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4188 };
3042} 4189}
3043 4190
3044{ 4191{
4192 # configure IO::AIO
4193
3045 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3046
3047 undef $Coro::AIO::WATCHER;
3048 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3049 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3050 reentrant => 0,
3051 data => WF_AUTOCANCEL,
3052 fd => IO::AIO::poll_fileno,
3053 poll => 'r',
3054 prio => 6,
3055 cb => \&IO::AIO::poll_cb,
3056 );
3057} 4197}
3058 4198
3059my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3060 4201
3061sub _log_backtrace { 4202sub _log_backtrace {
3062 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3063 4204
3064 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3065 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3066 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3068 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3069 async { 4215 async {
4216 $Coro::current->{desc} = "abt $msg";
4217
3070 my @bt = fork_call { 4218 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4220 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4221 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!"; 4222 or die "addr2line: $!";
3082 } 4230 }
3083 4231
3084 @funcs 4232 @funcs
3085 }; 4233 };
3086 4234
3087 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace; 4238 --$_log_backtrace;
3090 }; 4239 };
3091 } else { 4240 } else {
3092 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3094 } 4243 }
3095} 4244}
3096 4245
3097# load additional modules 4246# load additional modules
3098use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3099 4249
3100END { cf::emergency_save } 4250END { cf::emergency_save }
3101 4251
31021 42521
3103 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines