ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines