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.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML::Syck ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43 43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
46 46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
74 75
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 77our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
82 82
83our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 87our $DB_ENV;
85 88
86our %CFG; 89our %CFG;
87 90
88our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 92our $RUNTIME;
93our $NOW;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
158 162
159The raw value load value from the last tick. 163The raw value load value from the last tick.
160 164
161=item %cf::CFG 165=item %cf::CFG
162 166
163Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 168from wherever your confdir points to.
165 169
166=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
167 171
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
172=back 182=back
173 183
174=cut 184=cut
175 185
176BEGIN { 186BEGIN {
180 $msg .= "\n" 190 $msg .= "\n"
181 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
182 192
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 194
185 utf8::encode $msg;
186 LOG llevError, $msg; 195 LOG llevError, $msg;
187 }; 196 };
188} 197}
189 198
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
206)) { 215)) {
207 no strict 'refs'; 216 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 218}
210 219
211$Event::DIED = sub { 220$EV::DIED = sub {
212 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
213}; 222};
214 223
215############################################################################# 224#############################################################################
216 225
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 249 $d
241 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
242} 251}
243 252
244=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
245 254
246Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
247 256
248=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
249 258
250Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
251 260
252=cut 261=cut
253 262
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 264
256sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
258 267
259=item cf::lock_wait $string 268=item cf::lock_wait $string
260 269
261Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
262 271
265Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
268returned. 277returned.
269 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
270Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
272 284
273=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
274 286
275Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
276 288
277=cut 289=cut
278 290
279our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
280 293
281sub lock_wait($) { 294sub lock_wait($) {
282 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
283 301
284 # wait for lock, if any 302 # wait for lock, if any
285 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 305 Coro::schedule;
293 311
294 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
295 lock_wait $key; 313 lock_wait $key;
296 314
297 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
298 317
299 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
302 } 322 }
303} 323}
304 324
316 }; 336 };
317 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
318 $guard 338 $guard
319} 339}
320 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
356=item cf::get_slot $time[, $priority[, $name]]
357
358Allocate $time seconds of blocking CPU time at priority C<$priority>:
359This call blocks and returns only when you have at least C<$time> seconds
360of cpu time till the next tick. The slot is only valid till the next cede.
361
362The optional C<$name> can be used to identify the job to run. It might be
363used for statistical purposes and should identify the same time-class.
364
365Useful for short background jobs.
366
367=cut
368
369our @SLOT_QUEUE;
370our $SLOT_QUEUE;
371
372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
376 my $signal = new Coro::Signal;
377
378 while () {
379 next_job:
380 my $avail = cf::till_tick;
381 if ($avail > 0.01) {
382 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) {
384 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send;
386 Coro::cede;
387 goto next_job;
388 }
389 }
390 }
391
392 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait;
396 } else {
397 Coro::schedule;
398 }
399 }
400};
401
402sub get_slot($;$$) {
403 my ($time, $pri, $name) = @_;
404
405 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal;
407
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready;
411 $sig->wait;
412}
413
321=item cf::async { BLOCK } 414=item cf::async { BLOCK }
322 415
323Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
324C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 417C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
328 421
329BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
330 423
331=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
332 425
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 429acceptable.
337 430
338If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
344 437
345sub sync_job(&) { 438sub sync_job(&) {
346 my ($job) = @_; 439 my ($job) = @_;
347 440
348 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 442 my $time = EV::time;
350 443
351 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
353 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
354 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
355 # (but this is cancel-safe) 450 # (but this is cancel-safe)
356 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
357 452
358 my $busy = 1; 453 my $busy = 1;
359 my @res; 454 my @res;
360 455
361 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 458 @res = eval { $job->() };
363 warn $@ if $@; 459 warn $@ if $@;
364 undef $busy; 460 undef $busy;
365 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
366 462
367 while ($busy) { 463 while ($busy) {
368 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
369 } 468 }
469 }
370 470
371 $time = Event::time - $time; 471 $time = EV::time - $time;
372 472
373 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375 475
376 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
406=item fork_call { }, $args 506=item fork_call { }, $args
407 507
408Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
412 512
413=cut 513=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 514
424sub fork_call(&@) { 515sub fork_call(&@) {
425 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
426 517
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 518 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 519 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 520 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 521
432 if (my $pid = fork) { 522 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 523 reset_signals;
446 local $SIG{__WARN__}; 524 &$cb
447 local $SIG{__DIE__}; 525 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 526
454 eval { 527 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 528}
467 529
468=item $value = cf::db_get $family => $key 530=item $value = cf::db_get $family => $key
469 531
470Returns a single value from the environment database. 532Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 534=item cf::db_put $family => $key => $value
473 535
474Stores the given C<$value> in the family. It can currently store binary 536Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
477=cut 544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
557 };
558 cf::cleanup "db_open(db): $@" if $@;
559
560 $db
561}
478 562
479our $DB; 563our $DB;
480 564
481sub db_init { 565sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 566 cf::sync_job {
486 eval { 567 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 568 };
496} 569}
497 570
498sub db_get($$) { 571sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 572 my $key = "$_[0]/$_[1]";
500 573
550 if (1) { 623 if (1) {
551 $md5 = 624 $md5 =
552 join "\x00", 625 join "\x00",
553 $processversion, 626 $processversion,
554 map { 627 map {
555 Coro::cede; 628 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 630 } 0.. $#$src;
558 631
559 632
560 my $dbmd5 = db_get cache => "$id/md5"; 633 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
606 679
607In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 682Deliantra).
610 683
611=over 4 684=over 4
612 685
613=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
614 687
866 "; 939 ";
867 die if $@; 940 die if $@;
868} 941}
869 942
870our $override; 943our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 944our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 945
873sub override { 946sub override {
874 $override = 1; 947 $override = 1;
875 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
876} 949}
877 950
878sub do_invoke { 951sub do_invoke {
879 my $event = shift; 952 my $event = shift;
880 my $callbacks = shift; 953 my $callbacks = shift;
881 954
882 @invoke_results = (); 955 @INVOKE_RESULTS = ();
883 956
884 local $override; 957 local $override;
885 958
886 for (@$callbacks) { 959 for (@$callbacks) {
887 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
904 977
905Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
906 979
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 980This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 981removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 983
911=back 984=back
912 985
913=cut 986=cut
914 987
915############################################################################# 988#############################################################################
916# object support 989# object support
990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
1024sub _can_merge {
1025 my ($ob1, $ob2) = @_;
1026
1027 ++$SLOW_MERGES;#d#
1028
1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
1031}
917 1032
918sub reattach { 1033sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1035 my ($obj) = @_;
921 1036
942cf::attachable->attach ( 1057cf::attachable->attach (
943 prio => -1000000, 1058 prio => -1000000,
944 on_instantiate => sub { 1059 on_instantiate => sub {
945 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
946 1061
947 $data = from_json $data; 1062 $data = decode_json $data;
948 1063
949 for (@$data) { 1064 for (@$data) {
950 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
951 1066
952 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1083sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
970 1085
971 sync_job { 1086 sync_job {
972 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
975 1091
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1096 close $fh;
981 1097
982 if (@$objs) { 1098 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1104 close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
990 } 1106 }
998 } 1114 }
999 } else { 1115 } else {
1000 aio_unlink $filename; 1116 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1002 } 1118 }
1003 } 1119 };
1004} 1120}
1005 1121
1006sub object_freezer_as_string { 1122sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1008 1124
1020 or return; 1136 or return;
1021 1137
1022 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1140 or return;
1141
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1026 } 1144 }
1027 1145
1146 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
1149
1030 return ($data, $av); 1150 ($data, $av)
1031} 1151}
1032 1152
1033=head2 COMMAND CALLBACKS 1153=head2 COMMAND CALLBACKS
1034 1154
1035=over 4 1155=over 4
1108 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
1109 1229
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1231
1112 if (ref $msg) { 1232 if (ref $msg) {
1233 my ($type, $reply, @payload) =
1234 "ARRAY" eq ref $msg
1235 ? @$msg
1236 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1237
1238 my @reply;
1239
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
1118 } else { 1247 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1249 }
1121 1250
1122 cf::override; 1251 cf::override;
1212 1341
1213=head3 cf::player 1342=head3 cf::player
1214 1343
1215=over 4 1344=over 4
1216 1345
1346=item cf::player::num_playing
1347
1348Returns the official number of playing players, as per the Crossfire metaserver rules.
1349
1350=cut
1351
1352sub num_playing {
1353 scalar grep
1354 $_->ob->map
1355 && !$_->hidden
1356 && !$_->ob->flag (cf::FLAG_WIZ),
1357 cf::player::list
1358}
1359
1217=item cf::player::find $login 1360=item cf::player::find $login
1218 1361
1219Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
1220 1363
1221=cut 1364=cut
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1403
1261 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1405 or return;
1406
1407 my $pl = cf::player::load_pl $f
1408 or return;
1409 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1264 } 1412 }
1265 } 1413 }
1266} 1414}
1267 1415
1277 1425
1278 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1280 1428
1281 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1282 Coro::cede; 1430 cf::cede_to_tick;
1283} 1431}
1284 1432
1285sub new($) { 1433sub new($) {
1286 my ($login) = @_; 1434 my ($login) = @_;
1287 1435
1291 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1292 1440
1293 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1294 1442
1295 $self 1443 $self
1444}
1445
1446=item $player->send_msg ($channel, $msg, $color, [extra...])
1447
1448=cut
1449
1450sub send_msg {
1451 my $ns = shift->ns
1452 or return;
1453 $ns->send_msg (@_);
1296} 1454}
1297 1455
1298=item $pl->quit_character 1456=item $pl->quit_character
1299 1457
1300Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1513 or return [];
1356 1514
1357 my @logins; 1515 my @logins;
1358 1516
1359 for my $login (@$dirs) { 1517 for my $login (@$dirs) {
1518 my $path = path $login;
1519
1520 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1363 1526
1364 utf8::decode $login; 1527 utf8::decode $login;
1365 push @logins, $login; 1528 push @logins, $login;
1366 } 1529 }
1367 1530
1400 1563
1401Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1402 1565
1403=cut 1566=cut
1404 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1405sub expand_cfpod { 1579sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1407 1581
1408 # escape & and < 1582 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1583
1412 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1413 1587
1414 1 while 1588 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1593 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1594 <
1421 $self->gender ? $2 : $1 1595 (?:
1422 }ge 1596 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1597 | < $interior >
1424 || s{H<([^\>]*)>} 1598 )
1599 >
1600 %gcsx
1425 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1621 "")
1429 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1431 1633
1634 for ($xml) {
1432 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1434 1637
1435 # compress some whitespace 1638 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1440 1644
1441 $_ 1645 $xml
1442} 1646}
1647
1648no re 'eval';
1443 1649
1444sub hintmode { 1650sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1652 $_[0]{hintmode}
1447} 1653}
1448 1654
1449=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1450 1656
1451Sends an ext reply to the player. 1657Sends an ext reply to the player.
1452 1658
1453=cut 1659=cut
1454 1660
1455sub ext_reply($$%) { 1661sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1457 1663
1458 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1665}
1461 1666
1462=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1463 1668
1464Sends an ext event to the client. 1669Sends an ext event to the client.
1465 1670
1466=cut 1671=cut
1467 1672
1468sub ext_event($$%) { 1673sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1470 1675
1471 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1472} 1677}
1473 1678
1474=head3 cf::region 1679=head3 cf::region
1475 1680
1476=over 4 1681=over 4
1619 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1620 return $self; 1825 return $self;
1621 } 1826 }
1622 } 1827 }
1623 1828
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1830 ()
1626} 1831}
1627 1832
1628sub init { 1833sub init {
1629 my ($self) = @_; 1834 my ($self) = @_;
1692 1897
1693sub load_header_from($) { 1898sub load_header_from($) {
1694 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1695 1900
1696 utf8::encode $path; 1901 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1903 or return;
1904
1905 $self->_load_header ($f)
1906 or return;
1907
1908 local $MAP_LOADING{$self->{path}} = $self;
1909 $f->resolve_delayed_derefs;
1702 1910
1703 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1704 1912
1705 1 1913 1
1706} 1914}
1760sub find { 1968sub find {
1761 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1762 1970
1763 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1764 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1766 1975
1767 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1769 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1770 or return; 1981 or return;
1771 1982
1772 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1773 1984
1775 or return; 1986 or return;
1776 1987
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1780 $map->reset; 1993 $map->reset;
1781 undef $guard;
1782 return find $path; 1994 return find $path;
1783 } 1995 }
1784 1996
1785 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1786 } 1998 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1796 2008
1797 my $path = $self->{path}; 2009 my $path = $self->{path};
1798 2010
1799 { 2011 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1801 2013
2014 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2016
1804 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1805 2018
1806 $self->alloc; 2019 $self->alloc;
1807 2020
1808 $self->pre_load; 2021 $self->pre_load;
1809 Coro::cede; 2022 cf::cede_to_tick;
1810 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1812 or return; 2027 or return;
1813 2028
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1816 2031
1817 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2033 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2036 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1822 } 2040 }
1823 } 2041 }
1824 2042
1825 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1826 # now do the right thing for maps 2046 # now do the right thing for maps
1827 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2049 unless $self->difficulty;
1830 Coro::cede; 2050 cf::cede_to_tick;
1831 2051
1832 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2053 $self->decay_objects;
1834 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1835 $self->update_buttons; 2055 $self->update_buttons;
1836 Coro::cede; 2056 cf::cede_to_tick;
1837 $self->set_darkness_map; 2057 $self->set_darkness_map;
1838 Coro::cede; 2058 cf::cede_to_tick;
1839 $self->activate; 2059 $self->activate;
1840 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1841 2064
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2066 }
1844 2067
1845 $self->post_load; 2068 $self->post_load;
1856 2079
1857 $self 2080 $self
1858} 2081}
1859 2082
1860# find and load all maps in the 3x3 area around a map 2083# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2084sub load_neighbours {
1862 my ($map) = @_; 2085 my ($map) = @_;
1863 2086
1864 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1865 2088
1866 for (0 .. 3) { 2089 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1868 or next; 2091 or next;
1869 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1870 or next; 2093 or next;
1871 $neigh->load; 2094 $neigh->load;
1872 2095
2096 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2099 }
1876 2100
1877 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1879 or next; 2104 or next;
1880 $neigh->load; 2105 $neigh->load;
1881 } 2106 }
1882} 2107}
1883 2108
1888} 2113}
1889 2114
1890sub do_load_sync { 2115sub do_load_sync {
1891 my ($map) = @_; 2116 my ($map) = @_;
1892 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1893 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1894} 2122}
1895 2123
1896our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1898 2126
1899sub find_async { 2127sub find_async {
1900 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1901 2129
1902 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1903 2131
1904 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2134 }
1907 2135
1908 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1909 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1910 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2143 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2144 $map->load if $v;
2145 }
1915 2146
1916 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1917 } 2148 }
1918 } 2149 }
1919 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1920 }; 2151 };
1921 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
1924} 2155}
1925 2156
1926sub save { 2157sub save {
1927 my ($self) = @_; 2158 my ($self) = @_;
1928 2159
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2161
1931 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1932 2163
1933 return unless $self->dirty; 2164 return unless $self->dirty;
1934 2165
1940 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1941 2172
1942 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1943 2174
1944 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1946 }; 2178 };
1947 2179
1948 if ($uniq) { 2180 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2189 my ($self) = @_;
1958 2190
1959 # save first because save cedes 2191 # save first because save cedes
1960 $self->save; 2192 $self->save;
1961 2193
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2195
1964 return if $self->players; 2196 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1967 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2204 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2205}
1971 2206
1972sub reset_at { 2207sub reset_at {
1973 my ($self) = @_; 2208 my ($self) = @_;
1974 2209
2006 if $uniq; 2241 if $uniq;
2007 } 2242 }
2008 2243
2009 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2010 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2248 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2249
2015 $self->unlink_save; 2250 $self->unlink_save;
2016 $self->destroy; 2251 $self->destroy;
2017} 2252}
2018 2253
2019my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
2020 2255
2021sub nuke { 2256sub nuke {
2022 my ($self) = @_; 2257 my ($self) = @_;
2023 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2024 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
2025 2263
2026 $self->unlink_save; 2264 $self->unlink_save;
2027 2265
2028 bless $self, "cf::map"; 2266 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2271
2034 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
2035 2274
2036 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2037} 2276}
2038 2277
2039=item $maps = cf::map::tmp_maps 2278=item $maps = cf::map::tmp_maps
2115 2354
2116sub inv_recursive { 2355sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2118} 2357}
2119 2358
2359=item $ref = $ob->ref
2360
2361creates and returns a persistent reference to an objetc that can be stored as a string.
2362
2363=item $ob = cf::object::deref ($refstring)
2364
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block.
2367
2368=cut
2369
2370sub deref {
2371 my ($ref) = @_;
2372
2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2374 my ($uuid, $name) = ($1, $2);
2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2376 or return;
2377 $pl->ob->uuid eq $uuid
2378 or return;
2379
2380 $pl->ob
2381 } else {
2382 warn "$ref: cannot resolve object reference\n";
2383 undef
2384 }
2385}
2386
2120package cf; 2387package cf;
2121 2388
2122=back 2389=back
2123 2390
2124=head3 cf::object::player 2391=head3 cf::object::player
2146 2413
2147 } else { 2414 } else {
2148 my $pl = $self->contr; 2415 my $pl = $self->contr;
2149 2416
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2420
2159 } else { 2421 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2162 } 2424 }
2163 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
2164} 2436}
2165 2437
2166=item $player_object->may ("access") 2438=item $player_object->may ("access")
2167 2439
2168Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2250 2522
2251 $map->load; 2523 $map->load;
2252 $map->load_diag; 2524 $map->load_neighbours;
2253 2525
2254 return unless $self->contr->active; 2526 return unless $self->contr->active;
2255 $self->activate_recursive; 2527 $self->activate_recursive;
2256 2528
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2550
2279 $self->enter_link; 2551 $self->enter_link;
2280 2552
2281 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
2282 my $map = eval { 2575 my $map = eval {
2283 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2284 2577
2285 if ($map) { 2578 if ($map) {
2286 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2288 } else { 2581 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2583 }
2291 2584
2292 $map 2585 $map
2293 }; 2586 };
2294 2587
2347 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2348 } 2641 }
2349 2642
2350 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2351 2644
2352 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2353 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2355 2648
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
2384 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2387 2680
2388 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2389 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2390 unless (eval { 2685 unless (eval {
2391 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2392 2687
2393 1; 2688 1;
2419 2714
2420 utf8::encode $text; 2715 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2717}
2423 2718
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2720
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2721Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2722client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2430 2725
2431=cut 2726=cut
2432 2727
2728# non-persistent channels (usually the info channel)
2729our %CHANNEL = (
2730 "c/identify" => {
2731 id => "infobox",
2732 title => "Identify",
2733 reply => undef,
2734 tooltip => "Items recently identified",
2735 },
2736 "c/examine" => {
2737 id => "infobox",
2738 title => "Examine",
2739 reply => undef,
2740 tooltip => "Signs and other items you examined",
2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2778);
2779
2433sub cf::client::send_msg { 2780sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2782
2436 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2437 2784
2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786
2787 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2796 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel)
2801 if $self->can_msg;
2802 }
2803
2804 $channel = $channel->{id};
2805 }
2806
2438 return unless @extra || length $msg; 2807 return unless @extra || length $msg;
2439 2808
2440 if ($self->can_msg) { 2809 if ($self->can_msg) {
2810 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF;
2813
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2814 $self->send_packet ("msg " . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2816 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) { 2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827
2828 $color &= cf::NDI_COLOR_MASK;
2829
2830 utf8::encode $msg;
2831
2454 if (0 && $msg =~ /\[/) { 2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2835 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2837 $self->send_packet ("drawinfo $color $msg")
2459 } 2838 }
2460 } 2839 }
2461 } 2840 }
2462} 2841}
2463 2842
2464=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2465 2844
2466Sends an ext event to the client. 2845Sends an ext event to the client.
2467 2846
2468=cut 2847=cut
2469 2848
2470sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2472 2851
2473 return unless $self->extcmd; 2852 if ($self->extcmd == 2) {
2474 2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2859
2860=item $client->ext_reply ($msgid, @msg)
2861
2862Sends an ext reply to the client.
2863
2864=cut
2865
2866sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_;
2868
2869 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 }
2477} 2876}
2478 2877
2479=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2480 2879
2481Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2935 my ($ns, $buf) = @_;
2537 2936
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2938
2540 if (ref $msg) { 2939 if (ref $msg) {
2940 my ($type, $reply, @payload) =
2941 "ARRAY" eq ref $msg
2942 ? @$msg
2943 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2944
2945 my @reply;
2946
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2947 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2948 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2547 } else { 2954 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2955 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 2956 }
2550 2957
2551 cf::override; 2958 cf::override;
2598our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2600 3007
2601$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2602 3009
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3010$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math
3012 grepstart grepwhile mapstart mapwhile
3013 sort time
3014));
2604 3015
2605# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2606 3017
2607=pod 3018=pod
2608 3019
2609The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2610 3021
2611 cf::object 3022 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3023 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3024 insert remove name archname title slaying race decrease_ob_nr
2614 3025
2615 cf::object::player 3026 cf::object::player
2616 player 3027 player
2617 3028
2618 cf::player 3029 cf::player
2623 3034
2624=cut 3035=cut
2625 3036
2626for ( 3037for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race
2628 insert remove)], 3040 decrease_ob_nr destroy)],
2629 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2632) { 3044) {
2633 no strict 'refs'; 3045 no strict 'refs';
2709# the server's init and main functions 3121# the server's init and main functions
2710 3122
2711sub load_facedata($) { 3123sub load_facedata($) {
2712 my ($path) = @_; 3124 my ($path) = @_;
2713 3125
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
3130 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3131
2714 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2715 3133
2716 my $facedata; 3134 my $facedata;
2717 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3136 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2721 3139
2722 $facedata->{version} == 2 3140 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3142
3143 # patch in the exptable
3144 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3147 };
3148 cf::cede_to_tick;
3149
2725 { 3150 {
2726 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2727 3152
2728 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2730 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3160
2735 cf::cede_to_tick; 3161 cf::cede_to_tick;
2736 } 3162 }
2737 3163
2738 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2740 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2741 or next; 3168 or next;
3169
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3173 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3191
2764 { 3192 {
2765 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3196
2770 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3198 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776 my $data = pack "(w/a*)*", $meta, $info->{data};
2777 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778
2779 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201
3202 if ($info->{type} & 1) {
3203 # prepend meta info
3204
3205 my $meta = $enc->encode ({
3206 name => $name,
3207 %{ $info->{meta} || {} },
3208 });
3209
3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2780 cf::face::set_type $idx, 1; 3216 cf::face::set_type $idx, $info->{type};
2781 cf::face::set_data $idx, 0, $data, $chk; 3217 } else {
3218 $RESOURCE{$name} = $info;
3219 }
2782 3220
2783 cf::cede_to_tick; 3221 cf::cede_to_tick;
2784 } 3222 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
2785 } 3241 }
2786 3242
2787 1 3243 1
2788} 3244}
2789 3245
3246register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_;
3248
3249 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v);
3251 }
3252};
3253
2790sub reload_regions { 3254sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = ();
3258
2791 load_resource_file "$MAPDIR/regions" 3259 load_resource_file "$MAPDIR/regions"
2792 or die "unable to load regions file\n"; 3260 or die "unable to load regions file\n";
2793 3261
2794 for (cf::region::list) { 3262 for (cf::region::list) {
2795 $_->{match} = qr/$_->{match}/ 3263 $_->{match} = qr/$_->{match}/
2831 3299
2832sub init { 3300sub init {
2833 reload_resources; 3301 reload_resources;
2834} 3302}
2835 3303
2836sub cfg_load { 3304sub reload_config {
2837 open my $fh, "<:utf8", "$CONFDIR/config" 3305 open my $fh, "<:utf8", "$CONFDIR/config"
2838 or return; 3306 or return;
2839 3307
2840 local $/; 3308 local $/;
2841 *CFG = YAML::Syck::Load <$fh>; 3309 *CFG = YAML::Syck::Load <$fh>;
2857sub main { 3325sub main {
2858 # we must not ever block the main coroutine 3326 # we must not ever block the main coroutine
2859 local $Coro::idle = sub { 3327 local $Coro::idle = sub {
2860 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2861 (async { 3329 (async {
2862 Event::one_event; 3330 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT;
2863 })->prio (Coro::PRIO_MAX); 3332 })->prio (Coro::PRIO_MAX);
2864 }; 3333 };
2865 3334
2866 cfg_load; 3335 reload_config;
2867 db_init; 3336 db_init;
2868 load_extensions; 3337 load_extensions;
2869 3338
2870 $TICK_WATCHER->start; 3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2871 Event::loop; 3341 EV::loop;
2872} 3342}
2873 3343
2874############################################################################# 3344#############################################################################
2875# initialisation and cleanup 3345# initialisation and cleanup
2876 3346
2877# install some emergency cleanup handlers 3347# install some emergency cleanup handlers
2878BEGIN { 3348BEGIN {
3349 our %SIGWATCHER = ();
2879 for my $signal (qw(INT HUP TERM)) { 3350 for my $signal (qw(INT HUP TERM)) {
2880 Event->signal ( 3351 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2881 reentrant => 0,
2882 data => WF_AUTOCANCEL,
2883 signal => $signal,
2884 prio => 0,
2885 cb => sub {
2886 cf::cleanup "SIG$signal"; 3352 cf::cleanup "SIG$signal";
2887 },
2888 ); 3353 };
2889 } 3354 }
2890} 3355}
2891 3356
2892sub write_runtime { 3357sub write_runtime {
2893 my $runtime = "$LOCALDIR/runtime"; 3358 my $runtime = "$LOCALDIR/runtime";
2938 # and maps saved/destroyed asynchronously. 3403 # and maps saved/destroyed asynchronously.
2939 warn "begin emergency player save\n"; 3404 warn "begin emergency player save\n";
2940 for my $login (keys %cf::PLAYER) { 3405 for my $login (keys %cf::PLAYER) {
2941 my $pl = $cf::PLAYER{$login} or next; 3406 my $pl = $cf::PLAYER{$login} or next;
2942 $pl->valid or next; 3407 $pl->valid or next;
3408 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2943 $pl->save; 3409 $pl->save;
2944 } 3410 }
2945 warn "end emergency player save\n"; 3411 warn "end emergency player save\n";
2946 3412
2947 warn "begin emergency map save\n"; 3413 warn "begin emergency map save\n";
2986 warn "syncing database to disk"; 3452 warn "syncing database to disk";
2987 BDB::db_env_txn_checkpoint $DB_ENV; 3453 BDB::db_env_txn_checkpoint $DB_ENV;
2988 3454
2989 # if anything goes wrong in here, we should simply crash as we already saved 3455 # if anything goes wrong in here, we should simply crash as we already saved
2990 3456
2991 warn "cancelling all WF_AUTOCANCEL watchers";
2992 for (Event::all_watchers) {
2993 $_->cancel if $_->data & WF_AUTOCANCEL;
2994 }
2995
2996 warn "flushing outstanding aio requests"; 3457 warn "flushing outstanding aio requests";
2997 for (;;) { 3458 for (;;) {
2998 BDB::flush; 3459 BDB::flush;
2999 IO::AIO::flush; 3460 IO::AIO::flush;
3000 Coro::cede; 3461 Coro::cede_notself;
3001 last unless IO::AIO::nreqs || BDB::nreqs; 3462 last unless IO::AIO::nreqs || BDB::nreqs;
3002 warn "iterate..."; 3463 warn "iterate...";
3003 } 3464 }
3004 3465
3005 ++$RELOAD; 3466 ++$RELOAD;
3064 warn "reloading cf.pm"; 3525 warn "reloading cf.pm";
3065 require cf; 3526 require cf;
3066 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3527 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3067 3528
3068 warn "loading config and database again"; 3529 warn "loading config and database again";
3069 cf::cfg_load; 3530 cf::reload_config;
3070 3531
3071 warn "loading extensions"; 3532 warn "loading extensions";
3072 cf::load_extensions; 3533 cf::load_extensions;
3073 3534
3074 warn "reattaching attachments to objects/players"; 3535 warn "reattaching attachments to objects/players";
3094 3555
3095sub reload_perl() { 3556sub reload_perl() {
3096 # doing reload synchronously and two reloads happen back-to-back, 3557 # doing reload synchronously and two reloads happen back-to-back,
3097 # coro crashes during coro_state_free->destroy here. 3558 # coro crashes during coro_state_free->destroy here.
3098 3559
3099 $RELOAD_WATCHER ||= Event->timer ( 3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3100 reentrant => 0,
3101 after => 0,
3102 data => WF_AUTOCANCEL,
3103 cb => sub {
3104 do_reload_perl;
3105 undef $RELOAD_WATCHER; 3561 undef $RELOAD_WATCHER;
3106 }, 3562 do_reload_perl;
3107 ); 3563 };
3108} 3564}
3109 3565
3110register_command "reload" => sub { 3566register_command "reload" => sub {
3111 my ($who, $arg) = @_; 3567 my ($who, $arg) = @_;
3112 3568
3113 if ($who->flag (FLAG_WIZ)) { 3569 if ($who->flag (FLAG_WIZ)) {
3114 $who->message ("reloading server."); 3570 $who->message ("reloading server.");
3571 async {
3572 $Coro::current->{desc} = "perl_reload";
3115 async { reload_perl }; 3573 reload_perl;
3574 };
3116 } 3575 }
3117}; 3576};
3118 3577
3119unshift @INC, $LIBDIR; 3578unshift @INC, $LIBDIR;
3120 3579
3139 my $signal = new Coro::Signal; 3598 my $signal = new Coro::Signal;
3140 push @WAIT_FOR_TICK_BEGIN, $signal; 3599 push @WAIT_FOR_TICK_BEGIN, $signal;
3141 $signal->wait; 3600 $signal->wait;
3142} 3601}
3143 3602
3144 my $min = 1e6;#d# 3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3145 my $avg = 10;
3146$TICK_WATCHER = Event->timer (
3147 reentrant => 0,
3148 parked => 1,
3149 prio => 0,
3150 at => $NEXT_TICK || $TICK,
3151 data => WF_AUTOCANCEL,
3152 cb => sub {
3153 if ($Coro::current != $Coro::main) { 3604 if ($Coro::current != $Coro::main) {
3154 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3155 unless ++$bug_warning > 10; 3606 unless ++$bug_warning > 10;
3156 return; 3607 return;
3157 } 3608 }
3158 3609
3159 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = EV::now;
3160 3611
3161 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3162 3613
3163 0 && sync_job {#d# 3614 $RUNTIME += $TICK;
3164 for(1..10) { 3615 $NEXT_TICK = $_[0]->at;
3165 my $t = Event::time;
3166 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3167 or die;
3168 3616
3169 $map->width (50); 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3170 $map->height (50); 3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3171 $map->alloc; 3619 Coro::async_pool {
3172 $map->_load_objects ("/tmp/x.map", 1); 3620 $Coro::current->{desc} = "runtime saver";
3173 my $t = Event::time - $t; 3621 write_runtime
3174 3622 or warn "ERROR: unable to write runtime file: $!";
3175 #next unless $t < 0.0013;#d#
3176 if ($t < $min) {
3177 $min = $t;
3178 }
3179 $avg = $avg * 0.99 + $t * 0.01;
3180 }
3181 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3182 exit 0;
3183 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3184 }; 3623 };
3624 }
3185 3625
3186 $RUNTIME += $TICK;
3187 $NEXT_TICK += $TICK;
3188
3189 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3190 $NEXT_RUNTIME_WRITE = $NOW + 10;
3191 Coro::async_pool {
3192 write_runtime
3193 or warn "ERROR: unable to write runtime file: $!";
3194 };
3195 }
3196
3197# my $AFTER = Event::time;
3198# warn $AFTER - $NOW;#d#
3199
3200 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3201 $sig->send; 3627 $sig->send;
3202 } 3628 }
3203 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3204 $sig->send; 3630 $sig->send;
3205 } 3631 }
3206 3632
3207 $NOW = Event::time;
3208
3209 # if we are delayed by four ticks or more, skip them all
3210 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3211
3212 $TICK_WATCHER->at ($NEXT_TICK);
3213 $TICK_WATCHER->start;
3214
3215 $LOAD = ($NOW - $tick_start) / $TICK; 3633 $LOAD = ($NOW - $tick_start) / $TICK;
3216 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3217 3635
3218 _post_tick; 3636 _post_tick;
3219 3637};
3220 3638$TICK_WATCHER->priority (EV::MAXPRI);
3221 },
3222);
3223 3639
3224{ 3640{
3225 BDB::max_poll_time $TICK * 0.1; 3641 # configure BDB
3226 $BDB_POLL_WATCHER = Event->io ( 3642
3227 reentrant => 0,
3228 fd => BDB::poll_fileno,
3229 poll => 'r',
3230 prio => 0,
3231 data => WF_AUTOCANCEL,
3232 cb => \&BDB::poll_cb,
3233 );
3234 BDB::min_parallel 8; 3643 BDB::min_parallel 8;
3235 3644 BDB::max_poll_reqs $TICK * 0.1;
3236 BDB::set_sync_prepare { 3645 $Coro::BDB::WATCHER->priority (1);
3237 my $status;
3238 my $current = $Coro::current;
3239 (
3240 sub {
3241 $status = $!;
3242 $current->ready; undef $current;
3243 },
3244 sub {
3245 Coro::schedule while defined $current;
3246 $! = $status;
3247 },
3248 )
3249 };
3250 3646
3251 unless ($DB_ENV) { 3647 unless ($DB_ENV) {
3252 $DB_ENV = BDB::db_env_create; 3648 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3650 | BDB::LOG_AUTOREMOVE, 1);
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3253 3653
3254 cf::sync_job { 3654 cf::sync_job {
3255 eval { 3655 eval {
3256 BDB::db_env_open 3656 BDB::db_env_open
3257 $DB_ENV, 3657 $DB_ENV,
3259 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3659 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3260 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3660 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3261 0666; 3661 0666;
3262 3662
3263 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3663 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3264
3265 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3266 $DB_ENV->set_lk_detect;
3267 }; 3664 };
3268 3665
3269 cf::cleanup "db_env_open(db): $@" if $@; 3666 cf::cleanup "db_env_open(db): $@" if $@;
3270 }; 3667 };
3271 } 3668 }
3669
3670 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3671 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3672 };
3673 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3674 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3675 };
3676 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3677 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3678 };
3272} 3679}
3273 3680
3274{ 3681{
3682 # configure IO::AIO
3683
3275 IO::AIO::min_parallel 8; 3684 IO::AIO::min_parallel 8;
3276
3277 undef $Coro::AIO::WATCHER;
3278 IO::AIO::max_poll_time $TICK * 0.1; 3685 IO::AIO::max_poll_time $TICK * 0.1;
3279 $AIO_POLL_WATCHER = Event->io ( 3686 $Coro::AIO::WATCHER->priority (1);
3280 reentrant => 0,
3281 data => WF_AUTOCANCEL,
3282 fd => IO::AIO::poll_fileno,
3283 poll => 'r',
3284 prio => 6,
3285 cb => \&IO::AIO::poll_cb,
3286 );
3287} 3687}
3288 3688
3289my $_log_backtrace; 3689my $_log_backtrace;
3290 3690
3291sub _log_backtrace { 3691sub _log_backtrace {
3295 3695
3296 # limit the # of concurrent backtraces 3696 # limit the # of concurrent backtraces
3297 if ($_log_backtrace < 2) { 3697 if ($_log_backtrace < 2) {
3298 ++$_log_backtrace; 3698 ++$_log_backtrace;
3299 async { 3699 async {
3700 $Coro::current->{desc} = "abt $msg";
3701
3300 my @bt = fork_call { 3702 my @bt = fork_call {
3301 @addr = map { sprintf "%x", $_ } @addr; 3703 @addr = map { sprintf "%x", $_ } @addr;
3302 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3704 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3303 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3705 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3304 or die "addr2line: $!"; 3706 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines