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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 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;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
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::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS 2.01 ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
38# 38#
39$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 42
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
47 45
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
80our $NEXT_TICK; 78our $NEXT_TICK;
81our $NOW; 79our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 91our $RUNTIME;
91 92
92our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
95 96
96# used to convert map paths into valid unix filenames by replacing / by ∕ 97# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 99
159 160
160The raw value load value from the last tick. 161The raw value load value from the last tick.
161 162
162=item %cf::CFG 163=item %cf::CFG
163 164
164Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 166from wherever your confdir points to.
166 167
167=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
168 169
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 188 $msg .= "\n"
188 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
189 190
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 192
192 utf8::encode $msg;
193 LOG llevError, $msg; 193 LOG llevError, $msg;
194 }; 194 };
195} 195}
196 196
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
213)) { 213)) {
214 no strict 'refs'; 214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 216}
217 217
218$Event::DIED = sub { 218$EV::DIED = sub {
219 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
220}; 220};
221 221
222############################################################################# 222#############################################################################
223 223
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 247 $d
248 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
249} 249}
250 250
251=item $ref = cf::from_json $json 251=item $ref = cf::decode_json $json
252 252
253Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
254 254
255=item $json = cf::to_json $ref 255=item $json = cf::encode_json $ref
256 256
257Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258 258
259=cut 259=cut
260 260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 262
263sub to_json ($) { $json_coder->encode ($_[0]) } 263sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 264sub decode_json($) { $json_coder->decode ($_[0]) }
265 265
266=item cf::lock_wait $string 266=item cf::lock_wait $string
267 267
268Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
269 269
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
282Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
283 286
284=cut 287=cut
285 288
286our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
287 291
288sub lock_wait($) { 292sub lock_wait($) {
289 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
290 299
291 # wait for lock, if any 300 # wait for lock, if any
292 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 303 Coro::schedule;
300 309
301 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
302 lock_wait $key; 311 lock_wait $key;
303 312
304 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
305 315
306 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
309 } 320 }
310} 321}
311 322
323 }; 334 };
324 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
325 $guard 336 $guard
326} 337}
327 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
328=item cf::get_slot $time[, $priority[, $name]] 354=item cf::get_slot $time[, $priority[, $name]]
329 355
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 356Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds 357This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede. 358of cpu time till the next tick. The slot is only valid till the next cede.
341our @SLOT_QUEUE; 367our @SLOT_QUEUE;
342our $SLOT_QUEUE; 368our $SLOT_QUEUE;
343 369
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
346 my $signal = new Coro::Signal; 374 my $signal = new Coro::Signal;
347 375
348 while () { 376 while () {
349 next_job: 377 next_job:
350 my $avail = cf::till_tick; 378 my $avail = cf::till_tick;
358 } 386 }
359 } 387 }
360 } 388 }
361 389
362 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 393 $signal->wait;
366 } else { 394 } else {
367 Coro::schedule; 395 Coro::schedule;
368 } 396 }
391 419
392BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
393 421
394=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
395 423
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 427acceptable.
400 428
401If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
407 435
408sub sync_job(&) { 436sub sync_job(&) {
409 my ($job) = @_; 437 my ($job) = @_;
410 438
411 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 440 my $time = EV::time;
413 441
414 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
416 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
417 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 448 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
420 450
421 my $busy = 1; 451 my $busy = 1;
422 my @res; 452 my @res;
423 453
424 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 456 @res = eval { $job->() };
426 warn $@ if $@; 457 warn $@ if $@;
427 undef $busy; 458 undef $busy;
428 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
429 460
430 while ($busy) { 461 while ($busy) {
431 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
432 } 466 }
467 }
433 468
434 $time = Event::time - $time; 469 $time = EV::time - $time;
435 470
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438 473
439 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
469=item fork_call { }, $args 504=item fork_call { }, $args
470 505
471Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
475 510
476=cut 511=cut
477 512
478sub fork_call(&@) { 513sub fork_call(&@) {
479 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
480 515
481 # we seemingly have to make a local copy of the whole thing, 516 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 517 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 518 # TODO: investigate and fix (likely this will be rather laborious)
484 519
485 my @res = Coro::Util::fork_eval { 520 my @res = Coro::Util::fork_eval {
486 reset_signals; 521 reset_signals;
487 &$cb 522 &$cb
488 }, @args; 523 }, @args;
497=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
498 533
499Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
502=cut 542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
503 560
504our $DB; 561our $DB;
505 562
506sub db_init { 563sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 564 cf::sync_job {
511 eval { 565 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 566 };
521} 567}
522 568
523sub db_get($$) { 569sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
525 571
575 if (1) { 621 if (1) {
576 $md5 = 622 $md5 =
577 join "\x00", 623 join "\x00",
578 $processversion, 624 $processversion,
579 map { 625 map {
580 Coro::cede; 626 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 628 } 0.. $#$src;
583 629
584 630
585 my $dbmd5 = db_get cache => "$id/md5"; 631 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
631 677
632In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 680Deliantra).
635 681
636=over 4 682=over 4
637 683
638=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
639 685
937 983
938=cut 984=cut
939 985
940############################################################################# 986#############################################################################
941# object support 987# object support
942#
943 988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
944sub _can_merge { 1022sub _can_merge {
945 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
946 1024
947 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1026
951 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
952} 1029}
953 1030
954sub reattach { 1031sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1033 my ($obj) = @_;
978cf::attachable->attach ( 1055cf::attachable->attach (
979 prio => -1000000, 1056 prio => -1000000,
980 on_instantiate => sub { 1057 on_instantiate => sub {
981 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
982 1059
983 $data = from_json $data; 1060 $data = decode_json $data;
984 1061
985 for (@$data) { 1062 for (@$data) {
986 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
987 1064
988 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1081sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
1006 1083
1007 sync_job { 1084 sync_job {
1008 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
1011 1089
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1094 close $fh;
1017 1095
1018 if (@$objs) { 1096 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1102 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1104 }
1034 } 1112 }
1035 } else { 1113 } else {
1036 aio_unlink $filename; 1114 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1038 } 1116 }
1039 } 1117 };
1040} 1118}
1041 1119
1042sub object_freezer_as_string { 1120sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1044 1122
1056 or return; 1134 or return;
1057 1135
1058 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1138 or return;
1139
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1062 } 1142 }
1063 1143
1144 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
1066 return ($data, $av); 1148 ($data, $av)
1067} 1149}
1068 1150
1069=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
1070 1152
1071=over 4 1153=over 4
1257 1339
1258=head3 cf::player 1340=head3 cf::player
1259 1341
1260=over 4 1342=over 4
1261 1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
1357
1262=item cf::player::find $login 1358=item cf::player::find $login
1263 1359
1264Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1265 1361
1266=cut 1362=cut
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1401
1306 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1403 or return;
1404
1405 my $pl = cf::player::load_pl $f
1406 or return;
1407 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1309 } 1410 }
1310 } 1411 }
1311} 1412}
1312 1413
1322 1423
1323 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1325 1426
1326 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1327 Coro::cede; 1428 cf::cede_to_tick;
1328} 1429}
1329 1430
1330sub new($) { 1431sub new($) {
1331 my ($login) = @_; 1432 my ($login) = @_;
1332 1433
1410 or return []; 1511 or return [];
1411 1512
1412 my @logins; 1513 my @logins;
1413 1514
1414 for my $login (@$dirs) { 1515 for my $login (@$dirs) {
1516 my $path = path $login;
1517
1518 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1418 1524
1419 utf8::decode $login; 1525 utf8::decode $login;
1420 push @logins, $login; 1526 push @logins, $login;
1421 } 1527 }
1422 1528
1455 1561
1456Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1457 1563
1458=cut 1564=cut
1459 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1460sub expand_cfpod { 1577sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1462 1579
1463 # escape & and < 1580 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1581
1467 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1468 1585
1469 1 while 1586 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1591 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1592 <
1476 $self->gender ? $2 : $1 1593 (?:
1477 }ge 1594 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1595 | < $interior >
1479 || s{H<([^\>]*)>} 1596 )
1597 >
1598 %gcsx
1480 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1619 "")
1484 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1486 1631
1632 for ($xml) {
1487 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1489 1635
1490 # compress some whitespace 1636 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1495 1642
1496 $_ 1643 $xml
1497} 1644}
1645
1646no re 'eval';
1498 1647
1499sub hintmode { 1648sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1650 $_[0]{hintmode}
1502} 1651}
1746 1895
1747sub load_header_from($) { 1896sub load_header_from($) {
1748 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1749 1898
1750 utf8::encode $path; 1899 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1901 or return;
1902
1903 $self->_load_header ($f)
1904 or return;
1905
1906 local $MAP_LOADING{$self->{path}} = $self;
1907 $f->resolve_delayed_derefs;
1756 1908
1757 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1758 1910
1759 1 1911 1
1760} 1912}
1814sub find { 1966sub find {
1815 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1816 1968
1817 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1818 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1820 1973
1821 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1823 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1824 or return; 1979 or return;
1825 1980
1826 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1827 1982
1829 or return; 1984 or return;
1830 1985
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1834 $map->reset; 1991 $map->reset;
1835 undef $guard;
1836 return find $path; 1992 return find $path;
1837 } 1993 }
1838 1994
1839 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1840 } 1996 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1850 2006
1851 my $path = $self->{path}; 2007 my $path = $self->{path};
1852 2008
1853 { 2009 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1855 2011
2012 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2014
1858 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1859 2016
1860 $self->alloc; 2017 $self->alloc;
1861 2018
1862 $self->pre_load; 2019 $self->pre_load;
1863 Coro::cede; 2020 cf::cede_to_tick;
1864 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1866 or return; 2025 or return;
1867 2026
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1870 2029
1871 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2031 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2034 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1876 } 2038 }
1877 } 2039 }
1878 2040
1879 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1880 # now do the right thing for maps 2044 # now do the right thing for maps
1881 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2047 unless $self->difficulty;
1884 Coro::cede; 2048 cf::cede_to_tick;
1885 2049
1886 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2051 $self->decay_objects;
1888 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1889 $self->update_buttons; 2053 $self->update_buttons;
1890 Coro::cede; 2054 cf::cede_to_tick;
1891 $self->set_darkness_map; 2055 $self->set_darkness_map;
1892 Coro::cede; 2056 cf::cede_to_tick;
1893 $self->activate; 2057 $self->activate;
1894 } 2058 }
1895 2059
1896 $self->{last_save} = $cf::RUNTIME; 2060 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2061 $self->last_access ($cf::RUNTIME);
1968 } 2132 }
1969 2133
1970 $MAP_PREFETCH{$path} |= $load; 2134 $MAP_PREFETCH{$path} |= $load;
1971 2135
1972 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1973 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2141 if (my $map = find $k) {
1976 $map->load if $v; 2142 $map->load if $v;
1977 } 2143 }
1987} 2153}
1988 2154
1989sub save { 2155sub save {
1990 my ($self) = @_; 2156 my ($self) = @_;
1991 2157
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2159
1994 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1995 2161
1996 return unless $self->dirty; 2162 return unless $self->dirty;
1997 2163
2003 return if $self->{deny_save}; 2169 return if $self->{deny_save};
2004 2170
2005 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
2006 2172
2007 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
2009 }; 2176 };
2010 2177
2011 if ($uniq) { 2178 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2020 my ($self) = @_; 2187 my ($self) = @_;
2021 2188
2022 # save first because save cedes 2189 # save first because save cedes
2023 $self->save; 2190 $self->save;
2024 2191
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2193
2027 return if $self->players; 2194 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2196 return if $self->{deny_save};
2030 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2202 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2203}
2034 2204
2035sub reset_at { 2205sub reset_at {
2036 my ($self) = @_; 2206 my ($self) = @_;
2037 2207
2069 if $uniq; 2239 if $uniq;
2070 } 2240 }
2071 2241
2072 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
2073 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2246 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2247
2078 $self->unlink_save; 2248 $self->unlink_save;
2079 $self->destroy; 2249 $self->destroy;
2080} 2250}
2081 2251
2082my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
2083 2253
2084sub nuke { 2254sub nuke {
2085 my ($self) = @_; 2255 my ($self) = @_;
2086 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
2087 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
2088 2261
2089 $self->unlink_save; 2262 $self->unlink_save;
2090 2263
2091 bless $self, "cf::map"; 2264 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2269
2097 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
2098 2272
2099 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
2100} 2274}
2101 2275
2102=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
2178 2352
2179sub inv_recursive { 2353sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2181} 2355}
2182 2356
2357=item $ref = $ob->ref
2358
2359creates and returns a persistent reference to an objetc that can be stored as a string.
2360
2361=item $ob = cf::object::deref ($refstring)
2362
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block.
2365
2366=cut
2367
2368sub deref {
2369 my ($ref) = @_;
2370
2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2372 my ($uuid, $name) = ($1, $2);
2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2374 or return;
2375 $pl->ob->uuid eq $uuid
2376 or return;
2377
2378 $pl->ob
2379 } else {
2380 warn "$ref: cannot resolve object reference\n";
2381 undef
2382 }
2383}
2384
2183package cf; 2385package cf;
2184 2386
2185=back 2387=back
2186 2388
2187=head3 cf::object::player 2389=head3 cf::object::player
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2548
2347 $self->enter_link; 2549 $self->enter_link;
2348 2550
2349 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2350 my $map = eval { 2573 my $map = eval {
2351 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2352 2575
2353 if ($map) { 2576 if ($map) {
2354 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2356 } else { 2579 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2581 }
2359 2582
2360 $map 2583 $map
2361 }; 2584 };
2362 2585
2415 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2416 } 2639 }
2417 2640
2418 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2419 2642
2420 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2421 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2423 2646
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2452 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2455 2678
2456 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2457 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2683 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2460 2685
2461 1; 2686 1;
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2498 2723
2499=cut 2724=cut
2500 2725
2726# non-persistent channels (usually the info channel)
2727our %CHANNEL = (
2728 "c/identify" => {
2729 id => "infobox",
2730 title => "Identify",
2731 reply => undef,
2732 tooltip => "Items recently identified",
2733 },
2734 "c/examine" => {
2735 id => "infobox",
2736 title => "Examine",
2737 reply => undef,
2738 tooltip => "Signs and other items you examined",
2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2776);
2777
2501sub cf::client::send_msg { 2778sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2780
2504 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2505 2782
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2784
2785 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2508 if (ref $channel) { 2794 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2513 } 2800 }
2514 2801
2515 $channel = $channel->{id}; 2802 $channel = $channel->{id};
2516 } 2803 }
2517 2804
2558=cut 2845=cut
2559 2846
2560sub cf::client::ext_msg($$@) { 2847sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2848 my ($self, $type, @msg) = @_;
2562 2849
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2850 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2852 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2853 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2855 }
2571} 2856}
2572 2857
2579sub cf::client::ext_reply($$@) { 2864sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2865 my ($self, $id, @msg) = @_;
2581 2866
2582 if ($self->extcmd == 2) { 2867 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2869 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2870 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2871 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2873 }
2589} 2874}
2731=pod 3016=pod
2732 3017
2733The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2734 3019
2735 cf::object 3020 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3021 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 3022 insert remove name archname title slaying race decrease_ob_nr
2738 3023
2739 cf::object::player 3024 cf::object::player
2740 player 3025 player
2741 3026
2748=cut 3033=cut
2749 3034
2750for ( 3035for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 3037 insert remove inv name archname title slaying race
2753 decrease_ob_nr)], 3038 decrease_ob_nr destroy)],
2754 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2757) { 3042) {
2758 no strict 'refs'; 3043 no strict 'refs';
2834# the server's init and main functions 3119# the server's init and main functions
2835 3120
2836sub load_facedata($) { 3121sub load_facedata($) {
2837 my ($path) = @_; 3122 my ($path) = @_;
2838 3123
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
2839 my $enc = JSON::XS->new->utf8->canonical; 3128 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3129
2841 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2842 3131
2843 my $facedata; 3132 my $facedata;
2844 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2954 $ns->fx_want ($k, $v); 3243 $ns->fx_want ($k, $v);
2955 } 3244 }
2956}; 3245};
2957 3246
2958sub reload_regions { 3247sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
2959 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
2961 3254
2962 for (cf::region::list) { 3255 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3256 $_->{match} = qr/$_->{match}/
2999 3292
3000sub init { 3293sub init {
3001 reload_resources; 3294 reload_resources;
3002} 3295}
3003 3296
3004sub cfg_load { 3297sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3299 or return;
3007 3300
3008 local $/; 3301 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
3025sub main { 3318sub main {
3026 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3322 (async {
3030 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
3032 }; 3326 };
3033 3327
3034 cfg_load; 3328 reload_config;
3035 db_init; 3329 db_init;
3036 load_extensions; 3330 load_extensions;
3037 3331
3038 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3039 Event::loop; 3334 EV::loop;
3040} 3335}
3041 3336
3042############################################################################# 3337#############################################################################
3043# initialisation and cleanup 3338# initialisation and cleanup
3044 3339
3045# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
3046BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
3055 },
3056 ); 3346 };
3057 } 3347 }
3058} 3348}
3059 3349
3060sub write_runtime { 3350sub write_runtime {
3061 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
3106 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3402 $pl->save;
3112 } 3403 }
3113 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3114 3405
3115 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
3154 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3156 3447
3157 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
3158 3449
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3165 for (;;) { 3451 for (;;) {
3166 BDB::flush; 3452 BDB::flush;
3167 IO::AIO::flush; 3453 IO::AIO::flush;
3168 Coro::cede; 3454 Coro::cede_notself;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3170 warn "iterate..."; 3456 warn "iterate...";
3171 } 3457 }
3172 3458
3173 ++$RELOAD; 3459 ++$RELOAD;
3232 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
3233 require cf; 3519 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3521
3236 warn "loading config and database again"; 3522 warn "loading config and database again";
3237 cf::cfg_load; 3523 cf::reload_config;
3238 3524
3239 warn "loading extensions"; 3525 warn "loading extensions";
3240 cf::load_extensions; 3526 cf::load_extensions;
3241 3527
3242 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
3262 3548
3263sub reload_perl() { 3549sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3266 3552
3267 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3268 reentrant => 0,
3269 after => 0,
3270 data => WF_AUTOCANCEL,
3271 cb => sub {
3272 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3274 }, 3555 do_reload_perl;
3275 ); 3556 };
3276} 3557}
3277 3558
3278register_command "reload" => sub { 3559register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3280 3561
3281 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3566 reload_perl;
3567 };
3284 } 3568 }
3285}; 3569};
3286 3570
3287unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3288 3572
3307 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3593 $signal->wait;
3310} 3594}
3311 3595
3312 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3322 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3323 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3324 return; 3600 return;
3325 } 3601 }
3326 3602
3327 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3328 3604
3329 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3330 3606
3331 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3332 for(1..10) { 3608 $NEXT_TICK += $TICK;
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336 3609
3337 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3338 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3339 $map->alloc; 3612 Coro::async_pool {
3340 $map->_load_objects ("/tmp/x.map", 1); 3613 $Coro::current->{desc} = "runtime saver";
3341 my $t = Event::time - $t; 3614 write_runtime
3342 3615 or warn "ERROR: unable to write runtime file: $!";
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 3616 };
3617 }
3353 3618
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3620 $sig->send;
3370 } 3621 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3623 $sig->send;
3373 } 3624 }
3374 3625
3375 $NOW = Event::time;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3628
3386 _post_tick; 3629 _post_tick;
3387 3630};
3388 3631$TICK_WATCHER->priority (EV::MAXPRI);
3389 },
3390);
3391 3632
3392{ 3633{
3634 BDB::min_parallel 8;
3393 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3394 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8;
3403 3637
3404 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3405 my $status; 3639 my $status;
3406 my $current = $Coro::current; 3640 my $current = $Coro::current;
3407 ( 3641 (
3416 ) 3650 )
3417 }; 3651 };
3418 3652
3419 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 3659
3422 cf::sync_job { 3660 cf::sync_job {
3423 eval { 3661 eval {
3424 BDB::db_env_open 3662 BDB::db_env_open
3425 $DB_ENV, 3663 $DB_ENV,
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3667 0666;
3430 3668
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3670 };
3436 3671
3437 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3673 };
3439 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3440} 3685}
3441 3686
3442{ 3687{
3443 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3444 3689
3445 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 3693}
3456 3694
3457my $_log_backtrace; 3695my $_log_backtrace;
3458 3696
3459sub _log_backtrace { 3697sub _log_backtrace {
3463 3701
3464 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3704 ++$_log_backtrace;
3467 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3468 my @bt = fork_call { 3708 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines