Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8079263: Suppress warning about disabling adaptive size policy when enabling UseLargePages with UseNUMA when adaptive size policy is disabled
authorredestad
Fri, 08 May 2015 15:41:39 +0200
changeset 30609 211c22831646
parent 30608 d79880a5cf2f
child 30610 d4f41f692503
8079263: Suppress warning about disabling adaptive size policy when enabling UseLargePages with UseNUMA when adaptive size policy is disabled Reviewed-by: jmasa, jwilhelm
hotspot/src/os/linux/vm/os_linux.cpp file | annotate | diff | comparison | revisions 
--- a/hotspot/src/os/linux/vm/os_linux.cpp	Fri May 08 10:30:16 2015 +0200
+++ b/hotspot/src/os/linux/vm/os_linux.cpp	Fri May 08 15:41:39 2015 +0200
@@ -4760,8 +4760,8 @@
             FLAG_IS_DEFAULT(UseSHM) &&
             FLAG_IS_DEFAULT(UseHugeTLBFS)) {
           UseLargePages = false;
-        } else {
-          warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing");
+        } else if (UseAdaptiveSizePolicy || UseAdaptiveNUMAChunkSizing) {
+          warning("UseNUMA is not fully compatible with SHM/HugeTLBFS large pages, disabling adaptive resizing (-XX:-UseAdaptiveSizePolicy -XX:-UseAdaptiveNUMAChunkSizing)");
           UseAdaptiveSizePolicy = false;
           UseAdaptiveNUMAChunkSizing = false;
         }
jdk-sandbox