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.261 by root, Fri Apr 27 20:09:48 2007 UTC vs.
Revision 1.286 by root, Sun Jun 24 04:27:20 2007 UTC

90our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
91 91
92# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
95binmode STDOUT; 99binmode STDOUT;
96binmode STDERR; 100binmode STDERR;
97 101
98# read virtual server time, if available 102# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
139 143
140=item $cf::TICK 144=item $cf::TICK
141 145
142The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
143 147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
157
144=item %cf::CFG 158=item %cf::CFG
145 159
146Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 161from wherever your confdir points to.
148 162
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 194
180# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 196# within the Safe compartment.
182for my $pkg (qw( 197for my $pkg (qw(
183 cf::global cf::attachable 198 cf::global cf::attachable
191} 206}
192 207
193$Event::DIED = sub { 208$Event::DIED = sub {
194 warn "error in event callback: @_"; 209 warn "error in event callback: @_";
195}; 210};
211
212#############################################################################
196 213
197=head2 UTILITY FUNCTIONS 214=head2 UTILITY FUNCTIONS
198 215
199=over 4 216=over 4
200 217
303 320
304BEGIN { *async = \&Coro::async_pool } 321BEGIN { *async = \&Coro::async_pool }
305 322
306=item cf::sync_job { BLOCK } 323=item cf::sync_job { BLOCK }
307 324
308The design of crossfire+ requires that the main coro ($Coro::main) is 325The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 326is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable.
311 329
312If it must be done, put the blocking parts into C<sync_job>. This will run 330If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 331the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 332server will be frozen during this time, so the block should either finish
315fast or be very important. 333fast or be very important.
318 336
319sub sync_job(&) { 337sub sync_job(&) {
320 my ($job) = @_; 338 my ($job) = @_;
321 339
322 if ($Coro::current == $Coro::main) { 340 if ($Coro::current == $Coro::main) {
341 my $time = Event::time;
342
323 # this is the main coro, too bad, we have to block 343 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 344 # till the operation succeeds, freezing the server :/
325 345
326 # TODO: use suspend/resume instead 346 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 347 # (but this is cancel-safe)
338 358
339 while ($busy) { 359 while ($busy) {
340 Coro::cede or Event::one_event; 360 Coro::cede or Event::one_event;
341 } 361 }
342 362
363 $time = Event::time - $time;
364
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load
369
343 wantarray ? @res : $res[0] 370 wantarray ? @res : $res[0]
344 } else { 371 } else {
345 # we are in another coroutine, how wonderful, everything just works 372 # we are in another coroutine, how wonderful, everything just works
346 373
347 $job->() 374 $job->()
366 $EXT_CORO{$coro+0} = $coro; 393 $EXT_CORO{$coro+0} = $coro;
367 394
368 $coro 395 $coro
369} 396}
370 397
371sub write_runtime { 398=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 399
374 my $runtime = "$LOCALDIR/runtime"; 400Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling.
375 404
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405=cut
377 or return;
378 406
379 my $value = $cf::RUNTIME + 90 + 10; 407sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 408 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 409
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
384 and return; 411# or die "socketpair: $!";
412 pipe my $fh1, my $fh2
413 or die "pipe: $!";
385 414
386 # always fsync - this file is important 415 if (my $pid = fork) {
387 aio_fsync $fh
388 and return;
389
390 close $fh 416 close $fh2;
391 or return;
392 417
393 aio_rename "$runtime~", $runtime 418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
394 and return; 419 $res = Coro::Storable::thaw $res;
395 420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals;
428 local $SIG{__WARN__};
429 local $SIG{__DIE__};
430 eval {
431 close $fh1;
432
433 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
396 1 439 }
440}
441
442=item $value = cf::db_get $family => $key
443
444Returns a single value from the environment database.
445
446=item cf::db_put $family => $key => $value
447
448Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450
451=cut
452
453our $DB;
454
455sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job {
460 eval {
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 }
470}
471
472sub db_get($$) {
473 my $key = "$_[0]/$_[1]";
474
475 cf::sync_job {
476 BDB::db_get $DB, undef, $key, my $data;
477
478 $! ? ()
479 : $data
480 }
481}
482
483sub db_put($$$) {
484 BDB::dbreq_pri 4;
485 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
486}
487
488=item cf::cache $id => [$paths...], $processversion => $process
489
490Generic caching function that returns the value of the resource $id,
491caching and regenerating as required.
492
493This function can block.
494
495=cut
496
497sub cache {
498 my ($id, $src, $processversion, $process) = @_;
499
500 my $meta =
501 join "\x00",
502 $processversion,
503 map {
504 aio_stat $_
505 and Carp::croak "$_: $!";
506
507 ($_, (stat _)[7,9])
508 } @$src;
509
510 my $dbmeta = db_get cache => "$id/meta";
511 if ($dbmeta ne $meta) {
512 # changed, we may need to process
513
514 my @data;
515 my $md5;
516
517 for (0 .. $#$src) {
518 0 <= aio_load $src->[$_], $data[$_]
519 or Carp::croak "$src->[$_]: $!";
520 }
521
522 # if processing is expensive, check
523 # checksum first
524 if (1) {
525 $md5 =
526 join "\x00",
527 $processversion,
528 map {
529 Coro::cede;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src;
532
533
534 my $dbmd5 = db_get cache => "$id/md5";
535 if ($dbmd5 eq $md5) {
536 db_put cache => "$id/meta", $meta;
537
538 return db_get cache => "$id/data";
539 }
540 }
541
542 my $t1 = Time::HiRes::time;
543 my $data = $process->(\@data);
544 my $t2 = Time::HiRes::time;
545
546 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
547
548 db_put cache => "$id/data", $data;
549 db_put cache => "$id/md5" , $md5;
550 db_put cache => "$id/meta", $meta;
551
552 return $data;
553 }
554
555 db_get cache => "$id/data"
397} 556}
398 557
399=item cf::datalog type => key => value, ... 558=item cf::datalog type => key => value, ...
400 559
401Log a datalog packet of the given type with the given key-value pairs. 560Log a datalog packet of the given type with the given key-value pairs.
419attach callbacks/event handlers (a collection of which is called an "attachment") 578attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 579to it. All such attachable objects support the following methods.
421 580
422In the following description, CLASS can be any of C<global>, C<object> 581In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 582C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 583Crossfire TRT).
425 584
426=over 4 585=over 4
427 586
428=item $attachable->attach ($attachment, key => $value...) 587=item $attachable->attach ($attachment, key => $value...)
429 588
592 $registry = $CB_TYPE[$object_type] ||= []; 751 $registry = $CB_TYPE[$object_type] ||= [];
593 752
594 } elsif ($type eq "subtype") { 753 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 754 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 755 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 756 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 757
599 } elsif ($type eq "package") { 758 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 759 my $pkg = shift @arg;
601 760
602 while (my ($name, $id) = each %cb_id) { 761 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 790 _attach $registry, $klass, @attach;
632 } 791 }
633 792
634 $obj->{$name} = \%arg; 793 $obj->{$name} = \%arg;
635 } else { 794 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 795 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 796 }
638 797
639 $obj->{_attachment}{$name} = undef; 798 $obj->{_attachment}{$name} = undef;
640} 799}
641 800
643 if (ref $_[0]) { 802 if (ref $_[0]) {
644 _object_attach @_; 803 _object_attach @_;
645 } else { 804 } else {
646 _attach shift->_attach_registry, @_; 805 _attach shift->_attach_registry, @_;
647 } 806 }
807 _recalc_want;
648}; 808};
649 809
650# all those should be optimised 810# all those should be optimised
651sub cf::attachable::detach { 811sub cf::attachable::detach {
652 my ($obj, $name) = @_; 812 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 815 delete $obj->{_attachment}{$name};
656 reattach ($obj); 816 reattach ($obj);
657 } else { 817 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 818 Carp::croak "cannot, currently, detach class attachments";
659 } 819 }
820 _recalc_want;
660}; 821};
661 822
662sub cf::attachable::attached { 823sub cf::attachable::attached {
663 my ($obj, $name) = @_; 824 my ($obj, $name) = @_;
664 825
837 or return; 998 or return;
838 $av = eval { (Storable::thaw $av)->{objs} }; 999 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1000 }
840 1001
841 warn sprintf "loading %s (%d)\n", 1002 warn sprintf "loading %s (%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1003 $filename, length $data, scalar @{$av || []};
843 return ($data, $av); 1004 return ($data, $av);
844} 1005}
1006
1007=head2 COMMAND CALLBACKS
1008
1009=over 4
1010
1011=cut
845 1012
846############################################################################# 1013#############################################################################
847# command handling &c 1014# command handling &c
848 1015
849=item cf::register_command $name => \&callback($ob,$args); 1016=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1029 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1030}
864 1031
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1032=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1033
867Register a callbackf ro execution when the client sends an extcmd packet. 1034Register a callback fro execution when the client sends an extcmd packet.
868 1035
869If the callback returns something, it is sent back as if reply was being 1036If the callback returns something, it is sent back as if reply was being
870called. 1037called.
871 1038
872=cut 1039=cut
907 1074
908 cf::override; 1075 cf::override;
909 }, 1076 },
910); 1077);
911 1078
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1079sub load_extensions {
1080 cf::sync_job {
1081 my %todo;
1082
947 for my $ext (<$LIBDIR/*.ext>) { 1083 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1084 next unless -r $path;
949 eval { 1085
950 load_extension $ext; 1086 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1087 my $base = $1;
1088 my $pkg = $1;
1089 $pkg =~ s/[^[:word:]]/_/g;
1090 $pkg = "ext::$pkg";
1091
1092 open my $fh, "<:utf8", $path
1093 or die "$path: $!";
1094
1095 my $source = do { local $/; <$fh> };
1096
1097 my %ext = (
1098 path => $path,
1099 base => $base,
1100 pkg => $pkg,
1101 );
1102
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105
1106 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n"
1109 . $source
1110 . "\n};\n1";
1111
1112 $todo{$base} = \%ext;
1113 }
1114
1115 my %done;
1116 while (%todo) {
1117 my $progress;
1118
1119 while (my ($k, $v) = each %todo) {
1120 for (split /,\s*/, $v->{meta}{depends}) {
1121 goto skip
1122 unless exists $done{$_};
1123 }
1124
1125 warn "... loading '$k' into '$v->{pkg}'\n";
1126
1127 unless (eval $v->{source}) {
1128 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n";
1130
1131 if (exists $v->{meta}{mandatory}) {
1132 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n";
1134 exit 1;
1135 }
1136
1137 warn $msg;
1138 }
1139
1140 $done{$k} = delete $todo{$k};
1141 push @EXTS, $v->{pkg};
1142 $progress = 1;
951 1 1143 }
952 } or warn "$ext not loaded: $@"; 1144
1145 skip:
1146 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1147 unless $progress;
1148 }
953 } 1149 };
954} 1150}
955 1151
956############################################################################# 1152#############################################################################
1153
1154=back
957 1155
958=head2 CORE EXTENSIONS 1156=head2 CORE EXTENSIONS
959 1157
960Functions and methods that extend core crossfire objects. 1158Functions and methods that extend core crossfire objects.
961 1159
1149 } 1347 }
1150 1348
1151 \@paths 1349 \@paths
1152} 1350}
1153 1351
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1353
1354Expand crossfire pod fragments into protocol xml.
1355
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1154=item $player->ext_reply ($msgid, %msg) 1385=item $player->ext_reply ($msgid, %msg)
1155 1386
1156Sends an ext reply to the player. 1387Sends an ext reply to the player.
1157 1388
1158=cut 1389=cut
1185 1416
1186package cf::region; 1417package cf::region;
1187 1418
1188=item cf::region::find_by_path $path 1419=item cf::region::find_by_path $path
1189 1420
1190Tries to decuce the probable region for a map knowing only its path. 1421Tries to decuce the likely region for a map knowing only its path.
1191 1422
1192=cut 1423=cut
1193 1424
1194sub find_by_path($) { 1425sub find_by_path($) {
1195 my ($path) = @_; 1426 my ($path) = @_;
1269 my ($self, $merge) = @_; 1500 my ($self, $merge) = @_;
1270 1501
1271 # we have to keep some variables in memory intact 1502 # we have to keep some variables in memory intact
1272 local $self->{path}; 1503 local $self->{path};
1273 local $self->{load_path}; 1504 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1505
1277 $self->SUPER::thawer_merge ($merge); 1506 $self->SUPER::thawer_merge ($merge);
1278} 1507}
1279 1508
1280sub normalise { 1509sub normalise {
1380 1609
1381 $_->change_map_light ($change) 1610 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1611 for grep $_->outdoor, values %cf::MAP;
1383} 1612}
1384 1613
1614sub decay_objects {
1615 my ($self) = @_;
1616
1617 return if $self->{deny_reset};
1618
1619 $self->do_decay_objects;
1620}
1621
1385sub unlink_save { 1622sub unlink_save {
1386 my ($self) = @_; 1623 my ($self) = @_;
1387 1624
1388 utf8::encode (my $save = $self->save_path); 1625 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1626 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1445 $self->load_header_orig 1682 $self->load_header_orig
1446 or return; 1683 or return;
1447 $self->prepare_orig; 1684 $self->prepare_orig;
1448 } 1685 }
1449 1686
1687 $self->{deny_reset} = 1
1688 if $self->no_reset;
1689
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1690 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1691 unless $self->default_region;
1452 1692
1453 1 1693 1
1454} 1694}
1469 $map->{last_save} = $cf::RUNTIME; 1709 $map->{last_save} = $cf::RUNTIME;
1470 1710
1471 $map->load_header 1711 $map->load_header
1472 or return; 1712 or return;
1473 1713
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1715 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1716 #$cf::WAIT_FOR_TICK->wait;
1477 $map->reset; 1717 $map->reset;
1478 undef $guard; 1718 undef $guard;
1479 return find $path; 1719 return find $path;
1546 my ($self, $ob) = @_; 1786 my ($self, $ob) = @_;
1547 1787
1548 return find "~" . $ob->name . "/" . $self->{path} 1788 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1789 if $self->per_player;
1550 1790
1791# return find "?party/" . $ob->name . "/" . $self->{path}
1792# if $self->per_party;
1793
1551 $self 1794 $self
1552} 1795}
1553 1796
1554# find and load all maps in the 3x3 area around a map 1797# find and load all maps in the 3x3 area around a map
1555sub load_diag { 1798sub load_diag {
1665 1908
1666sub reset_at { 1909sub reset_at {
1667 my ($self) = @_; 1910 my ($self) = @_;
1668 1911
1669 # TODO: safety, remove and allow resettable per-player maps 1912 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 1913 return 1e99 if $self->{deny_reset};
1672 1914
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1915 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1916 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 1917
1686 my ($self) = @_; 1928 my ($self) = @_;
1687 1929
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1930 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 1931
1690 return if $self->players; 1932 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 1933
1693 warn "resetting map ", $self->path;#d# 1934 warn "resetting map ", $self->path;
1694 1935
1695 $self->in_memory (cf::MAP_SWAPPED); 1936 $self->in_memory (cf::MAP_SWAPPED);
1696 1937
1697 # need to save uniques path 1938 # need to save uniques path
1698 unless ($self->{deny_save}) { 1939 unless ($self->{deny_save}) {
1730 $cf::MAP{$self->path} = $self; 1971 $cf::MAP{$self->path} = $self;
1731 1972
1732 $self->reset; # polite request, might not happen 1973 $self->reset; # polite request, might not happen
1733} 1974}
1734 1975
1976=item $maps = cf::map::tmp_maps
1977
1978Returns an arrayref with all map paths of currently instantiated and saved
1979maps. May block.
1980
1981=cut
1982
1983sub tmp_maps() {
1984 [
1985 map {
1986 utf8::decode $_;
1987 /\.map$/
1988 ? normalise $_
1989 : ()
1990 } @{ aio_readdir $TMPDIR or [] }
1991 ]
1992}
1993
1994=item $maps = cf::map::random_maps
1995
1996Returns an arrayref with all map paths of currently instantiated and saved
1997random maps. May block.
1998
1999=cut
2000
2001sub random_maps() {
2002 [
2003 map {
2004 utf8::decode $_;
2005 /\.map$/
2006 ? normalise "?random/$_"
2007 : ()
2008 } @{ aio_readdir $RANDOMDIR or [] }
2009 ]
2010}
2011
1735=item cf::map::unique_maps 2012=item cf::map::unique_maps
1736 2013
1737Returns an arrayref of paths of all shared maps that have 2014Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2015instantiated unique items. May block.
1739 2016
1740=cut 2017=cut
1741 2018
1742sub unique_maps() { 2019sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2020 [
1744 or return; 2021 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2022 utf8::decode $_;
1750 next if /\.pst$/; 2023 /\.map$/
1751 next unless /^$PATH_SEP/o; 2024 ? normalise $_
1752 2025 : ()
1753 push @paths, cf::map::normalise $_; 2026 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2027 ]
1755
1756 \@paths
1757} 2028}
1758 2029
1759package cf; 2030package cf;
1760 2031
1761=back 2032=back
1807 2078
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2079 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2080
1810 if ($self->{record_replies}) { 2081 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2082 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2083
1812 } else { 2084 } else {
2085 my $pl = $self->contr;
2086
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply (
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095
2096 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2097 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2098 $self->message ($msg, $flags);
2099 }
1815 } 2100 }
1816} 2101}
1817 2102
1818=item $player_object->may ("access") 2103=item $player_object->may ("access")
1819 2104
1867 $self->deactivate_recursive; 2152 $self->deactivate_recursive;
1868 2153
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2154 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2155
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2156 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2157 if $self->map && $self->map->{path} ne "{link}";
1873 2158
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2159 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2160}
1876 2161
1877sub cf::object::player::leave_link { 2162sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2163 my ($self, $map, $x, $y) = @_;
2164
2165 return unless $self->contr->active;
1879 2166
1880 my $link_pos = delete $self->{_link_pos}; 2167 my $link_pos = delete $self->{_link_pos};
1881 2168
1882 unless ($map) { 2169 unless ($map) {
1883 # restore original map position 2170 # restore original map position
1906 2193
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2195 $self->enter_map ($map, $x, $y);
1909} 2196}
1910 2197
1911cf::player->attach (
1912 on_logout => sub {
1913 my ($pl) = @_;
1914
1915 # abort map switching before logout
1916 if ($pl->ob->{_link_pos}) {
1917 cf::sync_job {
1918 $pl->ob->leave_link
1919 };
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924
1925 # try to abort aborted map switching on player login :)
1926 # should happen only on crashes
1927 if ($pl->ob->{_link_pos}) {
1928 $pl->ob->enter_link;
1929 (async {
1930 $pl->ob->reply (undef,
1931 "There was an internal problem at your last logout, "
1932 . "the server will try to bring you to your intended destination in a second.",
1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1936 Coro::Timer::sleep 1;
1937 $pl->ob->leave_link;
1938 })->prio (2);
1939 }
1940 },
1941);
1942
1943=item $player_object->goto ($path, $x, $y) 2198=item $player_object->goto ($path, $x, $y[, $check->($map)])
1944 2199
2200Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position.
2204
1945=cut 2205=cut
2206
2207our $GOTOGEN;
1946 2208
1947sub cf::object::player::goto { 2209sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2210 my ($self, $path, $x, $y, $check) = @_;
2211
2212 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2214
1950 $self->enter_link; 2215 $self->enter_link;
1951 2216
1952 (async { 2217 (async {
1953 my $map = eval { 2218 my $map = eval {
1954 my $map = cf::map::find $path; 2219 my $map = cf::map::find $path;
2220
2221 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2222 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map;
2224 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2226 }
2227
1956 $map 2228 $map
2229 };
2230
2231 if ($@) {
2232 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2233 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2234 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2235
2236 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2238 $self->leave_link ($map, $x, $y);
2239 }
1961 })->prio (1); 2240 })->prio (1);
1962} 2241}
1963 2242
1964=item $player_object->enter_exit ($exit_object) 2243=item $player_object->enter_exit ($exit_object)
1965 2244
2068sub cf::client::send_drawinfo { 2347sub cf::client::send_drawinfo {
2069 my ($self, $text, $flags) = @_; 2348 my ($self, $text, $flags) = @_;
2070 2349
2071 utf8::encode $text; 2350 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352}
2353
2354=item $client->send_msg ($color, $type, $msg, [extra...])
2355
2356Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet.
2360
2361=cut
2362
2363sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_;
2365
2366 $msg = $self->pl->expand_cfpod ($msg);
2367
2368 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else {
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg")
2387 }
2388 }
2389 }
2073} 2390}
2074 2391
2075=item $client->ext_event ($type, %msg) 2392=item $client->ext_event ($type, %msg)
2076 2393
2077Sends an exti event to the client. 2394Sends an exti event to the client.
2279=back 2596=back
2280 2597
2281=cut 2598=cut
2282 2599
2283############################################################################# 2600#############################################################################
2284
2285=head2 EXTENSION DATABASE SUPPORT
2286
2287Crossfire maintains a very simple database for extension use. It can
2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2289convert to/from binary).
2290
2291The parameter C<$family> should best start with the name of the extension
2292using it, it should be unique.
2293
2294=over 4
2295
2296=item $value = cf::db_get $family => $key
2297
2298Returns a single value from the database.
2299
2300=item cf::db_put $family => $key => $value
2301
2302Stores the given C<$value> in the family.
2303
2304=cut
2305
2306our $DB;
2307
2308sub db_init {
2309 unless ($DB) {
2310 $DB = BDB::db_create $DB_ENV;
2311
2312 cf::sync_job {
2313 eval {
2314 $DB->set_flags (BDB::CHKSUM);
2315
2316 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2318 cf::cleanup "db_open(db): $!" if $!;
2319 };
2320 cf::cleanup "db_open(db): $@" if $@;
2321 };
2322 }
2323}
2324
2325sub db_get($$) {
2326 my $key = "$_[0]/$_[1]";
2327
2328 cf::sync_job {
2329 BDB::db_get $DB, undef, $key, my $data;
2330
2331 $! ? ()
2332 : $data
2333 }
2334}
2335
2336sub db_put($$$) {
2337 BDB::dbreq_pri 4;
2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 local $SIG{__WARN__};
2441 eval {
2442 local $SIG{__DIE__};
2443 close $fh1;
2444
2445 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 };
2448
2449 warn $@ if $@;
2450 _exit 0;
2451 }
2452}
2453
2454
2455
2456#############################################################################
2457# the server's init and main functions 2601# the server's init and main functions
2458 2602
2459sub load_facedata($) { 2603sub load_facedata($) {
2460 my ($path) = @_; 2604 my ($path) = @_;
2461 2605
2531sub reload_resources { 2675sub reload_resources {
2532 warn "reloading resource files...\n"; 2676 warn "reloading resource files...\n";
2533 2677
2534 reload_regions; 2678 reload_regions;
2535 reload_facedata; 2679 reload_facedata;
2680 #reload_archetypes;#d#
2536 reload_archetypes; 2681 reload_archetypes;
2537 reload_treasures; 2682 reload_treasures;
2538 2683
2539 warn "finished reloading resource files\n"; 2684 warn "finished reloading resource files\n";
2540} 2685}
2597 }, 2742 },
2598 ); 2743 );
2599 } 2744 }
2600} 2745}
2601 2746
2747sub write_runtime {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time.
2752
2753 IO::AIO::aio_utime $runtime, undef, undef;
2754
2755 my $guard = cf::lock_acquire "write_runtime";
2756
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2758 or return;
2759
2760 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server.
2763
2764 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2765 and return;
2766
2767 # always fsync - this file is important
2768 aio_fsync $fh
2769 and return;
2770
2771 # touch it again to show we are up-to-date
2772 aio_utime $fh, undef, undef;
2773
2774 close $fh
2775 or return;
2776
2777 aio_rename "$runtime~", $runtime
2778 and return;
2779
2780 warn "runtime file written.\n";
2781
2782 1
2783}
2784
2602sub emergency_save() { 2785sub emergency_save() {
2603 my $freeze_guard = cf::freeze_mainloop; 2786 my $freeze_guard = cf::freeze_mainloop;
2604 2787
2605 warn "enter emergency perl save\n"; 2788 warn "enter emergency perl save\n";
2606 2789
2810 my $signal = new Coro::Signal; 2993 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 2994 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 2995 $signal->wait;
2813} 2996}
2814 2997
2998 my $min = 1e6;#d#
2999 my $avg = 10;
2815$TICK_WATCHER = Event->timer ( 3000$TICK_WATCHER = Event->timer (
2816 reentrant => 0, 3001 reentrant => 0,
2817 parked => 1, 3002 parked => 1,
2818 prio => 0, 3003 prio => 0,
2819 at => $NEXT_TICK || $TICK, 3004 at => $NEXT_TICK || $TICK,
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 3009 unless ++$bug_warning > 10;
2825 return; 3010 return;
2826 } 3011 }
2827 3012
2828 $NOW = Event::time; 3013 $NOW = $tick_start = Event::time;
2829 3014
2830 cf::server_tick; # one server iteration 3015 cf::server_tick; # one server iteration
3016
3017 0 && sync_job {#d#
3018 for(1..10) {
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 };
2831 3039
2832 $RUNTIME += $TICK; 3040 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 3041 $NEXT_TICK += $TICK;
2834 3042
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2841 } 3049 }
2842 3050
2843# my $AFTER = Event::time; 3051# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d# 3052# warn $AFTER - $NOW;#d#
2845 3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send;
3056 }
3057 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send;
3059 }
3060
3061 $NOW = Event::time;
3062
2846 # if we are delayed by four ticks or more, skip them all 3063 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2848 3065
2849 $TICK_WATCHER->at ($NEXT_TICK); 3066 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start; 3067 $TICK_WATCHER->start;
2851 3068
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3069 $LOAD = ($NOW - $tick_start) / $TICK;
2853 $sig->send; 3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2854 }
2855 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send;
2857 }
2858 3071
2859 _post_tick; 3072 _post_tick;
3073
3074
2860 }, 3075 },
2861); 3076);
2862 3077
2863{ 3078{
2864 BDB::max_poll_time $TICK * 0.1; 3079 BDB::max_poll_time $TICK * 0.1;
2923 prio => 6, 3138 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 3139 cb => \&IO::AIO::poll_cb,
2925 ); 3140 );
2926} 3141}
2927 3142
3143my $_log_backtrace;
3144
2928sub _log_backtrace { 3145sub _log_backtrace {
2929 my ($msg, @addr) = @_; 3146 my ($msg, @addr) = @_;
2930 3147
3148 $msg =~ s/\n//;
3149
3150 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace;
2931 async { 3153 async {
2932 my @bt = fork_call { 3154 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr; 3155 @addr = map { sprintf "%x", $_ } @addr;
2934 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2935 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2936 or die "addr2line: $!"; 3158 or die "addr2line: $!";
2937 3159
2938 my @funcs; 3160 my @funcs;
2939 my @res = <$fh>; 3161 my @res = <$fh>;
2940 chomp for @res; 3162 chomp for @res;
2941 while (@res) { 3163 while (@res) {
2942 my ($func, $line) = splice @res, 0, 2, (); 3164 my ($func, $line) = splice @res, 0, 2, ();
2943 push @funcs, "[$func] $line"; 3165 push @funcs, "[$func] $line";
3166 }
3167
3168 @funcs
2944 } 3169 };
2945 3170
2946 @funcs 3171 LOG llevInfo, "[ABT] $msg\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace;
2947 }; 3174 };
2948 3175 } else {
2949 $msg =~ s/\n//;
2950
2951 LOG llevInfo, "[ABT] $msg\n"; 3176 LOG llevInfo, "[ABT] $msg\n";
2952 LOG llevInfo, "[ABT] $_\n" for @bt; 3177 LOG llevInfo, "[ABT] [suppressed]\n";
2953 }; 3178 }
2954} 3179}
2955 3180
2956# load additional modules 3181# load additional modules
2957use cf::pod; 3182use cf::pod;
2958 3183

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines