--- deliantra/server/lib/cf.pm	2007/04/21 17:34:24	1.257
+++ deliantra/server/lib/cf.pm	2007/04/28 05:55:55	1.262
@@ -1864,6 +1864,8 @@
 sub cf::object::player::enter_link {
    my ($self) = @_;
 
+   $self->deactivate_recursive;
+
    return if UNIVERSAL::isa $self->map, "ext::map_link";
 
    $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
@@ -2435,9 +2437,10 @@
 
       return wantarray ? @$res : $res->[-1];
    } else {
+      reset_signals;
       local $SIG{__WARN__};
+      local $SIG{__DIE__};
       eval {
-         local $SIG{__DIE__};
          close $fh1;
 
          my @res = eval { $cb->(@args) };
@@ -2923,6 +2926,44 @@
    );
 }
 
+my $_log_backtrace;
+
+sub _log_backtrace {
+   my ($msg, @addr) = @_;
+
+   $msg =~ s/\n//;
+
+   # limit the # of concurrent backtraces
+   if ($_log_backtrace < 2) {
+      ++$_log_backtrace;
+      async {
+         my @bt = fork_call {
+            @addr = map { sprintf "%x", $_ } @addr;
+            my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
+            open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
+               or die "addr2line: $!";
+
+            my @funcs;
+            my @res = <$fh>;
+            chomp for @res;
+            while (@res) {
+               my ($func, $line) = splice @res, 0, 2, ();
+               push @funcs, "[$func] $line";
+            }
+
+            @funcs
+         };
+
+         LOG llevInfo, "[ABT] $msg\n";
+         LOG llevInfo, "[ABT] $_\n" for @bt;
+         --$_log_backtrace;
+      };
+   } else {
+      LOG llevInfo, "[ABT] $msg\n";
+      LOG llevInfo, "[ABT] [suppressed]\n";
+   }
+}
+
 # load additional modules
 use cf::pod;