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.270 by root, Sat May 26 15:44:06 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
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? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 48
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
71 75
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 77our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
79 82
80our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
93our $NOW;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
155 162
156The raw value load value from the last tick. 163The raw value load value from the last tick.
157 164
158=item %cf::CFG 165=item %cf::CFG
159 166
160Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 168from wherever your confdir points to.
162 169
163=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These 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 173returns 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. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 206
194# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 208# within the Safe compartment.
196for my $pkg (qw( 209for my $pkg (qw(
197 cf::global cf::attachable 210 cf::global cf::attachable
202)) { 215)) {
203 no strict 'refs'; 216 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 218}
206 219
207$Event::DIED = sub { 220$EV::DIED = sub {
208 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
209}; 222};
223
224#############################################################################
210 225
211=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
212 227
213=over 4 228=over 4
214 229
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 249 $d
235 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
236} 251}
237 252
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
241 254
242Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
243 256
244=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
245 258
246Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub encode_json($) { $json_coder->encode ($_[0]) }
266sub decode_json($) { $json_coder->decode ($_[0]) }
247 267
248=item cf::lock_wait $string 268=item cf::lock_wait $string
249 269
250Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
251 271
254Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
257returned. 277returned.
258 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
259Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
261 284
262=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
263 286
264Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
265 288
266=cut 289=cut
267 290
268our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
269 293
270sub lock_wait($) { 294sub lock_wait($) {
271 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
272 301
273 # wait for lock, if any 302 # wait for lock, if any
274 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 305 Coro::schedule;
282 311
283 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
284 lock_wait $key; 313 lock_wait $key;
285 314
286 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
287 317
288 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
291 } 322 }
292} 323}
293 324
305 }; 336 };
306 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
307 $guard 338 $guard
308} 339}
309 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
356=item cf::get_slot $time[, $priority[, $name]]
357
358Allocate $time seconds of blocking CPU time at priority C<$priority>:
359This call blocks and returns only when you have at least C<$time> seconds
360of cpu time till the next tick. The slot is only valid till the next cede.
361
362The optional C<$name> can be used to identify the job to run. It might be
363used for statistical purposes and should identify the same time-class.
364
365Useful for short background jobs.
366
367=cut
368
369our @SLOT_QUEUE;
370our $SLOT_QUEUE;
371
372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
376 my $signal = new Coro::Signal;
377
378 while () {
379 next_job:
380 my $avail = cf::till_tick;
381 if ($avail > 0.01) {
382 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) {
384 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send;
386 Coro::cede;
387 goto next_job;
388 }
389 }
390 }
391
392 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait;
396 } else {
397 Coro::schedule;
398 }
399 }
400};
401
402sub get_slot($;$$) {
403 my ($time, $pri, $name) = @_;
404
405 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal;
407
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready;
411 $sig->wait;
412}
413
310=item cf::async { BLOCK } 414=item cf::async { BLOCK }
311 415
312Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 417C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
317 421
318BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
319 423
320=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
321 425
322The design of crossfire+ requires that the main coro ($Coro::main) is 426The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 427is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
429acceptable.
325 430
326If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 433server will be frozen during this time, so the block should either finish
329fast or be very important. 434fast or be very important.
332 437
333sub sync_job(&) { 438sub sync_job(&) {
334 my ($job) = @_; 439 my ($job) = @_;
335 440
336 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
337 my $time = Event::time; 442 my $time = EV::time;
338 443
339 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
341 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
342 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
343 # (but this is cancel-safe) 450 # (but this is cancel-safe)
344 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
345 452
346 my $busy = 1; 453 my $busy = 1;
347 my @res; 454 my @res;
348 455
349 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 458 @res = eval { $job->() };
351 warn $@ if $@; 459 warn $@ if $@;
352 undef $busy; 460 undef $busy;
353 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
354 462
355 while ($busy) { 463 while ($busy) {
356 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
357 } 468 }
469 }
358 470
359 $time = Event::time - $time; 471 $time = EV::time - $time;
360 472
361 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363 475
364 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
389 $EXT_CORO{$coro+0} = $coro; 501 $EXT_CORO{$coro+0} = $coro;
390 502
391 $coro 503 $coro
392} 504}
393 505
394sub write_runtime { 506=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 507
397 # first touch the runtime file to show we are still running: 508Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 509process, returning the results. Everything must be serialisable with
510Coro::Storable. May, of course, block. Note that the executed sub may
511never block itself or use any form of event handling.
399 512
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 513=cut
401 utime undef, undef, $fh; 514
515sub fork_call(&@) {
516 my ($cb, @args) = @_;
517
518 # we seemingly have to make a local copy of the whole thing,
519 # otherwise perl prematurely frees the stuff :/
520 # TODO: investigate and fix (likely this will be rather laborious)
521
522 my @res = Coro::Util::fork_eval {
523 reset_signals;
524 &$cb
525 }, @args;
526
527 wantarray ? @res : $res[-1]
528}
529
530=item $value = cf::db_get $family => $key
531
532Returns a single value from the environment database.
533
534=item cf::db_put $family => $key => $value
535
536Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
402 } 557 };
558 cf::cleanup "db_open(db): $@" if $@;
403 559
404 my $guard = cf::lock_acquire "write_runtime"; 560 $db
561}
405 562
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 563our $DB;
407 or return;
408 564
409 my $value = $cf::RUNTIME + 90 + 10; 565sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 566 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 567 $DB ||= db_table "db";
568 };
569}
412 570
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 571sub db_get($$) {
414 and return; 572 my $key = "$_[0]/$_[1]";
415 573
416 # always fsync - this file is important 574 cf::sync_job {
417 aio_fsync $fh 575 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 576
420 # touch it again to show we are up-to-date 577 $! ? ()
421 utime undef, undef, $fh; 578 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 1 579 }
580}
581
582sub db_put($$$) {
583 BDB::dbreq_pri 4;
584 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
585}
586
587=item cf::cache $id => [$paths...], $processversion => $process
588
589Generic caching function that returns the value of the resource $id,
590caching and regenerating as required.
591
592This function can block.
593
594=cut
595
596sub cache {
597 my ($id, $src, $processversion, $process) = @_;
598
599 my $meta =
600 join "\x00",
601 $processversion,
602 map {
603 aio_stat $_
604 and Carp::croak "$_: $!";
605
606 ($_, (stat _)[7,9])
607 } @$src;
608
609 my $dbmeta = db_get cache => "$id/meta";
610 if ($dbmeta ne $meta) {
611 # changed, we may need to process
612
613 my @data;
614 my $md5;
615
616 for (0 .. $#$src) {
617 0 <= aio_load $src->[$_], $data[$_]
618 or Carp::croak "$src->[$_]: $!";
619 }
620
621 # if processing is expensive, check
622 # checksum first
623 if (1) {
624 $md5 =
625 join "\x00",
626 $processversion,
627 map {
628 cf::cede_to_tick;
629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
630 } 0.. $#$src;
631
632
633 my $dbmd5 = db_get cache => "$id/md5";
634 if ($dbmd5 eq $md5) {
635 db_put cache => "$id/meta", $meta;
636
637 return db_get cache => "$id/data";
638 }
639 }
640
641 my $t1 = Time::HiRes::time;
642 my $data = $process->(\@data);
643 my $t2 = Time::HiRes::time;
644
645 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
646
647 db_put cache => "$id/data", $data;
648 db_put cache => "$id/md5" , $md5;
649 db_put cache => "$id/meta", $meta;
650
651 return $data;
652 }
653
654 db_get cache => "$id/data"
432} 655}
433 656
434=item cf::datalog type => key => value, ... 657=item cf::datalog type => key => value, ...
435 658
436Log a datalog packet of the given type with the given key-value pairs. 659Log a datalog packet of the given type with the given key-value pairs.
454attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
456 679
457In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 682Deliantra).
460 683
461=over 4 684=over 4
462 685
463=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
464 687
666 _attach $registry, $klass, @attach; 889 _attach $registry, $klass, @attach;
667 } 890 }
668 891
669 $obj->{$name} = \%arg; 892 $obj->{$name} = \%arg;
670 } else { 893 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 894 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 895 }
673 896
674 $obj->{_attachment}{$name} = undef; 897 $obj->{_attachment}{$name} = undef;
675} 898}
676 899
716 "; 939 ";
717 die if $@; 940 die if $@;
718} 941}
719 942
720our $override; 943our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 944our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 945
723sub override { 946sub override {
724 $override = 1; 947 $override = 1;
725 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
726} 949}
727 950
728sub do_invoke { 951sub do_invoke {
729 my $event = shift; 952 my $event = shift;
730 my $callbacks = shift; 953 my $callbacks = shift;
731 954
732 @invoke_results = (); 955 @INVOKE_RESULTS = ();
733 956
734 local $override; 957 local $override;
735 958
736 for (@$callbacks) { 959 for (@$callbacks) {
737 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
746 } 969 }
747 970
748 0 971 0
749} 972}
750 973
751=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
752 975
753=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
754 977
755Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
756 979
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 980This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 981removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 983
761=back 984=back
762 985
763=cut 986=cut
764 987
765############################################################################# 988#############################################################################
766# object support 989# object support
990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
1024sub _can_merge {
1025 my ($ob1, $ob2) = @_;
1026
1027 ++$SLOW_MERGES;#d#
1028
1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
1031}
767 1032
768sub reattach { 1033sub reattach {
769 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 1035 my ($obj) = @_;
771 1036
792cf::attachable->attach ( 1057cf::attachable->attach (
793 prio => -1000000, 1058 prio => -1000000,
794 on_instantiate => sub { 1059 on_instantiate => sub {
795 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
796 1061
797 $data = from_json $data; 1062 $data = decode_json $data;
798 1063
799 for (@$data) { 1064 for (@$data) {
800 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
801 1066
802 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
818sub object_freezer_save { 1083sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
820 1085
821 sync_job { 1086 sync_job {
822 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
825 1091
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
830 close $fh; 1096 close $fh;
831 1097
832 if (@$objs) { 1098 if (@$objs) {
833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
834 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
837 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
838 close $fh; 1104 close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
840 } 1106 }
848 } 1114 }
849 } else { 1115 } else {
850 aio_unlink $filename; 1116 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
852 } 1118 }
853 } 1119 };
854} 1120}
855 1121
856sub object_freezer_as_string { 1122sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
858 1124
870 or return; 1136 or return;
871 1137
872 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
874 or return; 1140 or return;
1141
875 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
876 } 1144 }
877 1145
1146 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1148 $decname, length $data, scalar @{$av || []};
1149
880 return ($data, $av); 1150 ($data, $av)
881} 1151}
1152
1153=head2 COMMAND CALLBACKS
1154
1155=over 4
1156
1157=cut
882 1158
883############################################################################# 1159#############################################################################
884# command handling &c 1160# command handling &c
885 1161
886=item cf::register_command $name => \&callback($ob,$args); 1162=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1175 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1176}
901 1177
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1178=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1179
904Register a callbackf ro execution when the client sends an extcmd packet. 1180Register a callback for execution when the client sends an (synchronous)
1181extcmd packet. Ext commands will be processed in the order they are
1182received by the server, like other user commands. The first argument is
1183the logged-in player. Ext commands can only be processed after a player
1184has logged in successfully.
905 1185
906If the callback returns something, it is sent back as if reply was being 1186If the callback returns something, it is sent back as if reply was being
907called. 1187called.
908 1188
1189=item cf::register_exticmd $name => \&callback($ns,$packet);
1190
1191Register a callback for execution when the client sends an (asynchronous)
1192exticmd packet. Exti commands are processed by the server as soon as they
1193are received, i.e. out of order w.r.t. other commands. The first argument
1194is a client socket. Exti commands can be received anytime, even before
1195log-in.
1196
1197If the callback returns something, it is sent back as if reply was being
1198called.
1199
909=cut 1200=cut
910 1201
911sub register_extcmd { 1202sub register_extcmd {
912 my ($name, $cb) = @_; 1203 my ($name, $cb) = @_;
913 1204
914 $EXTCMD{$name} = $cb; 1205 $EXTCMD{$name} = $cb;
1206}
1207
1208sub register_exticmd {
1209 my ($name, $cb) = @_;
1210
1211 $EXTICMD{$name} = $cb;
915} 1212}
916 1213
917cf::player->attach ( 1214cf::player->attach (
918 on_command => sub { 1215 on_command => sub {
919 my ($pl, $name, $params) = @_; 1216 my ($pl, $name, $params) = @_;
928 cf::override; 1225 cf::override;
929 }, 1226 },
930 on_extcmd => sub { 1227 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
932 1229
933 my $msg = eval { from_json $buf }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1231
935 if (ref $msg) { 1232 if (ref $msg) {
1233 my ($type, $reply, @payload) =
1234 "ARRAY" eq ref $msg
1235 ? @$msg
1236 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1237
1238 my @reply;
1239
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
941 } else { 1247 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1249 }
944 1250
945 cf::override; 1251 cf::override;
946 }, 1252 },
947); 1253);
948 1254
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1255sub load_extensions {
1256 cf::sync_job {
1257 my %todo;
1258
984 for my $ext (<$LIBDIR/*.ext>) { 1259 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1260 next unless -r $path;
986 eval { 1261
987 load_extension $ext; 1262 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1263 my $base = $1;
1264 my $pkg = $1;
1265 $pkg =~ s/[^[:word:]]/_/g;
1266 $pkg = "ext::$pkg";
1267
1268 open my $fh, "<:utf8", $path
1269 or die "$path: $!";
1270
1271 my $source = do { local $/; <$fh> };
1272
1273 my %ext = (
1274 path => $path,
1275 base => $base,
1276 pkg => $pkg,
1277 );
1278
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281
1282 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n"
1285 . $source
1286 . "\n};\n1";
1287
1288 $todo{$base} = \%ext;
1289 }
1290
1291 my %done;
1292 while (%todo) {
1293 my $progress;
1294
1295 while (my ($k, $v) = each %todo) {
1296 for (split /,\s*/, $v->{meta}{depends}) {
1297 goto skip
1298 unless exists $done{$_};
1299 }
1300
1301 warn "... loading '$k' into '$v->{pkg}'\n";
1302
1303 unless (eval $v->{source}) {
1304 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n";
1306
1307 if (exists $v->{meta}{mandatory}) {
1308 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n";
1310 exit 1;
1311 }
1312
1313 warn $msg;
1314 }
1315
1316 $done{$k} = delete $todo{$k};
1317 push @EXTS, $v->{pkg};
1318 $progress = 1;
988 1 1319 }
989 } or warn "$ext not loaded: $@"; 1320
1321 skip:
1322 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1323 unless $progress;
1324 }
990 } 1325 };
991} 1326}
992 1327
993############################################################################# 1328#############################################################################
994 1329
1330=back
1331
995=head2 CORE EXTENSIONS 1332=head2 CORE EXTENSIONS
996 1333
997Functions and methods that extend core crossfire objects. 1334Functions and methods that extend core crossfire objects.
998 1335
999=cut 1336=cut
1003use Coro::AIO; 1340use Coro::AIO;
1004 1341
1005=head3 cf::player 1342=head3 cf::player
1006 1343
1007=over 4 1344=over 4
1345
1346=item cf::player::num_playing
1347
1348Returns the official number of playing players, as per the Crossfire metaserver rules.
1349
1350=cut
1351
1352sub num_playing {
1353 scalar grep
1354 $_->ob->map
1355 && !$_->hidden
1356 && !$_->ob->flag (cf::FLAG_WIZ),
1357 cf::player::list
1358}
1008 1359
1009=item cf::player::find $login 1360=item cf::player::find $login
1010 1361
1011Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1012 1363
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1403
1053 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1405 or return;
1406
1407 my $pl = cf::player::load_pl $f
1408 or return;
1409 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1056 } 1412 }
1057 } 1413 }
1058} 1414}
1059 1415
1069 1425
1070 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1072 1428
1073 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1074 Coro::cede; 1430 cf::cede_to_tick;
1075} 1431}
1076 1432
1077sub new($) { 1433sub new($) {
1078 my ($login) = @_; 1434 my ($login) = @_;
1079 1435
1083 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1084 1440
1085 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1086 1442
1087 $self 1443 $self
1444}
1445
1446=item $player->send_msg ($channel, $msg, $color, [extra...])
1447
1448=cut
1449
1450sub send_msg {
1451 my $ns = shift->ns
1452 or return;
1453 $ns->send_msg (@_);
1088} 1454}
1089 1455
1090=item $pl->quit_character 1456=item $pl->quit_character
1091 1457
1092Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1513 or return [];
1148 1514
1149 my @logins; 1515 my @logins;
1150 1516
1151 for my $login (@$dirs) { 1517 for my $login (@$dirs) {
1518 my $path = path $login;
1519
1520 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1155 1526
1156 utf8::decode $login; 1527 utf8::decode $login;
1157 push @logins, $login; 1528 push @logins, $login;
1158 } 1529 }
1159 1530
1186 } 1557 }
1187 1558
1188 \@paths 1559 \@paths
1189} 1560}
1190 1561
1562=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1563
1564Expand crossfire pod fragments into protocol xml.
1565
1566=cut
1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1579sub expand_cfpod {
1580 my ($self, $pod) = @_;
1581
1582 my $xml;
1583
1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1587
1588 $group =~ s/&/&amp;/g;
1589 $group =~ s/</&lt;/g;
1590
1591 $xml .= $group;
1592 } elsif ($pod =~ m%\G
1593 ([BCGHITU])
1594 <
1595 (?:
1596 ([^<>]*) (?{ $group = $^N })
1597 | < $interior >
1598 )
1599 >
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "")
1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1633
1634 for ($xml) {
1635 # create single paragraphs (very hackish)
1636 s/(?<=\S)\n(?=\w)/ /g;
1637
1638 # compress some whitespace
1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 }
1644
1645 $xml
1646}
1647
1648no re 'eval';
1649
1650sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode}
1653}
1654
1191=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1192 1656
1193Sends an ext reply to the player. 1657Sends an ext reply to the player.
1194 1658
1195=cut 1659=cut
1196 1660
1197sub ext_reply($$%) { 1661sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1199 1663
1200 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1665}
1204 1666
1205=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1206 1668
1207Sends an ext event to the client. 1669Sends an ext event to the client.
1208 1670
1209=cut 1671=cut
1210 1672
1211sub ext_event($$%) { 1673sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1213 1675
1214 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1215} 1677}
1216 1678
1217=head3 cf::region 1679=head3 cf::region
1218 1680
1219=over 4 1681=over 4
1222 1684
1223package cf::region; 1685package cf::region;
1224 1686
1225=item cf::region::find_by_path $path 1687=item cf::region::find_by_path $path
1226 1688
1227Tries to decuce the probable region for a map knowing only its path. 1689Tries to decuce the likely region for a map knowing only its path.
1228 1690
1229=cut 1691=cut
1230 1692
1231sub find_by_path($) { 1693sub find_by_path($) {
1232 my ($path) = @_; 1694 my ($path) = @_;
1233 1695
1234 my ($match, $specificity); 1696 my ($match, $specificity);
1235 1697
1236 for my $region (list) { 1698 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1699 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1700 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1701 if $region->specificity > $specificity;
1240 } 1702 }
1241 } 1703 }
1242 1704
1306 my ($self, $merge) = @_; 1768 my ($self, $merge) = @_;
1307 1769
1308 # we have to keep some variables in memory intact 1770 # we have to keep some variables in memory intact
1309 local $self->{path}; 1771 local $self->{path};
1310 local $self->{load_path}; 1772 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1773
1314 $self->SUPER::thawer_merge ($merge); 1774 $self->SUPER::thawer_merge ($merge);
1315} 1775}
1316 1776
1317sub normalise { 1777sub normalise {
1364 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1365 return $self; 1825 return $self;
1366 } 1826 }
1367 } 1827 }
1368 1828
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1830 ()
1371} 1831}
1372 1832
1373sub init { 1833sub init {
1374 my ($self) = @_; 1834 my ($self) = @_;
1417 1877
1418 $_->change_map_light ($change) 1878 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1879 for grep $_->outdoor, values %cf::MAP;
1420} 1880}
1421 1881
1882sub decay_objects {
1883 my ($self) = @_;
1884
1885 return if $self->{deny_reset};
1886
1887 $self->do_decay_objects;
1888}
1889
1422sub unlink_save { 1890sub unlink_save {
1423 my ($self) = @_; 1891 my ($self) = @_;
1424 1892
1425 utf8::encode (my $save = $self->save_path); 1893 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1894 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1897
1430sub load_header_from($) { 1898sub load_header_from($) {
1431 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1432 1900
1433 utf8::encode $path; 1901 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1903 or return;
1904
1905 $self->_load_header ($f)
1906 or return;
1907
1908 local $MAP_LOADING{$self->{path}} = $self;
1909 $f->resolve_delayed_derefs;
1439 1910
1440 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1441 1912
1442 1 1913 1
1443} 1914}
1482 $self->load_header_orig 1953 $self->load_header_orig
1483 or return; 1954 or return;
1484 $self->prepare_orig; 1955 $self->prepare_orig;
1485 } 1956 }
1486 1957
1958 $self->{deny_reset} = 1
1959 if $self->no_reset;
1960
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1961 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1962 unless $self->default_region;
1489 1963
1490 1 1964 1
1491} 1965}
1494sub find { 1968sub find {
1495 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1496 1970
1497 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1498 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1500 1975
1501 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1503 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1504 or return; 1981 or return;
1505 1982
1506 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1507 1984
1508 $map->load_header 1985 $map->load_header
1509 or return; 1986 or return;
1510 1987
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1514 $map->reset; 1993 $map->reset;
1515 undef $guard;
1516 return find $path; 1994 return find $path;
1517 } 1995 }
1518 1996
1519 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1520 } 1998 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1530 2008
1531 my $path = $self->{path}; 2009 my $path = $self->{path};
1532 2010
1533 { 2011 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1535 2013
2014 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 2016
1538 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1539 2018
1540 $self->alloc; 2019 $self->alloc;
1541 2020
1542 $self->pre_load; 2021 $self->pre_load;
1543 Coro::cede; 2022 cf::cede_to_tick;
1544 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1546 or return; 2027 or return;
1547 2028
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1550 2031
1551 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 2033 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 2036 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1556 } 2040 }
1557 } 2041 }
1558 2042
1559 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1560 # now do the right thing for maps 2046 # now do the right thing for maps
1561 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 2049 unless $self->difficulty;
1564 Coro::cede; 2050 cf::cede_to_tick;
1565 2051
1566 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 2053 $self->decay_objects;
1568 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1569 $self->update_buttons; 2055 $self->update_buttons;
1570 Coro::cede; 2056 cf::cede_to_tick;
1571 $self->set_darkness_map; 2057 $self->set_darkness_map;
1572 Coro::cede; 2058 cf::cede_to_tick;
1573 $self->activate; 2059 $self->activate;
1574 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1575 2064
1576 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 2066 }
1578 2067
1579 $self->post_load; 2068 $self->post_load;
1583 my ($self, $ob) = @_; 2072 my ($self, $ob) = @_;
1584 2073
1585 return find "~" . $ob->name . "/" . $self->{path} 2074 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 2075 if $self->per_player;
1587 2076
2077# return find "?party/" . $ob->name . "/" . $self->{path}
2078# if $self->per_party;
2079
1588 $self 2080 $self
1589} 2081}
1590 2082
1591# find and load all maps in the 3x3 area around a map 2083# find and load all maps in the 3x3 area around a map
1592sub load_diag { 2084sub load_neighbours {
1593 my ($map) = @_; 2085 my ($map) = @_;
1594 2086
1595 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1596 2088
1597 for (0 .. 3) { 2089 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1599 or next; 2091 or next;
1600 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1601 or next; 2093 or next;
1602 $neigh->load; 2094 $neigh->load;
1603 2095
2096 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2099 }
1607 2100
1608 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1610 or next; 2104 or next;
1611 $neigh->load; 2105 $neigh->load;
1612 } 2106 }
1613} 2107}
1614 2108
1619} 2113}
1620 2114
1621sub do_load_sync { 2115sub do_load_sync {
1622 my ($map) = @_; 2116 my ($map) = @_;
1623 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1624 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1625} 2122}
1626 2123
1627our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1629 2126
1630sub find_async { 2127sub find_async {
1631 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1632 2129
1633 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1634 2131
1635 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2134 }
1638 2135
1639 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1640 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1641 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2143 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2144 $map->load if $v;
2145 }
1646 2146
1647 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1648 } 2148 }
1649 } 2149 }
1650 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1651 }; 2151 };
1652 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1655} 2155}
1656 2156
1657sub save { 2157sub save {
1658 my ($self) = @_; 2158 my ($self) = @_;
1659 2159
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2161
1662 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1663 2163
1664 return unless $self->dirty; 2164 return unless $self->dirty;
1665 2165
1671 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1672 2172
1673 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1674 2174
1675 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1677 }; 2178 };
1678 2179
1679 if ($uniq) { 2180 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1688 my ($self) = @_; 2189 my ($self) = @_;
1689 2190
1690 # save first because save cedes 2191 # save first because save cedes
1691 $self->save; 2192 $self->save;
1692 2193
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2195
1695 return if $self->players; 2196 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1698 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2204 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2205}
1702 2206
1703sub reset_at { 2207sub reset_at {
1704 my ($self) = @_; 2208 my ($self) = @_;
1705 2209
1706 # TODO: safety, remove and allow resettable per-player maps 2210 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2211 return 1e99 if $self->{deny_reset};
1709 2212
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2213 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2214 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2215
1723 my ($self) = @_; 2226 my ($self) = @_;
1724 2227
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2228 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2229
1727 return if $self->players; 2230 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2231
1730 warn "resetting map ", $self->path;#d# 2232 warn "resetting map ", $self->path;
1731 2233
1732 $self->in_memory (cf::MAP_SWAPPED); 2234 $self->in_memory (cf::MAP_SWAPPED);
1733 2235
1734 # need to save uniques path 2236 # need to save uniques path
1735 unless ($self->{deny_save}) { 2237 unless ($self->{deny_save}) {
1739 if $uniq; 2241 if $uniq;
1740 } 2242 }
1741 2243
1742 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1743 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2248 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2249
1748 $self->unlink_save; 2250 $self->unlink_save;
1749 $self->destroy; 2251 $self->destroy;
1750} 2252}
1751 2253
1752my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
1753 2255
1754sub nuke { 2256sub nuke {
1755 my ($self) = @_; 2257 my ($self) = @_;
1756 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
1757 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
1758 2263
1759 $self->unlink_save; 2264 $self->unlink_save;
1760 2265
1761 bless $self, "cf::map"; 2266 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2271
1767 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
1768 2274
1769 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2276}
2277
2278=item $maps = cf::map::tmp_maps
2279
2280Returns an arrayref with all map paths of currently instantiated and saved
2281maps. May block.
2282
2283=cut
2284
2285sub tmp_maps() {
2286 [
2287 map {
2288 utf8::decode $_;
2289 /\.map$/
2290 ? normalise $_
2291 : ()
2292 } @{ aio_readdir $TMPDIR or [] }
2293 ]
2294}
2295
2296=item $maps = cf::map::random_maps
2297
2298Returns an arrayref with all map paths of currently instantiated and saved
2299random maps. May block.
2300
2301=cut
2302
2303sub random_maps() {
2304 [
2305 map {
2306 utf8::decode $_;
2307 /\.map$/
2308 ? normalise "?random/$_"
2309 : ()
2310 } @{ aio_readdir $RANDOMDIR or [] }
2311 ]
1770} 2312}
1771 2313
1772=item cf::map::unique_maps 2314=item cf::map::unique_maps
1773 2315
1774Returns an arrayref of paths of all shared maps that have 2316Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2317instantiated unique items. May block.
1776 2318
1777=cut 2319=cut
1778 2320
1779sub unique_maps() { 2321sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2322 [
1781 or return; 2323 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2324 utf8::decode $_;
1787 next if /\.pst$/; 2325 /\.map$/
1788 next unless /^$PATH_SEP/o; 2326 ? normalise $_
1789 2327 : ()
1790 push @paths, cf::map::normalise $_; 2328 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2329 ]
1792
1793 \@paths
1794} 2330}
1795 2331
1796package cf; 2332package cf;
1797 2333
1798=back 2334=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2352 map { $_, inv_recursive_ $_->inv } @_
1817} 2353}
1818 2354
1819sub inv_recursive { 2355sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2357}
2358
2359=item $ref = $ob->ref
2360
2361creates and returns a persistent reference to an objetc that can be stored as a string.
2362
2363=item $ob = cf::object::deref ($refstring)
2364
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block.
2367
2368=cut
2369
2370sub deref {
2371 my ($ref) = @_;
2372
2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2374 my ($uuid, $name) = ($1, $2);
2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2376 or return;
2377 $pl->ob->uuid eq $uuid
2378 or return;
2379
2380 $pl->ob
2381 } else {
2382 warn "$ref: cannot resolve object reference\n";
2383 undef
2384 }
1821} 2385}
1822 2386
1823package cf; 2387package cf;
1824 2388
1825=back 2389=back
1844 2408
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2409 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2410
1847 if ($self->{record_replies}) { 2411 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2412 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2413
1849 } else { 2414 } else {
2415 my $pl = $self->contr;
2416
2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2418 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420
2421 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2424 }
1852 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
1853} 2436}
1854 2437
1855=item $player_object->may ("access") 2438=item $player_object->may ("access")
1856 2439
1857Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
1936 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
1937 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
1938 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
1939 2522
1940 $map->load; 2523 $map->load;
1941 $map->load_diag; 2524 $map->load_neighbours;
1942 2525
1943 return unless $self->contr->active; 2526 return unless $self->contr->active;
1944 $self->activate_recursive; 2527 $self->activate_recursive;
1945 2528
1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1947 $self->enter_map ($map, $x, $y); 2530 $self->enter_map ($map, $x, $y);
1948} 2531}
1949 2532
1950=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1951 2534
1952Moves the player to the given map-path and coordinates by first freezing 2535Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback 2536her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on 2537that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position. 2538the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process.
1956 2540
1957=cut 2541=cut
1958 2542
1959our $GOTOGEN; 2543our $GOTOGEN;
1960 2544
1961sub cf::object::player::goto { 2545sub cf::object::player::goto {
1962 my ($self, $path, $x, $y, $check) = @_; 2546 my ($self, $path, $x, $y, $check, $done) = @_;
1963 2547
1964 # do generation counting so two concurrent goto's will be executed in-order 2548 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1966 2550
1967 $self->enter_link; 2551 $self->enter_link;
1968 2552
1969 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
1970 my $map = eval { 2575 my $map = eval {
1971 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
1972 2577
1973 if ($map) { 2578 if ($map) {
1974 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
1976 } else { 2581 } else {
1977 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1978 } 2583 }
1979 2584
1980 $map 2585 $map
1981 }; 2586 };
1982 2587
1987 2592
1988 if ($gen == $self->{_goto_generation}) { 2593 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation}; 2594 delete $self->{_goto_generation};
1990 $self->leave_link ($map, $x, $y); 2595 $self->leave_link ($map, $x, $y);
1991 } 2596 }
2597
2598 $done->() if $done;
1992 })->prio (1); 2599 })->prio (1);
1993} 2600}
1994 2601
1995=item $player_object->enter_exit ($exit_object) 2602=item $player_object->enter_exit ($exit_object)
1996 2603
2033 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2034 } 2641 }
2035 2642
2036 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2037 2644
2038 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2039 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2040 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2041 2648
2042 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2043 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2065 my $hp = $exit->stats->hp; 2672 my $hp = $exit->stats->hp;
2066 my $sp = $exit->stats->sp; 2673 my $sp = $exit->stats->sp;
2067 2674
2068 $self->enter_link; 2675 $self->enter_link;
2069 2676
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2070 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2071 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2072 unless (eval { 2685 unless (eval {
2073 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2074 2687
2075 1; 2688 1;
2101 2714
2102 utf8::encode $text; 2715 utf8::encode $text;
2103 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2104} 2717}
2105 2718
2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2720
2721Send a drawinfo or msg packet to the client, formatting the msg for the
2722client if neccessary. C<$type> should be a string identifying the type of
2723the message, with C<log> being the default. If C<$color> is negative, suppress
2724the message unless the client supports the msg packet.
2725
2726=cut
2727
2728# non-persistent channels (usually the info channel)
2729our %CHANNEL = (
2730 "c/identify" => {
2731 id => "infobox",
2732 title => "Identify",
2733 reply => undef,
2734 tooltip => "Items recently identified",
2735 },
2736 "c/examine" => {
2737 id => "infobox",
2738 title => "Examine",
2739 reply => undef,
2740 tooltip => "Signs and other items you examined",
2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2778);
2779
2780sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_;
2782
2783 $msg = $self->pl->expand_cfpod ($msg);
2784
2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786
2787 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2796 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel)
2801 if $self->can_msg;
2802 }
2803
2804 $channel = $channel->{id};
2805 }
2806
2807 return unless @extra || length $msg;
2808
2809 if ($self->can_msg) {
2810 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF;
2813
2814 $self->send_packet ("msg " . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2816 } else {
2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827
2828 $color &= cf::NDI_COLOR_MASK;
2829
2830 utf8::encode $msg;
2831
2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2835 } else {
2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2837 $self->send_packet ("drawinfo $color $msg")
2838 }
2839 }
2840 }
2841}
2842
2106=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2107 2844
2108Sends an exti event to the client. 2845Sends an ext event to the client.
2109 2846
2110=cut 2847=cut
2111 2848
2112sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2113 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2114 2851
2852 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2115 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2116 $self->send_packet ("ext " . cf::to_json \%msg); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2859
2860=item $client->ext_reply ($msgid, @msg)
2861
2862Sends an ext reply to the client.
2863
2864=cut
2865
2866sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_;
2868
2869 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 }
2117} 2876}
2118 2877
2119=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2120 2879
2121Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2122the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2881the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2123C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2882C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2124 2883
2125Queries can fail, so check the return code. Or don't, as queries will become 2884Queries can fail, so check the return code. Or don't, as queries will
2126reliable at some point in the future. 2885become reliable at some point in the future.
2127 2886
2128=cut 2887=cut
2129 2888
2130sub cf::client::query { 2889sub cf::client::query {
2131 my ($self, $flags, $text, $cb) = @_; 2890 my ($self, $flags, $text, $cb) = @_;
2139 utf8::encode $text; 2898 utf8::encode $text;
2140 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2899 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2141 2900
2142 $self->send_packet ($self->{query_queue}[0][0]) 2901 $self->send_packet ($self->{query_queue}[0][0])
2143 if @{ $self->{query_queue} } == 1; 2902 if @{ $self->{query_queue} } == 1;
2903
2904 1
2144} 2905}
2145 2906
2146cf::client->attach ( 2907cf::client->attach (
2908 on_connect => sub {
2909 my ($ns) = @_;
2910
2911 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2912 },
2147 on_reply => sub { 2913 on_reply => sub {
2148 my ($ns, $msg) = @_; 2914 my ($ns, $msg) = @_;
2149 2915
2150 # this weird shuffling is so that direct followup queries 2916 # this weird shuffling is so that direct followup queries
2151 # get handled first 2917 # get handled first
2163 } else { 2929 } else {
2164 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2930 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2165 } 2931 }
2166 } 2932 }
2167 }, 2933 },
2934 on_exticmd => sub {
2935 my ($ns, $buf) = @_;
2936
2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2938
2939 if (ref $msg) {
2940 my ($type, $reply, @payload) =
2941 "ARRAY" eq ref $msg
2942 ? @$msg
2943 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2944
2945 my @reply;
2946
2947 if (my $cb = $EXTICMD{$type}) {
2948 @reply = $cb->($ns, @payload);
2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2954 } else {
2955 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2956 }
2957
2958 cf::override;
2959 },
2168); 2960);
2169 2961
2170=item $client->async (\&cb) 2962=item $client->async (\&cb)
2171 2963
2172Create a new coroutine, running the specified callback. The coroutine will 2964Create a new coroutine, running the specified callback. The coroutine will
2213our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2214our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2215 3007
2216$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2217 3009
2218$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3010$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math
3012 grepstart grepwhile mapstart mapwhile
3013 sort time
3014));
2219 3015
2220# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2221 3017
2222=pod 3018=pod
2223 3019
2224The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2225 3021
2226 cf::object contr pay_amount pay_player map 3022 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr
3025
2227 cf::object::player player 3026 cf::object::player
2228 cf::player peaceful 3027 player
2229 cf::map trigger 3028
3029 cf::player
3030 peaceful
3031
3032 cf::map
3033 trigger
2230 3034
2231=cut 3035=cut
2232 3036
2233for ( 3037for (
2234 ["cf::object" => qw(contr pay_amount pay_player map)], 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race
3040 decrease_ob_nr destroy)],
2235 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2236 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2237 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2238) { 3044) {
2239 no strict 'refs'; 3045 no strict 'refs';
2310=back 3116=back
2311 3117
2312=cut 3118=cut
2313 3119
2314############################################################################# 3120#############################################################################
2315
2316=head2 EXTENSION DATABASE SUPPORT
2317
2318Crossfire maintains a very simple database for extension use. It can
2319currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2320convert to/from binary).
2321
2322The parameter C<$family> should best start with the name of the extension
2323using it, it should be unique.
2324
2325=over 4
2326
2327=item $value = cf::db_get $family => $key
2328
2329Returns a single value from the database.
2330
2331=item cf::db_put $family => $key => $value
2332
2333Stores the given C<$value> in the family.
2334
2335=cut
2336
2337our $DB;
2338
2339sub db_init {
2340 unless ($DB) {
2341 $DB = BDB::db_create $DB_ENV;
2342
2343 cf::sync_job {
2344 eval {
2345 $DB->set_flags (BDB::CHKSUM);
2346
2347 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2348 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2349 cf::cleanup "db_open(db): $!" if $!;
2350 };
2351 cf::cleanup "db_open(db): $@" if $@;
2352 };
2353 }
2354}
2355
2356sub db_get($$) {
2357 my $key = "$_[0]/$_[1]";
2358
2359 cf::sync_job {
2360 BDB::db_get $DB, undef, $key, my $data;
2361
2362 $! ? ()
2363 : $data
2364 }
2365}
2366
2367sub db_put($$$) {
2368 BDB::dbreq_pri 4;
2369 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2370}
2371
2372=item cf::cache $id => [$paths...], $processversion => $process
2373
2374Generic caching function that returns the value of the resource $id,
2375caching and regenerating as required.
2376
2377This function can block.
2378
2379=cut
2380
2381sub cache {
2382 my ($id, $src, $processversion, $process) = @_;
2383
2384 my $meta =
2385 join "\x00",
2386 $processversion,
2387 map {
2388 aio_stat $_
2389 and Carp::croak "$_: $!";
2390
2391 ($_, (stat _)[7,9])
2392 } @$src;
2393
2394 my $dbmeta = db_get cache => "$id/meta";
2395 if ($dbmeta ne $meta) {
2396 # changed, we may need to process
2397
2398 my @data;
2399 my $md5;
2400
2401 for (0 .. $#$src) {
2402 0 <= aio_load $src->[$_], $data[$_]
2403 or Carp::croak "$src->[$_]: $!";
2404 }
2405
2406 # if processing is expensive, check
2407 # checksum first
2408 if (1) {
2409 $md5 =
2410 join "\x00",
2411 $processversion,
2412 map {
2413 Coro::cede;
2414 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2415 } 0.. $#$src;
2416
2417
2418 my $dbmd5 = db_get cache => "$id/md5";
2419 if ($dbmd5 eq $md5) {
2420 db_put cache => "$id/meta", $meta;
2421
2422 return db_get cache => "$id/data";
2423 }
2424 }
2425
2426 my $t1 = Time::HiRes::time;
2427 my $data = $process->(\@data);
2428 my $t2 = Time::HiRes::time;
2429
2430 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2431
2432 db_put cache => "$id/data", $data;
2433 db_put cache => "$id/md5" , $md5;
2434 db_put cache => "$id/meta", $meta;
2435
2436 return $data;
2437 }
2438
2439 db_get cache => "$id/data"
2440}
2441
2442=item fork_call { }, $args
2443
2444Executes the given code block with the given arguments in a seperate
2445process, returning the results. Everything must be serialisable with
2446Coro::Storable. May, of course, block. Note that the executed sub may
2447never block itself or use any form of Event handling.
2448
2449=cut
2450
2451sub fork_call(&@) {
2452 my ($cb, @args) = @_;
2453
2454# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2455# or die "socketpair: $!";
2456 pipe my $fh1, my $fh2
2457 or die "pipe: $!";
2458
2459 if (my $pid = fork) {
2460 close $fh2;
2461
2462 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2463 $res = Coro::Storable::thaw $res;
2464
2465 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2466
2467 die $$res unless "ARRAY" eq ref $res;
2468
2469 return wantarray ? @$res : $res->[-1];
2470 } else {
2471 reset_signals;
2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2474 eval {
2475 close $fh1;
2476
2477 my @res = eval { $cb->(@args) };
2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2479 };
2480
2481 warn $@ if $@;
2482 _exit 0;
2483 }
2484}
2485
2486
2487
2488#############################################################################
2489# the server's init and main functions 3121# the server's init and main functions
2490 3122
2491sub load_facedata($) { 3123sub load_facedata($) {
2492 my ($path) = @_; 3124 my ($path) = @_;
3125
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
3130 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2493 3131
2494 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2495 3133
2496 my $facedata; 3134 my $facedata;
2497 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2500 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2501 3139
2502 $facedata->{version} == 2 3140 $facedata->{version} == 2
2503 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2504 3142
3143 # patch in the exptable
3144 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3147 };
3148 cf::cede_to_tick;
3149
2505 { 3150 {
2506 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2507 3152
2508 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2509 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2510 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap};
2511 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2512 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2513 Coro::cede; 3160
3161 cf::cede_to_tick;
2514 } 3162 }
2515 3163
2516 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2517 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2518 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2519 or next; 3168 or next;
3169
2520 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth;
2521 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2522 } else { 3173 } else {
2523 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2524 } 3175 }
2525 Coro::cede; 3176
3177 cf::cede_to_tick;
2526 } 3178 }
2527 } 3179 }
2528 3180
2529 { 3181 {
2530 my $anims = $facedata->{animinfo}; 3182 my $anims = $facedata->{animinfo};
2531 3183
2532 while (my ($anim, $info) = each %$anims) { 3184 while (my ($anim, $info) = each %$anims) {
2533 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3185 cf::anim::set $anim, $info->{frames}, $info->{facings};
2534 Coro::cede; 3186 cf::cede_to_tick;
2535 } 3187 }
2536 3188
2537 cf::anim::invalidate_all; # d'oh 3189 cf::anim::invalidate_all; # d'oh
2538 } 3190 }
2539 3191
3192 {
3193 # TODO: for gcfclient pleasure, we should give resources
3194 # that gcfclient doesn't grok a >10000 face index.
3195 my $res = $facedata->{resource};
3196
3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201
3202 if ($info->{type} & 1) {
3203 # prepend meta info
3204
3205 my $meta = $enc->encode ({
3206 name => $name,
3207 %{ $info->{meta} || {} },
3208 });
3209
3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3217 } else {
3218 $RESOURCE{$name} = $info;
3219 }
3220
3221 cf::cede_to_tick;
3222 }
3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3226
2540 1 3227 1
2541} 3228}
2542 3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3249
3250register_exticmd fx_want => sub {
3251 my ($ns, $want) = @_;
3252
3253 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v);
3255 }
3256};
3257
2543sub reload_regions { 3258sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = ();
3262
2544 load_resource_file "$MAPDIR/regions" 3263 load_resource_file "$MAPDIR/regions"
2545 or die "unable to load regions file\n"; 3264 or die "unable to load regions file\n";
3265
3266 for (cf::region::list) {
3267 $_->{match} = qr/$_->{match}/
3268 if exists $_->{match};
3269 }
2546} 3270}
2547 3271
2548sub reload_facedata { 3272sub reload_facedata {
2549 load_facedata "$DATADIR/facedata" 3273 load_facedata "$DATADIR/facedata"
2550 or die "unable to load facedata\n"; 3274 or die "unable to load facedata\n";
2551} 3275}
2552 3276
2553sub reload_archetypes { 3277sub reload_archetypes {
2554 load_resource_file "$DATADIR/archetypes" 3278 load_resource_file "$DATADIR/archetypes"
2555 or die "unable to load archetypes\n"; 3279 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
2556} 3285}
2557 3286
2558sub reload_treasures { 3287sub reload_treasures {
2559 load_resource_file "$DATADIR/treasures" 3288 load_resource_file "$DATADIR/treasures"
2560 or die "unable to load treasurelists\n"; 3289 or die "unable to load treasurelists\n";
2563sub reload_resources { 3292sub reload_resources {
2564 warn "reloading resource files...\n"; 3293 warn "reloading resource files...\n";
2565 3294
2566 reload_regions; 3295 reload_regions;
2567 reload_facedata; 3296 reload_facedata;
3297 #reload_archetypes;#d#
2568 reload_archetypes; 3298 reload_archetypes;
2569 reload_treasures; 3299 reload_treasures;
2570 3300
2571 warn "finished reloading resource files\n"; 3301 warn "finished reloading resource files\n";
2572} 3302}
2573 3303
2574sub init { 3304sub init {
2575 reload_resources; 3305 reload_resources;
2576} 3306}
2577 3307
2578sub cfg_load { 3308sub reload_config {
2579 open my $fh, "<:utf8", "$CONFDIR/config" 3309 open my $fh, "<:utf8", "$CONFDIR/config"
2580 or return; 3310 or return;
2581 3311
2582 local $/; 3312 local $/;
2583 *CFG = YAML::Syck::Load <$fh>; 3313 *CFG = YAML::Syck::Load <$fh>;
2599sub main { 3329sub main {
2600 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
2601 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
2602 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2603 (async { 3333 (async {
2604 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
2605 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
2606 }; 3337 };
2607 3338
2608 cfg_load; 3339 reload_config;
2609 db_init; 3340 db_init;
2610 load_extensions; 3341 load_extensions;
2611 3342
2612 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2613 Event::loop; 3345 EV::loop;
2614} 3346}
2615 3347
2616############################################################################# 3348#############################################################################
2617# initialisation and cleanup 3349# initialisation and cleanup
2618 3350
2619# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
2620BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
2621 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
2622 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2623 reentrant => 0,
2624 data => WF_AUTOCANCEL,
2625 signal => $signal,
2626 prio => 0,
2627 cb => sub {
2628 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
2629 },
2630 ); 3357 };
3358 }
3359}
3360
3361sub write_runtime {
3362 my $runtime = "$LOCALDIR/runtime";
3363
3364 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time.
3366
3367 IO::AIO::aio_utime $runtime, undef, undef;
3368
3369 my $guard = cf::lock_acquire "write_runtime";
3370
3371 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3372 or return;
3373
3374 my $value = $cf::RUNTIME + 90 + 10;
3375 # 10 is the runtime save interval, for a monotonic clock
3376 # 60 allows for the watchdog to kill the server.
3377
3378 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3379 and return;
3380
3381 # always fsync - this file is important
3382 aio_fsync $fh
3383 and return;
3384
3385 # touch it again to show we are up-to-date
3386 aio_utime $fh, undef, undef;
3387
3388 close $fh
3389 or return;
3390
3391 aio_rename "$runtime~", $runtime
3392 and return;
3393
3394 warn "runtime file written.\n";
3395
2631 } 3396 1
2632} 3397}
2633 3398
2634sub emergency_save() { 3399sub emergency_save() {
2635 my $freeze_guard = cf::freeze_mainloop; 3400 my $freeze_guard = cf::freeze_mainloop;
2636 3401
2642 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
2643 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
2644 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
2645 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
2646 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2647 $pl->save; 3413 $pl->save;
2648 } 3414 }
2649 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
2650 3416
2651 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
2690 warn "syncing database to disk"; 3456 warn "syncing database to disk";
2691 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
2692 3458
2693 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
2694 3460
2695 warn "cancelling all WF_AUTOCANCEL watchers";
2696 for (Event::all_watchers) {
2697 $_->cancel if $_->data & WF_AUTOCANCEL;
2698 }
2699
2700 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
2701 for (;;) { 3462 for (;;) {
2702 BDB::flush; 3463 BDB::flush;
2703 IO::AIO::flush; 3464 IO::AIO::flush;
2704 Coro::cede; 3465 Coro::cede_notself;
2705 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
2706 warn "iterate..."; 3467 warn "iterate...";
2707 } 3468 }
2708 3469
2709 ++$RELOAD; 3470 ++$RELOAD;
2713 %EXT_CORO = (); 3474 %EXT_CORO = ();
2714 3475
2715 warn "removing commands"; 3476 warn "removing commands";
2716 %COMMAND = (); 3477 %COMMAND = ();
2717 3478
2718 warn "removing ext commands"; 3479 warn "removing ext/exti commands";
2719 %EXTCMD = (); 3480 %EXTCMD = ();
3481 %EXTICMD = ();
2720 3482
2721 warn "unloading/nuking all extensions"; 3483 warn "unloading/nuking all extensions";
2722 for my $pkg (@EXTS) { 3484 for my $pkg (@EXTS) {
2723 warn "... unloading $pkg"; 3485 warn "... unloading $pkg";
2724 3486
2767 warn "reloading cf.pm"; 3529 warn "reloading cf.pm";
2768 require cf; 3530 require cf;
2769 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2770 3532
2771 warn "loading config and database again"; 3533 warn "loading config and database again";
2772 cf::cfg_load; 3534 cf::reload_config;
2773 3535
2774 warn "loading extensions"; 3536 warn "loading extensions";
2775 cf::load_extensions; 3537 cf::load_extensions;
2776 3538
2777 warn "reattaching attachments to objects/players"; 3539 warn "reattaching attachments to objects/players";
2797 3559
2798sub reload_perl() { 3560sub reload_perl() {
2799 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
2800 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
2801 3563
2802 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2803 reentrant => 0,
2804 after => 0,
2805 data => WF_AUTOCANCEL,
2806 cb => sub {
2807 do_reload_perl;
2808 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
2809 }, 3566 do_reload_perl;
2810 ); 3567 };
2811} 3568}
2812 3569
2813register_command "reload" => sub { 3570register_command "reload" => sub {
2814 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
2815 3572
2816 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
2817 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
2818 async { reload_perl }; 3577 reload_perl;
3578 };
2819 } 3579 }
2820}; 3580};
2821 3581
2822unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
2823 3583
2842 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
2843 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
2844 $signal->wait; 3604 $signal->wait;
2845} 3605}
2846 3606
2847 my $min = 1e6;#d# 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2848 my $avg = 10;
2849$TICK_WATCHER = Event->timer (
2850 reentrant => 0,
2851 parked => 1,
2852 prio => 0,
2853 at => $NEXT_TICK || $TICK,
2854 data => WF_AUTOCANCEL,
2855 cb => sub {
2856 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
2857 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2858 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
2859 return; 3611 return;
2860 } 3612 }
2861 3613
2862 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
2863 3615
2864 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
2865 3617
2866 0 && sync_job {#d# 3618 $RUNTIME += $TICK;
2867 for(1..10) { 3619 $NEXT_TICK = $_[0]->at;
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871 3620
2872 $map->width (50); 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2873 $map->height (50); 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2874 $map->alloc; 3623 Coro::async_pool {
2875 $map->_load_objects ("/tmp/x.map", 1); 3624 $Coro::current->{desc} = "runtime saver";
2876 my $t = Event::time - $t; 3625 write_runtime
2877 3626 or warn "ERROR: unable to write runtime file: $!";
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 }; 3627 };
3628 }
2888 3629
2889 $RUNTIME += $TICK;
2890 $NEXT_TICK += $TICK;
2891
2892 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2893 $NEXT_RUNTIME_WRITE = $NOW + 10;
2894 Coro::async_pool {
2895 write_runtime
2896 or warn "ERROR: unable to write runtime file: $!";
2897 };
2898 }
2899
2900# my $AFTER = Event::time;
2901# warn $AFTER - $NOW;#d#
2902
2903 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2904 $sig->send; 3631 $sig->send;
2905 } 3632 }
2906 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
2907 $sig->send; 3634 $sig->send;
2908 } 3635 }
2909 3636
2910 $NOW = Event::time;
2911
2912 # if we are delayed by four ticks or more, skip them all
2913 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2914
2915 $TICK_WATCHER->at ($NEXT_TICK);
2916 $TICK_WATCHER->start;
2917
2918 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
2919 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2920 3639
2921 _post_tick; 3640 _post_tick;
2922 3641};
2923 3642$TICK_WATCHER->priority (EV::MAXPRI);
2924 },
2925);
2926 3643
2927{ 3644{
2928 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
2929 $BDB_POLL_WATCHER = Event->io ( 3646
2930 reentrant => 0,
2931 fd => BDB::poll_fileno,
2932 poll => 'r',
2933 prio => 0,
2934 data => WF_AUTOCANCEL,
2935 cb => \&BDB::poll_cb,
2936 );
2937 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
2938 3648 BDB::max_poll_reqs $TICK * 0.1;
2939 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
2940 my $status;
2941 my $current = $Coro::current;
2942 (
2943 sub {
2944 $status = $!;
2945 $current->ready; undef $current;
2946 },
2947 sub {
2948 Coro::schedule while defined $current;
2949 $! = $status;
2950 },
2951 )
2952 };
2953 3650
2954 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
2955 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1);
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2956 3657
2957 cf::sync_job { 3658 cf::sync_job {
2958 eval { 3659 eval {
2959 BDB::db_env_open 3660 BDB::db_env_open
2960 $DB_ENV, 3661 $DB_ENV,
2962 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3663 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2963 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2964 0666; 3665 0666;
2965 3666
2966 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2967
2968 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2969 $DB_ENV->set_lk_detect;
2970 }; 3668 };
2971 3669
2972 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
2973 }; 3671 };
2974 } 3672 }
3673
3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3676 };
3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3679 };
3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3682 };
2975} 3683}
2976 3684
2977{ 3685{
3686 # configure IO::AIO
3687
2978 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
2979
2980 undef $Coro::AIO::WATCHER;
2981 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
2982 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
2983 reentrant => 0,
2984 data => WF_AUTOCANCEL,
2985 fd => IO::AIO::poll_fileno,
2986 poll => 'r',
2987 prio => 6,
2988 cb => \&IO::AIO::poll_cb,
2989 );
2990} 3691}
2991 3692
2992my $_log_backtrace; 3693my $_log_backtrace;
2993 3694
2994sub _log_backtrace { 3695sub _log_backtrace {
2998 3699
2999 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3000 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3001 ++$_log_backtrace; 3702 ++$_log_backtrace;
3002 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3003 my @bt = fork_call { 3706 my @bt = fork_call {
3004 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3005 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3006 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3007 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines