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

8209127: ZGC: Improve error message when failing to map memory for mark stacks

Browse Source 
Reviewed-by: eosterlund, tschatzl
This commit is contained in:
Per Lidén 2018-08-09 11:24:30 +02:00
parent abb1e458eb
commit f8590345b7
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/hotspot/share/gc/z/zMarkStack.cpp
View File

@ -56,22 +56,24 @@ bool ZMarkStackSpace::is_initialized() const {
return _top != 0;
}
bool ZMarkStackSpace::expand() {
void ZMarkStackSpace::expand() {
const size_t max = ZMarkStackSpaceStart + ZMarkStacksMax;
if (_end + ZMarkStackSpaceExpandSize > max) {
// Expansion limit reached
return false;
// Expansion limit reached. This is a fatal error since we
// currently can't recover from running out of mark stack space.
fatal("Mark stack overflow (current size " SIZE_FORMAT "M, max size " SIZE_FORMAT "M),"
" use -XX:ZMarkStacksMax=<size> to increase this limit",
(_end - ZMarkStackSpaceStart) / M, ZMarkStacksMax / M);
}
void* const res = mmap((void*)_end, ZMarkStackSpaceExpandSize,
PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE|MAP_FIXED, -1, 0);
if (res == MAP_FAILED) {
// Failed to map memory. This is a fatal error since we
// currently can't recover from running out of mark stack space.
ZErrno err;
log_error(gc, marking)("Failed to map memory for marking stacks (%s)", err.to_string());
return false;
fatal("Failed to map memory for marking stacks (%s)", err.to_string());
}
return true;
}
uintptr_t ZMarkStackSpace::alloc_space(size_t size) {
@ -105,14 +107,7 @@ uintptr_t ZMarkStackSpace::expand_and_alloc_space(size_t size) {
}
// Expand stack space
if (!expand()) {
// We currently can't handle the situation where we
// are running out of mark stack space.
fatal("Mark stack overflow (allocated " SIZE_FORMAT "M, size " SIZE_FORMAT "M, max " SIZE_FORMAT "M),"
" use -XX:ZMarkStacksMax=? to increase this limit",
(_end - ZMarkStackSpaceStart) / M, size / M, ZMarkStacksMax / M);
return 0;
}
expand();
log_debug(gc, marking)("Expanding mark stack space: " SIZE_FORMAT "M->" SIZE_FORMAT "M",
(_end - ZMarkStackSpaceStart) / M,

2
src/hotspot/share/gc/z/zMarkStack.hpp
View File

@ -79,7 +79,7 @@ private:
volatile uintptr_t _top;
volatile uintptr_t _end;
bool expand();
void expand();
uintptr_t alloc_space(size_t size);
uintptr_t expand_and_alloc_space(size_t size);