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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.503 by root, Sat Jan 30 23:46:39 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines