OpenJDK / amber / amber
changeset 773:01daf7c809b1
6694099: Hotspot vm_exit_out_of_memory should dump core
Summary: This fix enables the generation of core file when process runs out of C-heap.
Reviewed-by: sbohne
| author | poonam |
|---|---|
| date | Sun, 22 Jun 2008 20:07:58 -0700 |
| parents | 96110c02b165 |
| children | e71318ea23e8 |
| files | hotspot/src/share/vm/prims/jni.cpp hotspot/src/share/vm/runtime/java.cpp hotspot/src/share/vm/runtime/java.hpp hotspot/src/share/vm/utilities/debug.cpp |
| diffstat | 4 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/prims/jni.cpp Tue Jun 17 13:08:15 2008 -0700 +++ b/hotspot/src/share/vm/prims/jni.cpp Sun Jun 22 20:07:58 2008 -0700 @@ -631,7 +631,7 @@ DTRACE_PROBE2(hotspot_jni, FatalError__entry, env, msg); tty->print_cr("FATAL ERROR in native method: %s", msg); thread->print_stack(); - os::abort(false); // Prevent core dump, causes a jck failure. + os::abort(); // Dump core and abort JNI_END
--- a/hotspot/src/share/vm/runtime/java.cpp Tue Jun 17 13:08:15 2008 -0700 +++ b/hotspot/src/share/vm/runtime/java.cpp Sun Jun 22 20:07:58 2008 -0700 @@ -502,9 +502,9 @@ os::shutdown(); } -void vm_abort() { +void vm_abort(bool dump_core) { vm_perform_shutdown_actions(); - os::abort(PRODUCT_ONLY(false)); + os::abort(dump_core); ShouldNotReachHere(); } @@ -538,18 +538,24 @@ java_lang_Throwable::print_stack_trace(exception(), tty); tty->cr(); vm_notify_during_shutdown(NULL, NULL); - vm_abort(); + + // Failure during initialization, we don't want to dump core + vm_abort(false); } void vm_exit_during_initialization(symbolHandle ex, const char* message) { ResourceMark rm; vm_notify_during_shutdown(ex->as_C_string(), message); - vm_abort(); + + // Failure during initialization, we don't want to dump core + vm_abort(false); } void vm_exit_during_initialization(const char* error, const char* message) { vm_notify_during_shutdown(error, message); - vm_abort(); + + // Failure during initialization, we don't want to dump core + vm_abort(false); } void vm_shutdown_during_initialization(const char* error, const char* message) {
--- a/hotspot/src/share/vm/runtime/java.hpp Tue Jun 17 13:08:15 2008 -0700 +++ b/hotspot/src/share/vm/runtime/java.hpp Sun Jun 22 20:07:58 2008 -0700 @@ -37,7 +37,7 @@ // Shutdown the VM but do not exit the process extern void vm_shutdown(); // Shutdown the VM and abort the process -extern void vm_abort(); +extern void vm_abort(bool dump_core=true); // Trigger any necessary notification of the VM being shutdown extern void notify_vm_shutdown();
--- a/hotspot/src/share/vm/utilities/debug.cpp Tue Jun 17 13:08:15 2008 -0700 +++ b/hotspot/src/share/vm/utilities/debug.cpp Sun Jun 22 20:07:58 2008 -0700 @@ -208,7 +208,9 @@ Thread* thread = ThreadLocalStorage::get_thread_slow(); VMError(thread, size, message, file_name, line_no).report_and_die(); } - vm_abort(); + + // Dump core and abort + vm_abort(true); } void report_vm_out_of_memory_vararg(const char* file_name, int line_no, size_t size, const char* format, ...) {