archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

6944503: Improved Zero crash dump

Browse source 
With Zero on a GC crash the stack was dumped differently to other crashes.

Reviewed-by: twisti
This commit is contained in:
Gary Benson 2010-04-19 02:13:06 -07:00 • committed by Christian Thalinger
parent 193be0b9eb
commit 5e6b418472
2 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

99
hotspot/src/share/vm/utilities/vmError.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2003-2010 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -212,6 +212,51 @@ char* VMError::error_string(char* buf, int buflen) {
return buf;
}
void VMError::print_stack_trace(outputStream* st, JavaThread* jt,
char* buf, int buflen, bool verbose) {
#ifdef ZERO
if (jt->zero_stack()->sp() && jt->top_zero_frame()) {
// StackFrameStream uses the frame anchor, which may not have
// been set up. This can be done at any time in Zero, however,
// so if it hasn't been set up then we just set it up now and
// clear it again when we're done.
bool has_last_Java_frame = jt->has_last_Java_frame();
if (!has_last_Java_frame)
jt->set_last_Java_frame();
st->print("Java frames:");
// If the top frame is a Shark frame and the frame anchor isn't
// set up then it's possible that the information in the frame
// is garbage: it could be from a previous decache, or it could
// simply have never been written. So we print a warning...
StackFrameStream sfs(jt);
if (!has_last_Java_frame && !sfs.is_done()) {
if (sfs.current()->zeroframe()->is_shark_frame()) {
st->print(" (TOP FRAME MAY BE JUNK)");
}
}
st->cr();
// Print the frames
for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
sfs.current()->zero_print_on_error(i, st, buf, buflen);
st->cr();
}
// Reset the frame anchor if necessary
if (!has_last_Java_frame)
jt->reset_last_Java_frame();
}
#else
if (jt->has_last_Java_frame()) {
st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
sfs.current()->print_on_error(st, buf, buflen, verbose);
st->cr();
}
}
#endif // ZERO
}
// This is the main function to report a fatal error. Only one thread can
// call this function, so we don't need to worry about MT-safety. But it's
@ -457,49 +502,7 @@ void VMError::report(outputStream* st) {
STEP(130, "(printing Java stack)" )
if (_verbose && _thread && _thread->is_Java_thread()) {
JavaThread* jt = (JavaThread*)_thread;
#ifdef ZERO
if (jt->zero_stack()->sp() && jt->top_zero_frame()) {
// StackFrameStream uses the frame anchor, which may not have
// been set up. This can be done at any time in Zero, however,
// so if it hasn't been set up then we just set it up now and
// clear it again when we're done.
bool has_last_Java_frame = jt->has_last_Java_frame();
if (!has_last_Java_frame)
jt->set_last_Java_frame();
st->print("Java frames:");
// If the top frame is a Shark frame and the frame anchor isn't
// set up then it's possible that the information in the frame
// is garbage: it could be from a previous decache, or it could
// simply have never been written. So we print a warning...
StackFrameStream sfs(jt);
if (!has_last_Java_frame && !sfs.is_done()) {
if (sfs.current()->zeroframe()->is_shark_frame()) {
st->print(" (TOP FRAME MAY BE JUNK)");
}
}
st->cr();
// Print the frames
for(int i = 0; !sfs.is_done(); sfs.next(), i++) {
sfs.current()->zero_print_on_error(i, st, buf, sizeof(buf));
st->cr();
}
// Reset the frame anchor if necessary
if (!has_last_Java_frame)
jt->reset_last_Java_frame();
}
#else
if (jt->has_last_Java_frame()) {
st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
sfs.current()->print_on_error(st, buf, sizeof(buf));
st->cr();
}
}
#endif // ZERO
print_stack_trace(st, (JavaThread*)_thread, buf, sizeof(buf));
}
STEP(135, "(printing target Java thread stack)" )
@ -509,13 +512,7 @@ void VMError::report(outputStream* st) {
JavaThread* jt = ((NamedThread *)_thread)->processed_thread();
if (jt != NULL) {
st->print_cr("JavaThread " PTR_FORMAT " (nid = " UINTX_FORMAT ") was being processed", jt, jt->osthread()->thread_id());
if (jt->has_last_Java_frame()) {
st->print_cr("Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)");
for(StackFrameStream sfs(jt); !sfs.is_done(); sfs.next()) {
sfs.current()->print_on_error(st, buf, sizeof(buf), true);
st->cr();
}
}
print_stack_trace(st, jt, buf, sizeof(buf), true);
}
}