Skip to content

Commit f2587d9

Browse files
committed
8354938: ZGC: Disable UseNUMA when ZFakeNUMA is used
Reviewed-by: aboldtch, jsikstro
1 parent 0f1c448 commit f2587d9

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/hotspot/share/gc/z/zArguments.cpp

+13-3
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,19 @@ void ZArguments::select_max_gc_threads() {
121121
void ZArguments::initialize() {
122122
GCArguments::initialize();
123123

124-
// Enable NUMA by default
125-
if (FLAG_IS_DEFAULT(UseNUMA) && FLAG_IS_DEFAULT(ZFakeNUMA)) {
126-
FLAG_SET_DEFAULT(UseNUMA, true);
124+
// NUMA settings
125+
if (FLAG_IS_DEFAULT(ZFakeNUMA)) {
126+
// Enable NUMA by default
127+
if (FLAG_IS_DEFAULT(UseNUMA)) {
128+
FLAG_SET_DEFAULT(UseNUMA, true);
129+
}
130+
} else {
131+
if (UseNUMA) {
132+
if (!FLAG_IS_DEFAULT(UseNUMA)) {
133+
warning("ZFakeNUMA is enabled; turning off UseNUMA");
134+
}
135+
FLAG_SET_ERGO(UseNUMA, false);
136+
}
127137
}
128138

129139
select_max_gc_threads();

0 commit comments

Comments
 (0)