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.274 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 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
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your 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 GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
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 74
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 76
49our %COMMAND = (); 77our %COMMAND = ();
50our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
51 79
52our @EXTS = (); # list of extension package names 80our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 81our %EXTCMD = ();
82our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
56 85
57our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
58our @EVENT; 87our @EVENT;
59 88
60our $CONFDIR = confdir; 89our $CONFDIR = confdir;
61our $DATADIR = datadir; 90our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
71 104
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 107our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
79 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 113our $DB_ENV;
82 114
83our %CFG; 115our %CFG;
84 116
85our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 118our $RUNTIME;
119our $NOW;
87 120
88our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
91 124
92# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 127
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
98 132
99binmode STDOUT; 133binmode STDOUT;
100binmode STDERR; 134binmode STDERR;
101 135
102# read virtual server time, if available 136# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
107} 141}
108 142
109mkdir $_ 143mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
155 189
156The raw value load value from the last tick. 190The raw value load value from the last tick.
157 191
158=item %cf::CFG 192=item %cf::CFG
159 193
160Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 195from wherever your confdir points to.
162 196
163=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
164 198
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 199These 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 200returns 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. 201per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 202
203=item @cf::INVOKE_RESULTS
204
205This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call.
208
169=back 209=back
170 210
171=cut 211=cut
172 212
173BEGIN { 213BEGIN {
177 $msg .= "\n" 217 $msg .= "\n"
178 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
179 219
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 221
182 utf8::encode $msg;
183 LOG llevError, $msg; 222 LOG llevError, $msg;
184 }; 223 };
185} 224}
225
226$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "=="
228
229 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d#
232 }#d#
233
234 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate
237};
238
239$SIG{__DIE__} = sub { }; #d#?
186 240
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 251for my $pkg (qw(
198 cf::global cf::attachable 252 cf::global cf::attachable
199 cf::object cf::object::player 253 cf::object cf::object::player
200 cf::client cf::player 254 cf::client cf::player
201 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
202 cf::map cf::party cf::region 257 cf::party cf::region
203)) { 258)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 260}
207 261
208$Event::DIED = sub { 262$EV::DIED = sub {
209 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
210}; 264};
265
266#############################################################################
211 267
212=head2 UTILITY FUNCTIONS 268=head2 UTILITY FUNCTIONS
213 269
214=over 4 270=over 4
215 271
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 290 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 291 $d
236 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
237} 293}
238 294
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
242 296
243Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
244 298
245=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
246 300
247Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
302
303=cut
304
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306
307sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) }
248 309
249=item cf::lock_wait $string 310=item cf::lock_wait $string
250 311
251Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
252 313
255Wait until the given lock is available and then acquires it and returns 316Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 317a Coro::guard object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 318for example when the coroutine gets canceled), the lock is automatically
258returned. 319returned.
259 320
321Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro.
323
260Lock names should begin with a unique identifier (for example, cf::map::find 324Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 325uses map_find and cf::map::load uses map_load).
262 326
263=item $locked = cf::lock_active $string 327=item $locked = cf::lock_active $string
264 328
265Return true if the lock is currently active, i.e. somebody has locked it. 329Return true if the lock is currently active, i.e. somebody has locked it.
266 330
267=cut 331=cut
268 332
269our %LOCK; 333our %LOCK;
334our %LOCKER;#d#
270 335
271sub lock_wait($) { 336sub lock_wait($) {
272 my ($key) = @_; 337 my ($key) = @_;
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
273 343
274 # wait for lock, if any 344 # wait for lock, if any
275 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current; 346 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule; 347 Coro::schedule;
283 353
284 # wait, to be sure we are not locked 354 # wait, to be sure we are not locked
285 lock_wait $key; 355 lock_wait $key;
286 356
287 $LOCK{$key} = []; 357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
288 359
289 Coro::guard { 360 Coro::guard {
361 delete $LOCKER{$key};#d#
290 # wake up all waiters, to be on the safe side 362 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} }; 363 $_->ready for @{ delete $LOCK{$key} };
292 } 364 }
293} 365}
294 366
297 369
298 ! ! $LOCK{$key} 370 ! ! $LOCK{$key}
299} 371}
300 372
301sub freeze_mainloop { 373sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 374 tick_inhibit_inc;
303 375
304 my $guard = Coro::guard { 376 Coro::guard \&tick_inhibit_dec;
305 $TICK_WATCHER->start; 377}
378
379=item cf::periodic $interval, $cb
380
381Like EV::periodic, but randomly selects a starting point so that the actions
382get spread over timer.
383
384=cut
385
386sub periodic($$) {
387 my ($interval, $cb) = @_;
388
389 my $start = rand List::Util::min 180, $interval;
390
391 EV::periodic $start, $interval, 0, $cb
392}
393
394=item cf::get_slot $time[, $priority[, $name]]
395
396Allocate $time seconds of blocking CPU time at priority C<$priority>:
397This call blocks and returns only when you have at least C<$time> seconds
398of cpu time till the next tick. The slot is only valid till the next cede.
399
400The optional C<$name> can be used to identify the job to run. It might be
401used for statistical purposes and should identify the same time-class.
402
403Useful for short background jobs.
404
405=cut
406
407our @SLOT_QUEUE;
408our $SLOT_QUEUE;
409
410$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager");
413
414 my $signal = new Coro::Signal;
415
416 while () {
417 next_job:
418 my $avail = cf::till_tick;
419 if ($avail > 0.01) {
420 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) {
422 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send;
424 Coro::cede;
425 goto next_job;
426 }
427 }
428 }
429
430 if (@SLOT_QUEUE) {
431 # we do not use wait_for_tick() as it returns immediately when tick is inactive
432 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait;
434 } else {
435 Coro::schedule;
436 }
306 }; 437 }
307 $TICK_WATCHER->stop; 438};
308 $guard 439
440sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main;
442
443 my ($time, $pri, $name) = @_;
444
445 $time = $TICK * .6 if $time > $TICK * .6;
446 my $sig = new Coro::Signal;
447
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready;
451 $sig->wait;
309} 452}
310 453
311=item cf::async { BLOCK } 454=item cf::async { BLOCK }
312 455
313Currently the same as Coro::async_pool, meaning you cannot use 456Currently the same as Coro::async_pool, meaning you cannot use
318 461
319BEGIN { *async = \&Coro::async_pool } 462BEGIN { *async = \&Coro::async_pool }
320 463
321=item cf::sync_job { BLOCK } 464=item cf::sync_job { BLOCK }
322 465
323The design of crossfire+ requires that the main coro ($Coro::main) is 466The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 467is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 468partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
469acceptable.
326 470
327If it must be done, put the blocking parts into C<sync_job>. This will run 471If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 472the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 473server will be frozen during this time, so the block should either finish
330fast or be very important. 474fast or be very important.
333 477
334sub sync_job(&) { 478sub sync_job(&) {
335 my ($job) = @_; 479 my ($job) = @_;
336 480
337 if ($Coro::current == $Coro::main) { 481 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 482 my $time = EV::time;
339 483
340 # this is the main coro, too bad, we have to block 484 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 485 # till the operation succeeds, freezing the server :/
342 486
343 # TODO: use suspend/resume instead 487 LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 488
345 my $freeze_guard = freeze_mainloop; 489 my $freeze_guard = freeze_mainloop;
346 490
347 my $busy = 1; 491 my $busy = 1;
348 my @res; 492 my @res;
349 493
350 (async { 494 (async {
495 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 496 @res = eval { $job->() };
352 warn $@ if $@; 497 warn $@ if $@;
353 undef $busy; 498 undef $busy;
354 })->prio (Coro::PRIO_MAX); 499 })->prio (Coro::PRIO_MAX);
355 500
356 while ($busy) { 501 while ($busy) {
357 Coro::cede or Event::one_event; 502 if (Coro::nready) {
503 Coro::cede_notself;
504 } else {
505 EV::loop EV::LOOP_ONESHOT;
358 } 506 }
507 }
359 508
360 $time = Event::time - $time; 509 my $time = EV::time - $time;
361 510
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 511 $TICK_START += $time; # do not account sync jobs to server load
366 512
367 wantarray ? @res : $res[0] 513 wantarray ? @res : $res[0]
368 } else { 514 } else {
369 # we are in another coroutine, how wonderful, everything just works 515 # we are in another coroutine, how wonderful, everything just works
370 516
390 $EXT_CORO{$coro+0} = $coro; 536 $EXT_CORO{$coro+0} = $coro;
391 537
392 $coro 538 $coro
393} 539}
394 540
395sub write_runtime { 541=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 542
398 # first touch the runtime file to show we are still running: 543Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 544process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling.
400 547
401 IO::AIO::aio_utime $runtime, undef, undef; 548=cut
402 549
403 my $guard = cf::lock_acquire "write_runtime"; 550sub fork_call(&@) {
551 my ($cb, @args) = @_;
404 552
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 553 # we seemingly have to make a local copy of the whole thing,
406 or return; 554 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious)
407 556
408 my $value = $cf::RUNTIME + 90 + 10; 557 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 558 reset_signals;
410 # 60 allows for the watchdog to kill the server. 559 &$cb
560 }, @args;
411 561
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 562 wantarray ? @res : $res[-1]
413 and return; 563}
414 564
415 # always fsync - this file is important 565=item $coin = coin_from_name $name
416 aio_fsync $fh
417 and return;
418 566
419 # touch it again to show we are up-to-date 567=cut
420 aio_utime $fh, undef, undef;
421 568
422 close $fh 569our %coin_alias = (
423 or return; 570 "silver" => "silvercoin",
571 "silvercoin" => "silvercoin",
572 "silvercoins" => "silvercoin",
573 "gold" => "goldcoin",
574 "goldcoin" => "goldcoin",
575 "goldcoins" => "goldcoin",
576 "platinum" => "platinacoin",
577 "platinumcoin" => "platinacoin",
578 "platinumcoins" => "platinacoin",
579 "platina" => "platinacoin",
580 "platinacoin" => "platinacoin",
581 "platinacoins" => "platinacoin",
582 "royalty" => "royalty",
583 "royalties" => "royalty",
584);
424 585
425 aio_rename "$runtime~", $runtime 586sub coin_from_name($) {
426 and return; 587 $coin_alias{$_[0]}
588 ? cf::arch::find $coin_alias{$_[0]}
589 : undef
590}
427 591
428 warn "runtime file written.\n"; 592=item $value = cf::db_get $family => $key
429 593
594Returns a single value from the environment database.
595
596=item cf::db_put $family => $key => $value
597
598Stores the given C<$value> in the family. It can currently store binary
599data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
600
601=item $db = cf::db_table "name"
602
603Create and/or open a new database table. The string must not be "db" and must be unique
604within each server.
605
606=cut
607
608sub db_table($) {
609 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV;
611
612 eval {
613 $db->set_flags (BDB::CHKSUM);
614
615 utf8::encode $name;
616 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
617 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
618 cf::cleanup "db_open(db): $!" if $!;
619 };
620 cf::cleanup "db_open(db): $@" if $@;
621
622 $db
623}
624
625our $DB;
626
627sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db";
630 };
631}
632
633sub db_get($$) {
634 my $key = "$_[0]/$_[1]";
635
636 cf::sync_job {
637 BDB::db_get $DB, undef, $key, my $data;
638
639 $! ? ()
640 : $data
430 1 641 }
642}
643
644sub db_put($$$) {
645 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
647}
648
649=item cf::cache $id => [$paths...], $processversion => $process
650
651Generic caching function that returns the value of the resource $id,
652caching and regenerating as required.
653
654This function can block.
655
656=cut
657
658sub cache {
659 my ($id, $src, $processversion, $process) = @_;
660
661 my $meta =
662 join "\x00",
663 $processversion,
664 map {
665 aio_stat $_
666 and Carp::croak "$_: $!";
667
668 ($_, (stat _)[7,9])
669 } @$src;
670
671 my $dbmeta = db_get cache => "$id/meta";
672 if ($dbmeta ne $meta) {
673 # changed, we may need to process
674
675 my @data;
676 my $md5;
677
678 for (0 .. $#$src) {
679 0 <= aio_load $src->[$_], $data[$_]
680 or Carp::croak "$src->[$_]: $!";
681 }
682
683 # if processing is expensive, check
684 # checksum first
685 if (1) {
686 $md5 =
687 join "\x00",
688 $processversion,
689 map {
690 cf::cede_to_tick;
691 ($src->[$_], Digest::MD5::md5_hex $data[$_])
692 } 0.. $#$src;
693
694
695 my $dbmd5 = db_get cache => "$id/md5";
696 if ($dbmd5 eq $md5) {
697 db_put cache => "$id/meta", $meta;
698
699 return db_get cache => "$id/data";
700 }
701 }
702
703 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time;
706
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
708
709 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta;
712
713 return $data;
714 }
715
716 db_get cache => "$id/data"
431} 717}
432 718
433=item cf::datalog type => key => value, ... 719=item cf::datalog type => key => value, ...
434 720
435Log a datalog packet of the given type with the given key-value pairs. 721Log a datalog packet of the given type with the given key-value pairs.
447 733
448############################################################################# 734#############################################################################
449 735
450=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
451 737
452Many objects in crossfire are so-called attachable objects. That means you can 738Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
455 741
456In the following description, CLASS can be any of C<global>, C<object> 742In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 743C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 744Deliantra).
459 745
460=over 4 746=over 4
461 747
462=item $attachable->attach ($attachment, key => $value...) 748=item $attachable->attach ($attachment, key => $value...)
463 749
507=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
508 794
509Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
511 797
512Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 799that are attached at load/instantiate time, thus the need for a name.
514 800
515These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
516 802
517=over 4 803=over 4
665 _attach $registry, $klass, @attach; 951 _attach $registry, $klass, @attach;
666 } 952 }
667 953
668 $obj->{$name} = \%arg; 954 $obj->{$name} = \%arg;
669 } else { 955 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 956 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 957 }
672 958
673 $obj->{_attachment}{$name} = undef; 959 $obj->{_attachment}{$name} = undef;
674} 960}
675 961
715 "; 1001 ";
716 die if $@; 1002 die if $@;
717} 1003}
718 1004
719our $override; 1005our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1006our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1007
722sub override { 1008sub override {
723 $override = 1; 1009 $override = 1;
724 @invoke_results = (); 1010 @INVOKE_RESULTS = (@_);
725} 1011}
726 1012
727sub do_invoke { 1013sub do_invoke {
728 my $event = shift; 1014 my $event = shift;
729 my $callbacks = shift; 1015 my $callbacks = shift;
730 1016
731 @invoke_results = (); 1017 @INVOKE_RESULTS = ();
732 1018
733 local $override; 1019 local $override;
734 1020
735 for (@$callbacks) { 1021 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1022 eval { &{$_->[1]} };
745 } 1031 }
746 1032
747 0 1033 0
748} 1034}
749 1035
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1037
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1039
754Generate an object-specific event with the given arguments. 1040Generate an object-specific event with the given arguments.
755 1041
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1042This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1043removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1044results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1045
760=back 1046=back
761 1047
762=cut 1048=cut
763 1049
764############################################################################# 1050#############################################################################
765# object support 1051# object support
1052
1053sub _object_equal($$);
1054sub _object_equal($$) {
1055 my ($a, $b) = @_;
1056
1057 return 0 unless (ref $a) eq (ref $b);
1058
1059 if ("HASH" eq ref $a) {
1060 my @ka = keys %$a;
1061 my @kb = keys %$b;
1062
1063 return 0 if @ka != @kb;
1064
1065 for (0 .. $#ka) {
1066 return 0 unless $ka[$_] eq $kb[$_];
1067 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1068 }
1069
1070 } elsif ("ARRAY" eq ref $a) {
1071
1072 return 0 if @$a != @$b;
1073
1074 for (0 .. $#$a) {
1075 return 0 unless _object_equal $a->[$_], $b->[$_];
1076 }
1077
1078 } elsif ($a ne $b) {
1079 return 0;
1080 }
1081
1082 1
1083}
1084
1085our $SLOW_MERGES;#d#
1086sub _can_merge {
1087 my ($ob1, $ob2) = @_;
1088
1089 ++$SLOW_MERGES;#d#
1090
1091 # we do the slow way here
1092 return _object_equal $ob1, $ob2
1093}
766 1094
767sub reattach { 1095sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1097 my ($obj) = @_;
770 1098
1099 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1100 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1101
773 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
774 1103
775 @$registry = (); 1104 @$registry = ();
776 1105
791cf::attachable->attach ( 1120cf::attachable->attach (
792 prio => -1000000, 1121 prio => -1000000,
793 on_instantiate => sub { 1122 on_instantiate => sub {
794 my ($obj, $data) = @_; 1123 my ($obj, $data) = @_;
795 1124
796 $data = from_json $data; 1125 $data = decode_json $data;
797 1126
798 for (@$data) { 1127 for (@$data) {
799 my ($name, $args) = @$_; 1128 my ($name, $args) = @$_;
800 1129
801 $obj->attach ($name, %{$args || {} }); 1130 $obj->attach ($name, %{$args || {} });
817sub object_freezer_save { 1146sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1147 my ($filename, $rdata, $objs) = @_;
819 1148
820 sync_job { 1149 sync_job {
821 if (length $$rdata) { 1150 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
824 1154
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1159 aio_close $fh;
830 1160
831 if (@$objs) { 1161 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1167 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
839 } 1169 }
840 } else { 1170 } else {
841 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
842 } 1172 }
847 } 1177 }
848 } else { 1178 } else {
849 aio_unlink $filename; 1179 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1180 aio_unlink "$filename.pst";
851 } 1181 }
852 } 1182 };
853} 1183}
854 1184
855sub object_freezer_as_string { 1185sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1186 my ($rdata, $objs) = @_;
857 1187
869 or return; 1199 or return;
870 1200
871 unless (aio_stat "$filename.pst") { 1201 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1202 (aio_load "$filename.pst", $av) >= 0
873 or return; 1203 or return;
1204
874 $av = eval { (Storable::thaw $av)->{objs} }; 1205 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs};
875 } 1207 }
876 1208
1209 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1210 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1211 $decname, length $data, scalar @{$av || []};
1212
879 return ($data, $av); 1213 ($data, $av)
880} 1214}
1215
1216=head2 COMMAND CALLBACKS
1217
1218=over 4
1219
1220=cut
881 1221
882############################################################################# 1222#############################################################################
883# command handling &c 1223# command handling &c
884 1224
885=item cf::register_command $name => \&callback($ob,$args); 1225=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1238 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1239}
900 1240
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1241=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1242
903Register a callbackf ro execution when the client sends an extcmd packet. 1243Register a callback for execution when the client sends an (synchronous)
1244extcmd packet. Ext commands will be processed in the order they are
1245received by the server, like other user commands. The first argument is
1246the logged-in player. Ext commands can only be processed after a player
1247has logged in successfully.
904 1248
905If the callback returns something, it is sent back as if reply was being 1249If the callback returns something, it is sent back as if reply was being
906called. 1250called.
907 1251
1252=item cf::register_exticmd $name => \&callback($ns,$packet);
1253
1254Register a callback for execution when the client sends an (asynchronous)
1255exticmd packet. Exti commands are processed by the server as soon as they
1256are received, i.e. out of order w.r.t. other commands. The first argument
1257is a client socket. Exti commands can be received anytime, even before
1258log-in.
1259
1260If the callback returns something, it is sent back as if reply was being
1261called.
1262
908=cut 1263=cut
909 1264
910sub register_extcmd { 1265sub register_extcmd {
911 my ($name, $cb) = @_; 1266 my ($name, $cb) = @_;
912 1267
913 $EXTCMD{$name} = $cb; 1268 $EXTCMD{$name} = $cb;
1269}
1270
1271sub register_exticmd {
1272 my ($name, $cb) = @_;
1273
1274 $EXTICMD{$name} = $cb;
914} 1275}
915 1276
916cf::player->attach ( 1277cf::player->attach (
917 on_command => sub { 1278 on_command => sub {
918 my ($pl, $name, $params) = @_; 1279 my ($pl, $name, $params) = @_;
927 cf::override; 1288 cf::override;
928 }, 1289 },
929 on_extcmd => sub { 1290 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1291 my ($pl, $buf) = @_;
931 1292
932 my $msg = eval { from_json $buf }; 1293 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1294
934 if (ref $msg) { 1295 if (ref $msg) {
1296 my ($type, $reply, @payload) =
1297 "ARRAY" eq ref $msg
1298 ? @$msg
1299 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1300
1301 my @reply;
1302
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1303 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1304 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1305 }
1306
1307 $pl->ext_reply ($reply, @reply)
1308 if $reply;
1309
940 } else { 1310 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1312 }
943 1313
944 cf::override; 1314 cf::override;
945 }, 1315 },
946); 1316);
947 1317
948sub load_extension {
949 my ($path) = @_;
950
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
952 my $base = $1;
953 my $pkg = $1;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 }
976 die $@;
977 }
978
979 push @EXTS, $pkg;
980}
981
982sub load_extensions { 1318sub load_extensions {
1319 cf::sync_job {
1320 my %todo;
1321
983 for my $ext (<$LIBDIR/*.ext>) { 1322 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1323 next unless -r $path;
985 eval { 1324
986 load_extension $ext; 1325 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1326 my $base = $1;
1327 my $pkg = $1;
1328 $pkg =~ s/[^[:word:]]/_/g;
1329 $pkg = "ext::$pkg";
1330
1331 open my $fh, "<:utf8", $path
1332 or die "$path: $!";
1333
1334 my $source = do { local $/; <$fh> };
1335
1336 my %ext = (
1337 path => $path,
1338 base => $base,
1339 pkg => $pkg,
1340 );
1341
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344
1345 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1347 . "#line 1 \"$path\"\n{\n"
1348 . $source
1349 . "\n};\n1";
1350
1351 $todo{$base} = \%ext;
1352 }
1353
1354 my %done;
1355 while (%todo) {
1356 my $progress;
1357
1358 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip
1361 unless exists $done{$_};
1362 }
1363
1364 warn "... loading '$k' into '$v->{pkg}'\n";
1365
1366 unless (eval $v->{source}) {
1367 my $msg = $@ ? "$v->{path}: $@\n"
1368 : "$v->{base}: extension inactive.\n";
1369
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting.";
1373 }
1374
1375 warn $msg;
1376 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
987 1 1381 }
988 } or warn "$ext not loaded: $@"; 1382
1383 skip:
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1385 unless $progress;
1386 }
989 } 1387 };
990} 1388}
991 1389
992############################################################################# 1390#############################################################################
993 1391
1392=back
1393
994=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
995 1395
996Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
997 1397
998=cut 1398=cut
999 1399
1000package cf::player; 1400package cf::player;
1001 1401
1002use Coro::AIO; 1402use Coro::AIO;
1003 1403
1004=head3 cf::player 1404=head3 cf::player
1005 1405
1006=over 4 1406=over 4
1407
1408=item cf::player::num_playing
1409
1410Returns the official number of playing players, as per the Crossfire metaserver rules.
1411
1412=cut
1413
1414sub num_playing {
1415 scalar grep
1416 $_->ob->map
1417 && !$_->hidden
1418 && !$_->ob->flag (cf::FLAG_WIZ),
1419 cf::player::list
1420}
1007 1421
1008=item cf::player::find $login 1422=item cf::player::find $login
1009 1423
1010Returns the given player object, loading it if necessary (might block). 1424Returns the given player object, loading it if necessary (might block).
1011 1425
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1461 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1462 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1463 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1464 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1465
1052 my $pl = load_pl path $login 1466 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1467 or return;
1468
1469 my $pl = cf::player::load_pl $f
1470 or return;
1471
1472 local $cf::PLAYER_LOADING{$login} = $pl;
1473 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1055 } 1475 }
1056 } 1476 }
1057} 1477}
1058 1478
1067 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1068 1488
1069 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1071 1491
1492 cf::get_slot 0.01;
1493
1072 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1073 Coro::cede; 1495 cf::cede_to_tick;
1074} 1496}
1075 1497
1076sub new($) { 1498sub new($) {
1077 my ($login) = @_; 1499 my ($login) = @_;
1078 1500
1084 $cf::PLAYER{$login} = $self; 1506 $cf::PLAYER{$login} = $self;
1085 1507
1086 $self 1508 $self
1087} 1509}
1088 1510
1511=item $player->send_msg ($channel, $msg, $color, [extra...])
1512
1513=cut
1514
1515sub send_msg {
1516 my $ns = shift->ns
1517 or return;
1518 $ns->send_msg (@_);
1519}
1520
1089=item $pl->quit_character 1521=item $pl->quit_character
1090 1522
1091Nukes the player without looking back. If logged in, the connection will 1523Nukes the player without looking back. If logged in, the connection will
1092be destroyed. May block for a long time. 1524be destroyed. May block for a long time.
1093 1525
1097 my ($pl) = @_; 1529 my ($pl) = @_;
1098 1530
1099 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1100 1532
1101 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1102 $pl->password ("*"); # this should lock out the player until we nuked the dir 1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1103 1535
1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1105 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1106 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1107 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1108 1542
1109 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1110 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
1146 or return []; 1580 or return [];
1147 1581
1148 my @logins; 1582 my @logins;
1149 1583
1150 for my $login (@$dirs) { 1584 for my $login (@$dirs) {
1585 my $path = path $login;
1586
1587 # a .pst is a dead give-away for a valid player
1588 # if no pst file found, open and chekc for blocked users
1589 if (aio_stat "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1593 }
1154 1594
1155 utf8::decode $login; 1595 utf8::decode $login;
1156 push @logins, $login; 1596 push @logins, $login;
1157 } 1597 }
1158 1598
1185 } 1625 }
1186 1626
1187 \@paths 1627 \@paths
1188} 1628}
1189 1629
1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1631
1632Expand deliantra pod fragments into protocol xml.
1633
1190=item $player->ext_reply ($msgid, %msg) 1634=item $player->ext_reply ($msgid, @msg)
1191 1635
1192Sends an ext reply to the player. 1636Sends an ext reply to the player.
1193 1637
1194=cut 1638=cut
1195 1639
1196sub ext_reply($$%) { 1640sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1641 my ($self, $id, @msg) = @_;
1198 1642
1199 $msg{msgid} = $id; 1643 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1644}
1203 1645
1204=item $player->ext_event ($type, %msg) 1646=item $player->ext_msg ($type, @msg)
1205 1647
1206Sends an ext event to the client. 1648Sends an ext event to the client.
1207 1649
1208=cut 1650=cut
1209 1651
1210sub ext_event($$%) { 1652sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1653 my ($self, $type, @msg) = @_;
1212 1654
1213 $self->ns->ext_event ($type, %msg); 1655 $self->ns->ext_msg ($type, @msg);
1214} 1656}
1215 1657
1216=head3 cf::region 1658=head3 cf::region
1217 1659
1218=over 4 1660=over 4
1221 1663
1222package cf::region; 1664package cf::region;
1223 1665
1224=item cf::region::find_by_path $path 1666=item cf::region::find_by_path $path
1225 1667
1226Tries to decuce the probable region for a map knowing only its path. 1668Tries to decuce the likely region for a map knowing only its path.
1227 1669
1228=cut 1670=cut
1229 1671
1230sub find_by_path($) { 1672sub find_by_path($) {
1231 my ($path) = @_; 1673 my ($path) = @_;
1232 1674
1233 my ($match, $specificity); 1675 my ($match, $specificity);
1234 1676
1235 for my $region (list) { 1677 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1678 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1679 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1680 if $region->specificity > $specificity;
1239 } 1681 }
1240 } 1682 }
1241 1683
1262our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1263our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1264 1706
1265sub generate_random_map { 1707sub generate_random_map {
1266 my ($self, $rmp) = @_; 1708 my ($self, $rmp) = @_;
1709
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711
1267 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1268 $self->_create_random_map ( 1713 $self->_create_random_map (
1269 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1270 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1271 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1305 my ($self, $merge) = @_; 1750 my ($self, $merge) = @_;
1306 1751
1307 # we have to keep some variables in memory intact 1752 # we have to keep some variables in memory intact
1308 local $self->{path}; 1753 local $self->{path};
1309 local $self->{load_path}; 1754 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1755
1313 $self->SUPER::thawer_merge ($merge); 1756 $self->SUPER::thawer_merge ($merge);
1314} 1757}
1315 1758
1316sub normalise { 1759sub normalise {
1363 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1364 return $self; 1807 return $self;
1365 } 1808 }
1366 } 1809 }
1367 1810
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1369 () 1812 ()
1370} 1813}
1371 1814
1372sub init { 1815sub init {
1373 my ($self) = @_; 1816 my ($self) = @_;
1395 1838
1396# the temporary/swap location 1839# the temporary/swap location
1397sub save_path { 1840sub save_path {
1398 my ($self) = @_; 1841 my ($self) = @_;
1399 1842
1400 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1401 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1402} 1845}
1403 1846
1404# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1405sub uniq_path { 1848sub uniq_path {
1406 my ($self) = @_; 1849 my ($self) = @_;
1407 1850
1408 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1409 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1410} 1853}
1411 1854
1412# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1413# all maps in C++... 1856# all maps in C++...
1416 1859
1417 $_->change_map_light ($change) 1860 $_->change_map_light ($change)
1418 for grep $_->outdoor, values %cf::MAP; 1861 for grep $_->outdoor, values %cf::MAP;
1419} 1862}
1420 1863
1864sub decay_objects {
1865 my ($self) = @_;
1866
1867 return if $self->{deny_reset};
1868
1869 $self->do_decay_objects;
1870}
1871
1421sub unlink_save { 1872sub unlink_save {
1422 my ($self) = @_; 1873 my ($self) = @_;
1423 1874
1424 utf8::encode (my $save = $self->save_path); 1875 utf8::encode (my $save = $self->save_path);
1425 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1876 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1428 1879
1429sub load_header_from($) { 1880sub load_header_from($) {
1430 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1431 1882
1432 utf8::encode $path; 1883 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1438 1892
1439 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1440 1894
1441 1 1895 1
1442} 1896}
1481 $self->load_header_orig 1935 $self->load_header_orig
1482 or return; 1936 or return;
1483 $self->prepare_orig; 1937 $self->prepare_orig;
1484 } 1938 }
1485 1939
1940 $self->{deny_reset} = 1
1941 if $self->no_reset;
1942
1486 $self->default_region (cf::region::find_by_path $self->{path}) 1943 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 1944 unless $self->default_region;
1488 1945
1489 1 1946 1
1490} 1947}
1493sub find { 1950sub find {
1494 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1495 1952
1496 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1497 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1499 1957
1500 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1501 my $guard = cf::lock_acquire "map_find:$path"; 1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1502 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1503 or return; 1963 or return;
1504 1964
1505 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1506 1966
1507 $map->load_header 1967 $map->load_header
1508 or return; 1968 or return;
1509 1969
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1513 $map->reset; 1975 $map->reset;
1514 undef $guard;
1515 return find $path; 1976 return find $path;
1516 } 1977 }
1517 1978
1518 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1519 } 1980 }
1528 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1529 1990
1530 my $path = $self->{path}; 1991 my $path = $self->{path};
1531 1992
1532 { 1993 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1534 1995
1996 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 1998
1537 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1538 2000
1539 $self->alloc; 2001 $self->alloc;
1540 2002
1541 $self->pre_load; 2003 $self->pre_load;
1542 Coro::cede; 2004 cf::cede_to_tick;
1543 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1545 or return; 2009 or return;
1546 2010
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1548 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1549 2013
1550 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 2015 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 2018 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1555 } 2022 }
1556 } 2023 }
1557 2024
1558 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1559 # now do the right thing for maps 2028 # now do the right thing for maps
1560 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 2031 unless $self->difficulty;
1563 Coro::cede; 2032 cf::cede_to_tick;
1564 2033
1565 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 2035 $self->decay_objects;
1567 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1568 $self->update_buttons; 2037 $self->update_buttons;
1569 Coro::cede; 2038 cf::cede_to_tick;
1570 $self->set_darkness_map; 2039 $self->set_darkness_map;
1571 Coro::cede; 2040 cf::cede_to_tick;
1572 $self->activate; 2041 $self->activate;
1573 } 2042 }
1574 2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
1575 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1576 } 2048 }
1577 2049
1578 $self->post_load; 2050 $self->post_load;
1579} 2051}
1580 2052
1582 my ($self, $ob) = @_; 2054 my ($self, $ob) = @_;
1583 2055
1584 return find "~" . $ob->name . "/" . $self->{path} 2056 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 2057 if $self->per_player;
1586 2058
2059# return find "?party/" . $ob->name . "/" . $self->{path}
2060# if $self->per_party;
2061
1587 $self 2062 $self
1588} 2063}
1589 2064
1590# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1591sub load_diag { 2066sub load_neighbours {
1592 my ($map) = @_; 2067 my ($map) = @_;
1593 2068
1594 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1595 2070
1596 for (0 .. 3) { 2071 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1598 or next; 2073 or next;
1599 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1600 or next; 2075 or next;
1601 $neigh->load; 2076 $neigh->load;
1602 2077
2078 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2081 }
1606 2082
1607 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1609 or next; 2086 or next;
1610 $neigh->load; 2087 $neigh->load;
1611 } 2088 }
1612} 2089}
1613 2090
1618} 2095}
1619 2096
1620sub do_load_sync { 2097sub do_load_sync {
1621 my ($map) = @_; 2098 my ($map) = @_;
1622 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1623 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1624} 2104}
1625 2105
1626our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1628 2108
1629sub find_async { 2109sub find_async {
1630 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1631 2111
1632 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1633 2113
1634 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1636 } 2116 }
1637 2117
1638 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1639 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1640 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2125 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2126 $map->load if $v;
2127 }
1645 2128
1646 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1647 } 2130 }
1648 } 2131 }
1649 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1650 }; 2133 };
1651 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1654} 2137}
1655 2138
1656sub save { 2139sub save {
1657 my ($self) = @_; 2140 my ($self) = @_;
1658 2141
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2143
1661 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1662 2145
1663 return unless $self->dirty; 2146 return unless $self->dirty;
1664 2147
1670 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1671 2154
1672 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1673 2156
1674 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1676 }; 2160 };
2161
2162 cf::get_slot 0.02;
1677 2163
1678 if ($uniq) { 2164 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1681 } else { 2167 } else {
1687 my ($self) = @_; 2173 my ($self) = @_;
1688 2174
1689 # save first because save cedes 2175 # save first because save cedes
1690 $self->save; 2176 $self->save;
1691 2177
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2179
1694 return if $self->players; 2180 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
1696 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1697 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1698 $self->clear; 2188 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2189}
1701 2190
1702sub reset_at { 2191sub reset_at {
1703 my ($self) = @_; 2192 my ($self) = @_;
1704 2193
1705 # TODO: safety, remove and allow resettable per-player maps 2194 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 2195 return 1e99 if $self->{deny_reset};
1708 2196
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2199
1722 my ($self) = @_; 2210 my ($self) = @_;
1723 2211
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2213
1726 return if $self->players; 2214 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2215
1729 warn "resetting map ", $self->path; 2216 warn "resetting map ", $self->path;
1730 2217
1731 $self->in_memory (cf::MAP_SWAPPED); 2218 $self->in_memory (cf::MAP_SWAPPED);
1732 2219
1738 if $uniq; 2225 if $uniq;
1739 } 2226 }
1740 2227
1741 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
1742 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2232 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2233
1747 $self->unlink_save; 2234 $self->unlink_save;
1748 $self->destroy; 2235 $self->destroy;
1749} 2236}
1750 2237
1751my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
1752 2239
1753sub nuke { 2240sub nuke {
1754 my ($self) = @_; 2241 my ($self) = @_;
1755 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
1756 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1757 2247
1758 $self->unlink_save; 2248 $self->unlink_save;
1759 2249
1760 bless $self, "cf::map"; 2250 bless $self, "cf::map";
1761 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2255
1766 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
1767 2258
1768 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
2260}
2261
2262=item $maps = cf::map::tmp_maps
2263
2264Returns an arrayref with all map paths of currently instantiated and saved
2265maps. May block.
2266
2267=cut
2268
2269sub tmp_maps() {
2270 [
2271 map {
2272 utf8::decode $_;
2273 /\.map$/
2274 ? normalise $_
2275 : ()
2276 } @{ aio_readdir $TMPDIR or [] }
2277 ]
2278}
2279
2280=item $maps = cf::map::random_maps
2281
2282Returns an arrayref with all map paths of currently instantiated and saved
2283random maps. May block.
2284
2285=cut
2286
2287sub random_maps() {
2288 [
2289 map {
2290 utf8::decode $_;
2291 /\.map$/
2292 ? normalise "?random/$_"
2293 : ()
2294 } @{ aio_readdir $RANDOMDIR or [] }
2295 ]
1769} 2296}
1770 2297
1771=item cf::map::unique_maps 2298=item cf::map::unique_maps
1772 2299
1773Returns an arrayref of paths of all shared maps that have 2300Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2301instantiated unique items. May block.
1775 2302
1776=cut 2303=cut
1777 2304
1778sub unique_maps() { 2305sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2306 [
1780 or return; 2307 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2308 utf8::decode $_;
1786 next if /\.pst$/; 2309 s/\.map$//; # TODO future compatibility hack
1787 next unless /^$PATH_SEP/o; 2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1788 2311 ? ()
1789 push @paths, cf::map::normalise $_; 2312 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2314 ]
1791
1792 \@paths
1793} 2315}
1794
1795package cf;
1796 2316
1797=back 2317=back
1798 2318
1799=head3 cf::object 2319=head3 cf::object
1800 2320
1804 2324
1805=over 4 2325=over 4
1806 2326
1807=item $ob->inv_recursive 2327=item $ob->inv_recursive
1808 2328
1809Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
1810 2331
1811=cut 2332=cut
1812 2333
1813sub inv_recursive_; 2334sub inv_recursive_;
1814sub inv_recursive_ { 2335sub inv_recursive_ {
1817 2338
1818sub inv_recursive { 2339sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
1820} 2341}
1821 2342
2343=item $ref = $ob->ref
2344
2345Creates and returns a persistent reference to an object that can be stored as a string.
2346
2347=item $ob = cf::object::deref ($refstring)
2348
2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2350even if the object actually exists. May block.
2351
2352=cut
2353
2354sub deref {
2355 my ($ref) = @_;
2356
2357 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2358 my ($uuid, $name) = ($1, $2);
2359 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2360 or return;
2361 $pl->ob->uuid eq $uuid
2362 or return;
2363
2364 $pl->ob
2365 } else {
2366 warn "$ref: cannot resolve object reference\n";
2367 undef
2368 }
2369}
2370
1822package cf; 2371package cf;
1823 2372
1824=back 2373=back
1825 2374
1826=head3 cf::object::player 2375=head3 cf::object::player
1832Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2381Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1833can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
1834dialogue with the given NPC character. 2383dialogue with the given NPC character.
1835 2384
1836=cut 2385=cut
2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
1837 2400
1838# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
1839# with dialog boxes. 2402# with dialog boxes.
1840#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
1841sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
1843 2406
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2407 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2408
1846 if ($self->{record_replies}) { 2409 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2410 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2411
1848 } else { 2412 } else {
2413 my $pl = $self->contr;
2414
2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2416 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418
2419 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 }
1851 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
1852} 2434}
1853 2435
1854=item $player_object->may ("access") 2436=item $player_object->may ("access")
1855 2437
1856Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
1869 2451
1870=item $player_object->enter_link 2452=item $player_object->enter_link
1871 2453
1872Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
1873 2455
1874The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
1875I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
1876 2460
1877Will never block. 2461Will never block.
1878 2462
1879=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
1880 2464
1935 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
1938 2522
1939 $map->load; 2523 $map->load;
1940 $map->load_diag; 2524 $map->load_neighbours;
1941 2525
1942 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
1943 $self->activate_recursive; 2528 $self->activate_recursive;
1944 2529
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
1947} 2532}
1948 2533
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1950 2535
1951Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2538that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2539the new (success) or old (failed) map position. In either case, $done will
2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
1955 2544
1956=cut 2545=cut
1957 2546
1958our $GOTOGEN; 2547our $GOTOGEN;
1959 2548
1960sub cf::object::player::goto { 2549sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2550 my ($self, $path, $x, $y, $check, $done) = @_;
1962 2551
1963 # do generation counting so two concurrent goto's will be executed in-order 2552 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2554
1966 $self->enter_link; 2555 $self->enter_link;
1967 2556
1968 (async { 2557 (async {
2558 $Coro::current->{desc} = "player::goto $path $x $y";
2559
2560 # *tag paths override both path and x|y
2561 if ($path =~ /^\*(.*)$/) {
2562 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2563 my $ob = $obs[rand @obs];
2564
2565 # see if we actually can go there
2566 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2567 $ob = $obs[rand @obs];
2568 } else {
2569 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2570 }
2571 # else put us there anyways for now #d#
2572
2573 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2574 } else {
2575 ($path, $x, $y) = (undef, undef, undef);
2576 }
2577 }
2578
1969 my $map = eval { 2579 my $map = eval {
1970 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
1971 2581
1972 if ($map) { 2582 if ($map) {
1973 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
1975 } else { 2585 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2587 }
1978 2588
1979 $map 2589 $map
1980 }; 2590 };
1981 2591
1986 2596
1987 if ($gen == $self->{_goto_generation}) { 2597 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2598 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2599 $self->leave_link ($map, $x, $y);
1990 } 2600 }
2601
2602 $done->() if $done;
1991 })->prio (1); 2603 })->prio (1);
1992} 2604}
1993 2605
1994=item $player_object->enter_exit ($exit_object) 2606=item $player_object->enter_exit ($exit_object)
1995 2607
2015} 2627}
2016 2628
2017sub prepare_random_map { 2629sub prepare_random_map {
2018 my ($exit) = @_; 2630 my ($exit) = @_;
2019 2631
2020 my $guard = cf::lock_acquire "exit_prepare:$exit";
2021
2022 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2023 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2024 # that depends on the exit object 2634 # that depends on the exit object
2025 2635
2026 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2028 if ($exit->map) { 2638 if ($exit->map) {
2029 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2030 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2031 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2032 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2033 } 2645 }
2034 2646
2035 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2036 2648
2037 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2038 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2039 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2040 2652
2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2042 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2043 undef $fh; 2655 undef $fh;
2044 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2045 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2046 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2047 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2048 } 2664 }
2049} 2665}
2050 2666
2051sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2052 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2053 2669
2054 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2055 2671
2056 if ($exit->slaying eq "/!") {
2057 #TODO: this should de-fi-ni-te-ly not be a sync-job
2058 # the problem is that $exit might not survive long enough
2059 # so it needs to be done right now, right here
2060 cf::sync_job { prepare_random_map $exit };
2061 }
2062
2063 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2064 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp;
2066
2067 $self->enter_link; 2672 $self->enter_link;
2068 2673
2069 (async { 2674 (async {
2070 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2071 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2072 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2073 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2074 1; 2698 1
2075 }) { 2699 }) {
2076 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2077 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2078 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2079 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2080 2704
2081 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2100 2724
2101 utf8::encode $text; 2725 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2727}
2104 2728
2729=item $client->send_msg ($channel, $msg, $color, [extra...])
2730
2731Send a drawinfo or msg packet to the client, formatting the msg for the
2732client if neccessary. C<$type> should be a string identifying the type of
2733the message, with C<log> being the default. If C<$color> is negative, suppress
2734the message unless the client supports the msg packet.
2735
2736=cut
2737
2738# non-persistent channels (usually the info channel)
2739our %CHANNEL = (
2740 "c/identify" => {
2741 id => "infobox",
2742 title => "Identify",
2743 reply => undef,
2744 tooltip => "Items recently identified",
2745 },
2746 "c/examine" => {
2747 id => "infobox",
2748 title => "Examine",
2749 reply => undef,
2750 tooltip => "Signs and other items you examined",
2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2758 "c/lookat" => {
2759 id => "infobox",
2760 title => "Look",
2761 reply => undef,
2762 tooltip => "What you saw there",
2763 },
2764 "c/who" => {
2765 id => "infobox",
2766 title => "Players",
2767 reply => undef,
2768 tooltip => "Shows players who are currently online",
2769 },
2770 "c/body" => {
2771 id => "infobox",
2772 title => "Body Parts",
2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available",
2775 },
2776 "c/uptime" => {
2777 id => "infobox",
2778 title => "Uptime",
2779 reply => undef,
2780 tooltip => "How long the server has been running since last restart",
2781 },
2782 "c/mapinfo" => {
2783 id => "infobox",
2784 title => "Map Info",
2785 reply => undef,
2786 tooltip => "Information related to the maps",
2787 },
2788 "c/party" => {
2789 id => "party",
2790 title => "Party",
2791 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party",
2793 },
2794);
2795
2796sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_;
2798
2799 $msg = $self->pl->expand_cfpod ($msg)
2800 unless $color & cf::NDI_VERBATIM;
2801
2802 $color &= cf::NDI_CLIENT_MASK; # just in case...
2803
2804 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel};
2807
2808 $self->ext_msg (channel_info => $channel)
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id};
2812
2813 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel)
2818 if $self->can_msg;
2819 }
2820
2821 $channel = $channel->{id};
2822 }
2823
2824 return unless @extra || length $msg;
2825
2826 if ($self->can_msg) {
2827 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF;
2830
2831 my $pkt = "msg "
2832 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 );
2835
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872}
2873
2105=item $client->ext_event ($type, %msg) 2874=item $client->ext_msg ($type, @msg)
2106 2875
2107Sends an exti event to the client. 2876Sends an ext event to the client.
2108 2877
2109=cut 2878=cut
2110 2879
2111sub cf::client::ext_event($$%) { 2880sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 2881 my ($self, $type, @msg) = @_;
2113 2882
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 2886 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 }
2889}
2890
2891=item $client->ext_reply ($msgid, @msg)
2892
2893Sends an ext reply to the client.
2894
2895=cut
2896
2897sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_;
2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 }
2116} 2907}
2117 2908
2118=item $success = $client->query ($flags, "text", \&cb) 2909=item $success = $client->query ($flags, "text", \&cb)
2119 2910
2120Queues a query to the client, calling the given callback with 2911Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2912the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2913C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 2914
2124Queries can fail, so check the return code. Or don't, as queries will become 2915Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 2916become reliable at some point in the future.
2126 2917
2127=cut 2918=cut
2128 2919
2129sub cf::client::query { 2920sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 2921 my ($self, $flags, $text, $cb) = @_;
2138 utf8::encode $text; 2929 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2930 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 2931
2141 $self->send_packet ($self->{query_queue}[0][0]) 2932 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 2933 if @{ $self->{query_queue} } == 1;
2934
2935 1
2143} 2936}
2144 2937
2145cf::client->attach ( 2938cf::client->attach (
2939 on_connect => sub {
2940 my ($ns) = @_;
2941
2942 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2943 },
2146 on_reply => sub { 2944 on_reply => sub {
2147 my ($ns, $msg) = @_; 2945 my ($ns, $msg) = @_;
2148 2946
2149 # this weird shuffling is so that direct followup queries 2947 # this weird shuffling is so that direct followup queries
2150 # get handled first 2948 # get handled first
2162 } else { 2960 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2961 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 2962 }
2165 } 2963 }
2166 }, 2964 },
2965 on_exticmd => sub {
2966 my ($ns, $buf) = @_;
2967
2968 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2969
2970 if (ref $msg) {
2971 my ($type, $reply, @payload) =
2972 "ARRAY" eq ref $msg
2973 ? @$msg
2974 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2975
2976 my @reply;
2977
2978 if (my $cb = $EXTICMD{$type}) {
2979 @reply = $cb->($ns, @payload);
2980 }
2981
2982 $ns->ext_reply ($reply, @reply)
2983 if $reply;
2984
2985 } else {
2986 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2987 }
2988
2989 cf::override;
2990 },
2167); 2991);
2168 2992
2169=item $client->async (\&cb) 2993=item $client->async (\&cb)
2170 2994
2171Create a new coroutine, running the specified callback. The coroutine will 2995Create a new coroutine, running the specified callback. The coroutine will
2212our $safe = new Safe "safe"; 3036our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 3037our $safe_hole = new Safe::Hole;
2214 3038
2215$SIG{FPE} = 'IGNORE'; 3039$SIG{FPE} = 'IGNORE';
2216 3040
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3041$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math
3043 grepstart grepwhile mapstart mapwhile
3044 sort time
3045));
2218 3046
2219# here we export the classes and methods available to script code 3047# here we export the classes and methods available to script code
2220 3048
2221=pod 3049=pod
2222 3050
2223The following functions and methods are available within a safe environment: 3051The following functions and methods are available within a safe environment:
2224 3052
2225 cf::object contr pay_amount pay_player map 3053 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split
3056
2226 cf::object::player player 3057 cf::object::player
2227 cf::player peaceful 3058 player
2228 cf::map trigger 3059
3060 cf::player
3061 peaceful
3062
3063 cf::map
3064 trigger
2229 3065
2230=cut 3066=cut
2231 3067
2232for ( 3068for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)],
2234 ["cf::object::player" => qw(player)], 3072 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 3073 ["cf::player" => qw(peaceful)],
2236 ["cf::map" => qw(trigger)], 3074 ["cf::map" => qw(trigger)],
2237) { 3075) {
2238 no strict 'refs'; 3076 no strict 'refs';
2309=back 3147=back
2310 3148
2311=cut 3149=cut
2312 3150
2313############################################################################# 3151#############################################################################
2314
2315=head2 EXTENSION DATABASE SUPPORT
2316
2317Crossfire maintains a very simple database for extension use. It can
2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2319convert to/from binary).
2320
2321The parameter C<$family> should best start with the name of the extension
2322using it, it should be unique.
2323
2324=over 4
2325
2326=item $value = cf::db_get $family => $key
2327
2328Returns a single value from the database.
2329
2330=item cf::db_put $family => $key => $value
2331
2332Stores the given C<$value> in the family.
2333
2334=cut
2335
2336our $DB;
2337
2338sub db_init {
2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2341
2342 cf::sync_job {
2343 eval {
2344 $DB->set_flags (BDB::CHKSUM);
2345
2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2348 cf::cleanup "db_open(db): $!" if $!;
2349 };
2350 cf::cleanup "db_open(db): $@" if $@;
2351 };
2352 }
2353}
2354
2355sub db_get($$) {
2356 my $key = "$_[0]/$_[1]";
2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2366sub db_put($$$) {
2367 BDB::dbreq_pri 4;
2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2483}
2484
2485#############################################################################
2486# the server's init and main functions 3152# the server's init and main functions
2487 3153
2488sub load_facedata($) { 3154sub load_facedata($) {
2489 my ($path) = @_; 3155 my ($path) = @_;
3156
3157 # HACK to clear player env face cache, we need some signal framework
3158 # for this (global event?)
3159 %ext::player_env::MUSIC_FACE_CACHE = ();
3160
3161 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2490 3162
2491 warn "loading facedata from $path\n"; 3163 warn "loading facedata from $path\n";
2492 3164
2493 my $facedata; 3165 my $facedata;
2494 0 < aio_load $path, $facedata 3166 0 < aio_load $path, $facedata
2497 $facedata = Coro::Storable::thaw $facedata; 3169 $facedata = Coro::Storable::thaw $facedata;
2498 3170
2499 $facedata->{version} == 2 3171 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3172 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3173
3174 # patch in the exptable
3175 $facedata->{resource}{"res/exp_table"} = {
3176 type => FT_RSRC,
3177 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3178 };
3179 cf::cede_to_tick;
3180
2502 { 3181 {
2503 my $faces = $facedata->{faceinfo}; 3182 my $faces = $facedata->{faceinfo};
2504 3183
2505 while (my ($face, $info) = each %$faces) { 3184 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3185 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3187 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3189 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3190 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2510 Coro::cede; 3191
3192 cf::cede_to_tick;
2511 } 3193 }
2512 3194
2513 while (my ($face, $info) = each %$faces) { 3195 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3196 next unless $info->{smooth};
3197
2515 my $idx = cf::face::find $face 3198 my $idx = cf::face::find $face
2516 or next; 3199 or next;
3200
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3201 if (my $smooth = cf::face::find $info->{smooth}) {
3202 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3203 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3204 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3205 warn "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3206 }
2522 Coro::cede; 3207
3208 cf::cede_to_tick;
2523 } 3209 }
2524 } 3210 }
2525 3211
2526 { 3212 {
2527 my $anims = $facedata->{animinfo}; 3213 my $anims = $facedata->{animinfo};
2528 3214
2529 while (my ($anim, $info) = each %$anims) { 3215 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3216 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3217 cf::cede_to_tick;
2532 } 3218 }
2533 3219
2534 cf::anim::invalidate_all; # d'oh 3220 cf::anim::invalidate_all; # d'oh
2535 } 3221 }
2536 3222
3223 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource};
3227
3228 while (my ($name, $info) = each %$res) {
3229 if (defined $info->{type}) {
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232
3233 if ($info->{type} & 1) {
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 cf::face::set_type $idx, $info->{type};
3248 } else {
3249 $RESOURCE{$name} = $info;
3250 }
3251
3252 cf::cede_to_tick;
3253 }
3254 }
3255
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3257
2537 1 3258 1
2538} 3259}
2539 3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3280
3281register_exticmd fx_want => sub {
3282 my ($ns, $want) = @_;
3283
3284 while (my ($k, $v) = each %$want) {
3285 $ns->fx_want ($k, $v);
3286 }
3287};
3288
3289sub load_resource_file($) {
3290 my $guard = lock_acquire "load_resource_file";
3291
3292 my $status = load_resource_file_ $_[0];
3293 get_slot 0.1, 100;
3294 cf::arch::commit_load;
3295
3296 $status
3297}
3298
2540sub reload_regions { 3299sub reload_regions {
3300 # HACK to clear player env face cache, we need some signal framework
3301 # for this (global event?)
3302 %ext::player_env::MUSIC_FACE_CACHE = ();
3303
2541 load_resource_file "$MAPDIR/regions" 3304 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3305 or die "unable to load regions file\n";
3306
3307 for (cf::region::list) {
3308 $_->{match} = qr/$_->{match}/
3309 if exists $_->{match};
3310 }
2543} 3311}
2544 3312
2545sub reload_facedata { 3313sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3314 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3315 or die "unable to load facedata\n";
2558} 3326}
2559 3327
2560sub reload_resources { 3328sub reload_resources {
2561 warn "reloading resource files...\n"; 3329 warn "reloading resource files...\n";
2562 3330
3331 reload_facedata;
3332 reload_archetypes;
2563 reload_regions; 3333 reload_regions;
2564 reload_facedata;
2565 #reload_archetypes;#d#
2566 reload_archetypes;
2567 reload_treasures; 3334 reload_treasures;
2568 3335
2569 warn "finished reloading resource files\n"; 3336 warn "finished reloading resource files\n";
2570} 3337}
2571 3338
2572sub init { 3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
2573 reload_resources; 3344 reload_resources;
2574} 3345}
2575 3346
2576sub cfg_load { 3347sub reload_config {
2577 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
2578 or return; 3349 or return;
2579 3350
2580 local $/; 3351 local $/;
2581 *CFG = YAML::Syck::Load <$fh>; 3352 *CFG = YAML::Load <$fh>;
2582 3353
2583 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2584 3355
2585 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2586 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2592 }; 3363 };
2593 warn $@ if $@; 3364 warn $@ if $@;
2594 } 3365 }
2595} 3366}
2596 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
2597sub main { 3387sub main {
3388 atomic;
3389
2598 # we must not ever block the main coroutine 3390 # we must not ever block the main coroutine
2599 local $Coro::idle = sub { 3391 local $Coro::idle = sub {
2600 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2601 (async { 3393 (async {
2602 Event::one_event; 3394 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT;
2603 })->prio (Coro::PRIO_MAX); 3396 })->prio (Coro::PRIO_MAX);
2604 }; 3397 };
2605 3398
2606 cfg_load; 3399 {
3400 my $guard = freeze_mainloop;
3401 reload_config;
2607 db_init; 3402 db_init;
2608 load_extensions; 3403 load_extensions;
2609 3404
2610 $TICK_WATCHER->start; 3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE;
3409
3410 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412
2611 Event::loop; 3413 EV::loop;
2612} 3414}
2613 3415
2614############################################################################# 3416#############################################################################
2615# initialisation and cleanup 3417# initialisation and cleanup
2616 3418
2617# install some emergency cleanup handlers 3419# install some emergency cleanup handlers
2618BEGIN { 3420BEGIN {
3421 our %SIGWATCHER = ();
2619 for my $signal (qw(INT HUP TERM)) { 3422 for my $signal (qw(INT HUP TERM)) {
2620 Event->signal ( 3423 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2621 reentrant => 0,
2622 data => WF_AUTOCANCEL,
2623 signal => $signal,
2624 prio => 0,
2625 cb => sub {
2626 cf::cleanup "SIG$signal"; 3424 cf::cleanup "SIG$signal";
2627 },
2628 ); 3425 };
3426 }
3427}
3428
3429sub write_runtime_sync {
3430 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time.
3432
3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434
3435 my $guard = cf::lock_acquire "write_runtime";
3436
3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3438 or return;
3439
3440 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server.
3443
3444 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3445 and return;
3446
3447 # always fsync - this file is important
3448 aio_fsync $fh
3449 and return;
3450
3451 # touch it again to show we are up-to-date
3452 aio_utime $fh, undef, undef;
3453
3454 close $fh
3455 or return;
3456
3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return;
3459
3460 warn "runtime file written.\n";
3461
2629 } 3462 1
3463}
3464
3465our $uuid_lock;
3466our $uuid_skip;
3467
3468sub write_uuid_sync($) {
3469 $uuid_skip ||= $_[0];
3470
3471 return if $uuid_lock;
3472 local $uuid_lock = 1;
3473
3474 my $uuid = "$LOCALDIR/uuid";
3475
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3480 $uuid_skip = 0;
3481
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return;
3484
3485 # always fsync - this file is important
3486 aio_fsync $fh
3487 and return;
3488
3489 close $fh
3490 or return;
3491
3492 aio_rename "$uuid~", $uuid
3493 and return;
3494
3495 warn "uuid file written ($value).\n";
3496
3497 1
3498
3499}
3500
3501sub write_uuid($$) {
3502 my ($skip, $sync) = @_;
3503
3504 $sync ? write_uuid_sync $skip
3505 : async { write_uuid_sync $skip };
2630} 3506}
2631 3507
2632sub emergency_save() { 3508sub emergency_save() {
2633 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
2634 3510
2640 # and maps saved/destroyed asynchronously. 3516 # and maps saved/destroyed asynchronously.
2641 warn "begin emergency player save\n"; 3517 warn "begin emergency player save\n";
2642 for my $login (keys %cf::PLAYER) { 3518 for my $login (keys %cf::PLAYER) {
2643 my $pl = $cf::PLAYER{$login} or next; 3519 my $pl = $cf::PLAYER{$login} or next;
2644 $pl->valid or next; 3520 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2645 $pl->save; 3522 $pl->save;
2646 } 3523 }
2647 warn "end emergency player save\n"; 3524 warn "end emergency player save\n";
2648 3525
2649 warn "begin emergency map save\n"; 3526 warn "begin emergency map save\n";
2655 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
2656 3533
2657 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
2658 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
2659 warn "end emergency database checkpoint\n"; 3536 warn "end emergency database checkpoint\n";
3537
3538 warn "begin write uuid\n";
3539 write_uuid_sync 1;
3540 warn "end write uuid\n";
2660 }; 3541 };
2661 3542
2662 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
2663} 3544}
2664 3545
2665sub post_cleanup { 3546sub post_cleanup {
2666 my ($make_core) = @_; 3547 my ($make_core) = @_;
2667 3548
2668 warn Carp::longmess "post_cleanup backtrace" 3549 warn Carp::longmess "post_cleanup backtrace"
2669 if $make_core; 3550 if $make_core;
3551
3552 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$;
2670} 3554}
3555
3556# a safer delete_package, copied from Symbol
3557sub clear_package($) {
3558 my $pkg = shift;
3559
3560 # expand to full symbol table name if needed
3561 unless ($pkg =~ /^main::.*::$/) {
3562 $pkg = "main$pkg" if $pkg =~ /^::/;
3563 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3564 $pkg .= '::' unless $pkg =~ /::$/;
3565 }
3566
3567 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3568 my $stem_symtab = *{$stem}{HASH};
3569
3570 defined $stem_symtab and exists $stem_symtab->{$leaf}
3571 or return;
3572
3573 # clear all symbols
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 }
3579 warn "cleared package #$pkg\n";#d#
3580}
3581
3582our $RELOAD; # how many times to reload
2671 3583
2672sub do_reload_perl() { 3584sub do_reload_perl() {
2673 # can/must only be called in main 3585 # can/must only be called in main
2674 if ($Coro::current != $Coro::main) { 3586 if ($Coro::current != $Coro::main) {
2675 warn "can only reload from main coroutine"; 3587 warn "can only reload from main coroutine";
2676 return; 3588 return;
2677 } 3589 }
2678 3590
3591 return if $RELOAD++;
3592
3593 while ($RELOAD) {
2679 warn "reloading..."; 3594 warn "reloading...";
2680 3595
2681 warn "entering sync_job"; 3596 warn "entering sync_job";
2682 3597
2683 cf::sync_job { 3598 cf::sync_job {
2684 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
2685 cf::emergency_save; 3600 cf::emergency_save;
2686 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
2687 3602
2688 warn "syncing database to disk"; 3603 warn "syncing database to disk";
2689 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
2690 3605
2691 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
2692 3607
2693 warn "cancelling all WF_AUTOCANCEL watchers";
2694 for (Event::all_watchers) {
2695 $_->cancel if $_->data & WF_AUTOCANCEL;
2696 }
2697
2698 warn "flushing outstanding aio requests"; 3608 warn "flushing outstanding aio requests";
2699 for (;;) {
2700 BDB::flush;
2701 IO::AIO::flush;
2702 Coro::cede;
2703 last unless IO::AIO::nreqs || BDB::nreqs; 3609 while (IO::AIO::nreqs || BDB::nreqs) {
2704 warn "iterate..."; 3610 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2705 }
2706
2707 ++$RELOAD;
2708
2709 warn "cancelling all extension coros";
2710 $_->cancel for values %EXT_CORO;
2711 %EXT_CORO = ();
2712
2713 warn "removing commands";
2714 %COMMAND = ();
2715
2716 warn "removing ext commands";
2717 %EXTCMD = ();
2718
2719 warn "unloading/nuking all extensions";
2720 for my $pkg (@EXTS) {
2721 warn "... unloading $pkg";
2722
2723 if (my $cb = $pkg->can ("unload")) {
2724 eval {
2725 $cb->($pkg);
2726 1
2727 } or warn "$pkg unloaded, but with errors: $@";
2728 } 3611 }
2729 3612
2730 warn "... nuking $pkg"; 3613 warn "cancelling all extension coros";
2731 Symbol::delete_package $pkg; 3614 $_->cancel for values %EXT_CORO;
2732 } 3615 %EXT_CORO = ();
2733 3616
2734 warn "unloading all perl modules loaded from $LIBDIR"; 3617 warn "removing commands";
2735 while (my ($k, $v) = each %INC) { 3618 %COMMAND = ();
2736 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2737 3619
3620 warn "removing ext/exti commands";
3621 %EXTCMD = ();
3622 %EXTICMD = ();
3623
3624 warn "unloading/nuking all extensions";
3625 for my $pkg (@EXTS) {
2738 warn "... unloading $k"; 3626 warn "... unloading $pkg";
2739 delete $INC{$k};
2740 3627
2741 $k =~ s/\.pm$//;
2742 $k =~ s/\//::/g;
2743
2744 if (my $cb = $k->can ("unload_module")) { 3628 if (my $cb = $pkg->can ("unload")) {
3629 eval {
2745 $cb->(); 3630 $cb->($pkg);
3631 1
3632 } or warn "$pkg unloaded, but with errors: $@";
3633 }
3634
3635 warn "... clearing $pkg";
3636 clear_package $pkg;
2746 } 3637 }
2747 3638
2748 Symbol::delete_package $k; 3639 warn "unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642
3643 warn "... unloading $k";
3644 delete $INC{$k};
3645
3646 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g;
3648
3649 if (my $cb = $k->can ("unload_module")) {
3650 $cb->();
3651 }
3652
3653 clear_package $k;
2749 } 3654 }
2750 3655
2751 warn "getting rid of safe::, as good as possible"; 3656 warn "getting rid of safe::, as good as possible";
2752 Symbol::delete_package "safe::$_" 3657 clear_package "safe::$_"
2753 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2754 3659
2755 warn "unloading cf.pm \"a bit\""; 3660 warn "unloading cf.pm \"a bit\"";
2756 delete $INC{"cf.pm"}; 3661 delete $INC{"cf.pm"};
2757 delete $INC{"cf/pod.pm"}; 3662 delete $INC{"cf/pod.pm"};
2758 3663
2759 # don't, removes xs symbols, too, 3664 # don't, removes xs symbols, too,
2760 # and global variables created in xs 3665 # and global variables created in xs
2761 #Symbol::delete_package __PACKAGE__; 3666 #clear_package __PACKAGE__;
2762 3667
2763 warn "unload completed, starting to reload now"; 3668 warn "unload completed, starting to reload now";
2764 3669
2765 warn "reloading cf.pm"; 3670 warn "reloading cf.pm";
2766 require cf; 3671 require cf;
2767 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2768 3673
2769 warn "loading config and database again"; 3674 warn "loading config and database again";
2770 cf::cfg_load; 3675 cf::reload_config;
2771 3676
2772 warn "loading extensions"; 3677 warn "loading extensions";
2773 cf::load_extensions; 3678 cf::load_extensions;
2774 3679
2775 warn "reattaching attachments to objects/players"; 3680 warn "reattaching attachments to objects/players";
2776 _global_reattach; # objects, sockets 3681 _global_reattach; # objects, sockets
2777 warn "reattaching attachments to maps"; 3682 warn "reattaching attachments to maps";
2778 reattach $_ for values %MAP; 3683 reattach $_ for values %MAP;
2779 warn "reattaching attachments to players"; 3684 warn "reattaching attachments to players";
2780 reattach $_ for values %PLAYER; 3685 reattach $_ for values %PLAYER;
2781 3686
2782 warn "leaving sync_job"; 3687 warn "leaving sync_job";
2783 3688
2784 1 3689 1
2785 } or do { 3690 } or do {
2786 warn $@; 3691 warn $@;
2787 warn "error while reloading, exiting."; 3692 cf::cleanup "error while reloading, exiting.";
2788 exit 1;
2789 }; 3693 };
2790 3694
2791 warn "reloaded"; 3695 warn "reloaded";
3696 --$RELOAD;
3697 }
2792}; 3698};
2793 3699
2794our $RELOAD_WATCHER; # used only during reload 3700our $RELOAD_WATCHER; # used only during reload
2795 3701
2796sub reload_perl() { 3702sub reload_perl() {
2797 # doing reload synchronously and two reloads happen back-to-back, 3703 # doing reload synchronously and two reloads happen back-to-back,
2798 # coro crashes during coro_state_free->destroy here. 3704 # coro crashes during coro_state_free->destroy here.
2799 3705
2800 $RELOAD_WATCHER ||= Event->timer ( 3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2801 reentrant => 0,
2802 after => 0,
2803 data => WF_AUTOCANCEL,
2804 cb => sub {
2805 do_reload_perl; 3707 do_reload_perl;
2806 undef $RELOAD_WATCHER; 3708 undef $RELOAD_WATCHER;
2807 },
2808 ); 3709 };
2809} 3710}
2810 3711
2811register_command "reload" => sub { 3712register_command "reload" => sub {
2812 my ($who, $arg) = @_; 3713 my ($who, $arg) = @_;
2813 3714
2814 if ($who->flag (FLAG_WIZ)) { 3715 if ($who->flag (FLAG_WIZ)) {
2815 $who->message ("reloading server."); 3716 $who->message ("reloading server.");
3717 async {
3718 $Coro::current->{desc} = "perl_reload";
2816 async { reload_perl }; 3719 reload_perl;
3720 };
2817 } 3721 }
2818}; 3722};
2819 3723
2820unshift @INC, $LIBDIR; 3724unshift @INC, $LIBDIR;
2821 3725
2823 3727
2824our @WAIT_FOR_TICK; 3728our @WAIT_FOR_TICK;
2825our @WAIT_FOR_TICK_BEGIN; 3729our @WAIT_FOR_TICK_BEGIN;
2826 3730
2827sub wait_for_tick { 3731sub wait_for_tick {
2828 return unless $TICK_WATCHER->is_active;
2829 return if $Coro::current == $Coro::main; 3732 return if tick_inhibit || $Coro::current == $Coro::main;
2830 3733
2831 my $signal = new Coro::Signal; 3734 my $signal = new Coro::Signal;
2832 push @WAIT_FOR_TICK, $signal; 3735 push @WAIT_FOR_TICK, $signal;
2833 $signal->wait; 3736 $signal->wait;
2834} 3737}
2835 3738
2836sub wait_for_tick_begin { 3739sub wait_for_tick_begin {
2837 return unless $TICK_WATCHER->is_active;
2838 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
2839 3741
2840 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal; 3743 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait; 3744 $signal->wait;
2843} 3745}
2844 3746
2845 my $min = 1e6;#d# 3747sub tick {
2846 my $avg = 10;
2847$TICK_WATCHER = Event->timer (
2848 reentrant => 0,
2849 parked => 1,
2850 prio => 0,
2851 at => $NEXT_TICK || $TICK,
2852 data => WF_AUTOCANCEL,
2853 cb => sub {
2854 if ($Coro::current != $Coro::main) { 3748 if ($Coro::current != $Coro::main) {
2855 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3749 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2856 unless ++$bug_warning > 10; 3750 unless ++$bug_warning > 10;
2857 return; 3751 return;
2858 } 3752 }
2859 3753
2860 $NOW = $tick_start = Event::time;
2861
2862 cf::server_tick; # one server iteration 3754 cf::server_tick; # one server iteration
2863 3755
2864 0 && sync_job {#d# 3756 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2865 for(1..10) { 3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2866 my $t = Event::time; 3758 Coro::async_pool {
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3759 $Coro::current->{desc} = "runtime saver";
2868 or die; 3760 write_runtime_sync
2869 3761 or warn "ERROR: unable to write runtime file: $!";
2870 $map->width (50);
2871 $map->height (50);
2872 $map->alloc;
2873 $map->_load_objects ("/tmp/x.map", 1);
2874 my $t = Event::time - $t;
2875
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 }; 3762 };
3763 }
2886 3764
2887 $RUNTIME += $TICK;
2888 $NEXT_TICK += $TICK;
2889
2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2891 $NEXT_RUNTIME_WRITE = $NOW + 10;
2892 Coro::async_pool {
2893 write_runtime
2894 or warn "ERROR: unable to write runtime file: $!";
2895 };
2896 }
2897
2898# my $AFTER = Event::time;
2899# warn $AFTER - $NOW;#d#
2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send; 3766 $sig->send;
2903 } 3767 }
2904 while (my $sig = shift @WAIT_FOR_TICK) { 3768 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send; 3769 $sig->send;
2906 } 3770 }
2907 3771
2908 $NOW = Event::time; 3772 $LOAD = ($NOW - $TICK_START) / $TICK;
2909
2910 # if we are delayed by four ticks or more, skip them all
2911 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2912
2913 $TICK_WATCHER->at ($NEXT_TICK);
2914 $TICK_WATCHER->start;
2915
2916 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3773 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918 3774
2919 _post_tick; 3775 if (0) {
2920 3776 if ($NEXT_TICK) {
2921 3777 my $jitter = $TICK_START - $NEXT_TICK;
3778 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3779 warn "jitter $JITTER\n";#d#
3780 }
2922 }, 3781 }
2923); 3782}
2924 3783
2925{ 3784{
2926 BDB::max_poll_time $TICK * 0.1; 3785 # configure BDB
2927 $BDB_POLL_WATCHER = Event->io ( 3786
2928 reentrant => 0,
2929 fd => BDB::poll_fileno,
2930 poll => 'r',
2931 prio => 0,
2932 data => WF_AUTOCANCEL,
2933 cb => \&BDB::poll_cb,
2934 );
2935 BDB::min_parallel 8; 3787 BDB::min_parallel 8;
2936 3788 BDB::max_poll_reqs $TICK * 0.1;
2937 BDB::set_sync_prepare { 3789 $AnyEvent::BDB::WATCHER->priority (1);
2938 my $status;
2939 my $current = $Coro::current;
2940 (
2941 sub {
2942 $status = $!;
2943 $current->ready; undef $current;
2944 },
2945 sub {
2946 Coro::schedule while defined $current;
2947 $! = $status;
2948 },
2949 )
2950 };
2951 3790
2952 unless ($DB_ENV) { 3791 unless ($DB_ENV) {
2953 $DB_ENV = BDB::db_env_create; 3792 $DB_ENV = BDB::db_env_create;
3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3794 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3795 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2954 3798
2955 cf::sync_job { 3799 cf::sync_job {
2956 eval { 3800 eval {
2957 BDB::db_env_open 3801 BDB::db_env_open
2958 $DB_ENV, 3802 $DB_ENV,
2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3804 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3805 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2962 0666; 3806 0666;
2963 3807
2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3808 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2965
2966 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2967 $DB_ENV->set_lk_detect;
2968 }; 3809 };
2969 3810
2970 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
2971 }; 3812 };
2972 } 3813 }
3814
3815 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3817 };
3818 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3820 };
3821 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3823 };
2973} 3824}
2974 3825
2975{ 3826{
3827 # configure IO::AIO
3828
2976 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
2977
2978 undef $Coro::AIO::WATCHER;
2979 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
2980 $AIO_POLL_WATCHER = Event->io ( 3831 undef $AnyEvent::AIO::WATCHER;
2981 reentrant => 0,
2982 data => WF_AUTOCANCEL,
2983 fd => IO::AIO::poll_fileno,
2984 poll => 'r',
2985 prio => 6,
2986 cb => \&IO::AIO::poll_cb,
2987 );
2988} 3832}
2989 3833
2990my $_log_backtrace; 3834my $_log_backtrace;
2991 3835
2992sub _log_backtrace { 3836sub _log_backtrace {
2995 $msg =~ s/\n//; 3839 $msg =~ s/\n//;
2996 3840
2997 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace; 3843 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg;
3000 async { 3845 async {
3846 $Coro::current->{desc} = "abt $msg";
3847
3001 my @bt = fork_call { 3848 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr; 3849 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3850 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3851 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!"; 3852 or die "addr2line: $!";
3013 } 3860 }
3014 3861
3015 @funcs 3862 @funcs
3016 }; 3863 };
3017 3864
3018 LOG llevInfo, "[ABT] $msg\n"; 3865 LOG llevInfo, "[ABT] $perl_bt\n";
3866 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3019 LOG llevInfo, "[ABT] $_\n" for @bt; 3867 LOG llevInfo, "[ABT] $_\n" for @bt;
3020 --$_log_backtrace; 3868 --$_log_backtrace;
3021 }; 3869 };
3022 } else { 3870 } else {
3023 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines