[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC vs.
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC

    $coro
 }
 sub write_runtime {
+   my $runtime = "$LOCALDIR/runtime";
+   # first touch the runtime file to show we are still running:
+   # the fsync below can take a very very long time.
+   warn "touching runtime...\n";#d#
+   if (my $fh = aio_open $runtime, O_WRONLY, 0) {
+      utime undef, undef, $fh;
+   }
    my $guard = cf::lock_acquire "write_runtime";
-   my $runtime = "$LOCALDIR/runtime";
+   warn "starting to write runtime...\n";#d#
    my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
       or return;
    my $value = $cf::RUNTIME + 90 + 10;
    # 10 is the runtime save interval, for a monotonic clock
    # always fsync - this file is important
    aio_fsync $fh
       and return;
+   # touch it again to show we are up-to-date
+   utime undef, undef, $fh;
    close $fh
       or return;
    aio_rename "$runtime~", $runtime
       and return;
+   warn "... done writing runtime.\n";#d#
    1
 }
 =item cf::datalog type => key => value, ...
 }
 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]
       if $self->map;
       die $$res unless "ARRAY" eq ref $res;
       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) };
          syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
       };
       prio      => 6,
       cb        => \&IO::AIO::poll_cb,
    );
 }
+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;
 END { cf::emergency_save }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC vs. Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC vs.
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC