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.258 by root, Sat Apr 21 17:43:42 2007 UTC vs.
Revision 1.261 by root, Fri Apr 27 20:09:48 2007 UTC

1862} 1862}
1863 1863
1864sub cf::object::player::enter_link { 1864sub cf::object::player::enter_link {
1865 my ($self) = @_; 1865 my ($self) = @_;
1866 1866
1867 $self->activate_recursive; 1867 $self->deactivate_recursive;
1868 1868
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1869 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 1870
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 1872 if $self->map;
2923 prio => 6, 2923 prio => 6,
2924 cb => \&IO::AIO::poll_cb, 2924 cb => \&IO::AIO::poll_cb,
2925 ); 2925 );
2926} 2926}
2927 2927
2928sub _log_backtrace {
2929 my ($msg, @addr) = @_;
2930
2931 async {
2932 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr;
2934 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2935 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2936 or die "addr2line: $!";
2937
2938 my @funcs;
2939 my @res = <$fh>;
2940 chomp for @res;
2941 while (@res) {
2942 my ($func, $line) = splice @res, 0, 2, ();
2943 push @funcs, "[$func] $line";
2944 }
2945
2946 @funcs
2947 };
2948
2949 $msg =~ s/\n//;
2950
2951 LOG llevInfo, "[ABT] $msg\n";
2952 LOG llevInfo, "[ABT] $_\n" for @bt;
2953 };
2954}
2955
2928# load additional modules 2956# load additional modules
2929use cf::pod; 2957use cf::pod;
2930 2958
2931END { cf::emergency_save } 2959END { cf::emergency_save }
2932 2960

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines