From b17c01d01e694e20bd801d9ea4e3ec76cedae34b Mon Sep 17 00:00:00 2001 From: Lin Hu Date: Fri, 15 Jun 2018 12:00:11 -0400 Subject: [PATCH] Support both numa affinity and numa interleave memory independently - enable VMEM_NUMA_INTERLEAVE_MEM base on -XX:+/-InterleaveMemory options(default is -XX:-InterleaveMemory) - InterleaveMemory option would not affect NUMA affinity settings Signed-off-by: Lin Hu --- runtime/oti/j9port.h | 1 + runtime/vm/jvminit.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/oti/j9port.h b/runtime/oti/j9port.h index 2cc78bc8c2e..c6a5b29ced7 100644 --- a/runtime/oti/j9port.h +++ b/runtime/oti/j9port.h @@ -682,6 +682,7 @@ typedef struct J9CacheInfoQuery { #define J9PORT_CTLDATA_TRACE_STOP OMRPORT_CTLDATA_TRACE_STOP #define J9PORT_CTLDATA_VMEM_NUMA_IN_USE OMRPORT_CTLDATA_VMEM_NUMA_IN_USE #define J9PORT_CTLDATA_VMEM_NUMA_ENABLE OMRPORT_CTLDATA_VMEM_NUMA_ENABLE +#define J9PORT_CTLDATA_VMEM_NUMA_INTERLEAVE_MEM OMRPORT_CTLDATA_VMEM_NUMA_INTERLEAVE_MEM #define J9PORT_CTLDATA_SYSLOG_OPEN OMRPORT_CTLDATA_SYSLOG_OPEN #define J9PORT_CTLDATA_SYSLOG_CLOSE OMRPORT_CTLDATA_SYSLOG_CLOSE #define J9PORT_CTLDATA_NOIPT OMRPORT_CTLDATA_NOIPT diff --git a/runtime/vm/jvminit.c b/runtime/vm/jvminit.c index f6d4836933d..86d0efbf689 100644 --- a/runtime/vm/jvminit.c +++ b/runtime/vm/jvminit.c @@ -1528,8 +1528,7 @@ processMemoryInterleaveOptions(J9JavaVM * vm) { enabled = TRUE; } } - j9port_control(J9PORT_CTLDATA_VMEM_NUMA_ENABLE, enabled? 1 : 0); - omrthread_numa_set_enabled(enabled); + j9port_control(J9PORT_CTLDATA_VMEM_NUMA_INTERLEAVE_MEM, enabled? 1 : 0); } static VMINLINE void