archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8191862: Warn about UseNUMA/UseLargePages only when using ParallelGC

Browse source 
Reviewed-by: stefank, sjohanss
This commit is contained in:
Per Lidén 2017-11-27 13:34:00 +01:00
parent 9771e4daa7
commit 1e7b0b326d
1 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/hotspot/os/linux/os_linux.cpp
View file

@ -4948,25 +4948,20 @@ jint os::init_2(void) {
UseNUMA = false; UseNUMA = false;
} }
} }
if (UseParallelGC && UseNUMA && UseLargePages && !can_commit_large_page_memory()) {
// With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way // With SHM and HugeTLBFS large pages we cannot uncommit a page, so there's no way
// we can make the adaptive lgrp chunk resizing work. If the user specified // we can make the adaptive lgrp chunk resizing work. If the user specified both
// both UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn and // UseNUMA and UseLargePages (or UseSHM/UseHugeTLBFS) on the command line - warn
// disable adaptive resizing. // and disable adaptive resizing.
if (UseNUMA && UseLargePages && !can_commit_large_page_memory()) { if (UseAdaptiveSizePolicy || UseAdaptiveNUMAChunkSizing) {
if (FLAG_IS_DEFAULT(UseNUMA)) { warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, "
UseNUMA = false; "disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
} else {
if (FLAG_IS_DEFAULT(UseLargePages) &&
FLAG_IS_DEFAULT(UseSHM) &&
FLAG_IS_DEFAULT(UseHugeTLBFS)) {
UseLargePages = false;
} else if (UseAdaptiveSizePolicy || UseAdaptiveNUMAChunkSizing) {
warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
UseAdaptiveSizePolicy = false; UseAdaptiveSizePolicy = false;
UseAdaptiveNUMAChunkSizing = false; UseAdaptiveNUMAChunkSizing = false;
} }
} }
}
if (!UseNUMA && ForceNUMA) { if (!UseNUMA && ForceNUMA) {
UseNUMA = true; UseNUMA = true;
} }