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

6799919: Recursive calls to report_vm_out_of_memory are handled incorrectly

Browse source 
Report_vm_out_of_memory() should allow VMError.report_and_die() to handle multiple out of native memory errors.

Reviewed-by: dcubed, dholmes, coleenp, acorn
This commit is contained in:
Ron Durbin 2013-02-20 19:36:25 -08:00 • committed by Daniel D. Daugherty
parent 2f3d1da4f6
commit 9ff6dfb849
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hotspot/src/share/vm/utilities/debug.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -228,28 +228,16 @@ void report_fatal(const char* file, int line, const char* message)
report_vm_error(file, line, "fatal error", message); report_vm_error(file, line, "fatal error", message);
} }
// Used by report_vm_out_of_memory to detect recursion.
static jint _exiting_out_of_mem = 0;
void report_vm_out_of_memory(const char* file, int line, size_t size, void report_vm_out_of_memory(const char* file, int line, size_t size,
const char* message) { const char* message) {
if (Debugging) return; if (Debugging) return;
// We try to gather additional information for the first out of memory Thread* thread = ThreadLocalStorage::get_thread_slow();
// error only; gathering additional data might cause an allocation and a VMError(thread, file, line, size, message).report_and_die();
// recursive out_of_memory condition.
const jint exiting = 1; // The UseOSErrorReporting option in report_and_die() may allow a return
// If we succeed in changing the value, we're the first one in. // to here. If so then we'll have to figure out how to handle it.
bool first_time_here = Atomic::xchg(exiting, &_exiting_out_of_mem) != exiting; guarantee(false, "report_and_die() should not return here");
if (first_time_here) {
Thread* thread = ThreadLocalStorage::get_thread_slow();
VMError(thread, file, line, size, message).report_and_die();
}
// Dump core and abort
vm_abort(true);
} }
void report_should_not_call(const char* file, int line) { void report_should_not_call(const char* file, int line) {