stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8320503: Print warning if VM reaches MallocLimit during error reporting

Browse Source 
Reviewed-by: jsjolen
This commit is contained in:
Thomas Stuefe 2024-03-15 12:25:22 +00:00
parent dde519dc21
commit 80b98c86b8
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/hotspot/share/nmt/mallocTracker.cpp
View File

@ -42,6 +42,7 @@
#include "utilities/debug.hpp"
#include "utilities/ostream.hpp"
#include "utilities/vmError.hpp"
#include "utilities/globalDefinitions.hpp"
MallocMemorySnapshot MallocMemorySummary::_snapshot;
@ -101,15 +102,21 @@ void MallocMemorySummary::initialize() {
bool MallocMemorySummary::total_limit_reached(size_t s, size_t so_far, const malloclimit* limit) {
// Ignore the limit break during error reporting to prevent secondary errors.
if (VMError::is_error_reported()) {
return false;
}
#define FORMATTED \
"MallocLimit: reached global limit (triggering allocation size: " PROPERFMT ", allocated so far: " PROPERFMT ", limit: " PROPERFMT ") ", \
PROPERFMTARGS(s), PROPERFMTARGS(so_far), PROPERFMTARGS(limit->sz)
// If we hit the limit during error reporting, we print a short warning but otherwise ignore it.
// We don't want to risk recursive assertion or torn hs-err logs.
if (VMError::is_error_reported()) {
// Print warning, but only the first n times to avoid flooding output.
static int stopafter = 10;
if (stopafter-- > 0) {
log_warning(nmt)(FORMATTED);
}
return false;
}
if (limit->mode == MallocLimitMode::trigger_fatal) {
fatal(FORMATTED);
} else {
@ -122,15 +129,21 @@ bool MallocMemorySummary::total_limit_reached(size_t s, size_t so_far, const mal
bool MallocMemorySummary::category_limit_reached(MEMFLAGS f, size_t s, size_t so_far, const malloclimit* limit) {
// Ignore the limit break during error reporting to prevent secondary errors.
if (VMError::is_error_reported()) {
return false;
}
#define FORMATTED \
"MallocLimit: reached category \"%s\" limit (triggering allocation size: " PROPERFMT ", allocated so far: " PROPERFMT ", limit: " PROPERFMT ") ", \
NMTUtil::flag_to_enum_name(f), PROPERFMTARGS(s), PROPERFMTARGS(so_far), PROPERFMTARGS(limit->sz)
// If we hit the limit during error reporting, we print a short warning but otherwise ignore it.
// We don't want to risk recursive assertion or torn hs-err logs.
if (VMError::is_error_reported()) {
// Print warning, but only the first n times to avoid flooding output.
static int stopafter = 10;
if (stopafter-- > 0) {
log_warning(nmt)(FORMATTED);
}
return false;
}
if (limit->mode == MallocLimitMode::trigger_fatal) {
fatal(FORMATTED);
} else {