Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #9732 from dnakamura/idle_heap
Remove use of J9VM_GC_IDLE_HEAP_MANAGER
  • Loading branch information
pshipton committed Jun 4, 2020
2 parents 0c1ef80 + 2533694 commit dc9a6dd
Show file tree
Hide file tree
Showing 32 changed files with 28 additions and 61 deletions.
8 changes: 0 additions & 8 deletions buildspecs/j9.flags
Expand Up @@ -424,14 +424,6 @@ all data is stored in their own region. It additionaly reduces footprint, mainly
<require flag="gc_modronGC"/>
</requires>
</flag>
<flag id="gc_idleHeapManager">
<description>Enable VM idle java heap management(decommit excess free java heap pages)</description>
<ifRemoved>GC on VM idle not supported</ifRemoved>
<requires>
<require flag="gc_modronGC"/>
<require flag="gc_generational"/>
</requires>
</flag>
<flag id="gc_inlinedAllocFields">
<description>Inlined allocation fields</description>
<ifRemoved>Inlined allocation fields not supported</ifRemoved>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_390-64.spec
Expand Up @@ -132,7 +132,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_sharedLibsUseGlobalTable" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_390-64_cmprssptrs.spec
Expand Up @@ -135,7 +135,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_sharedLibsUseGlobalTable" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_ppc-64.spec
Expand Up @@ -136,7 +136,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_sharedLibsUseGlobalTable" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_ppc-64_cmprssptrs.spec
Expand Up @@ -134,7 +134,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_sharedLibsUseGlobalTable" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_ppc-64_cmprssptrs_le.spec
Expand Up @@ -139,7 +139,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_sharedLibsUseGlobalTable" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_ppc-64_le.spec
Expand Up @@ -138,7 +138,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_sharedLibsUseGlobalTable" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
3 changes: 1 addition & 2 deletions buildspecs/linux_riscv64.spec
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2019 IBM Corp. and others
Copyright (c) 2019, 2020 IBM Corp. and others

This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -134,7 +134,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
3 changes: 1 addition & 2 deletions buildspecs/linux_riscv64_cmprssptrs.spec
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2019 IBM Corp. and others
Copyright (c) 2019, 2020 IBM Corp. and others

This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -134,7 +134,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
3 changes: 1 addition & 2 deletions buildspecs/linux_riscv64_cmprssptrs_cross.spec
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2019 IBM Corp. and others
Copyright (c) 2019, 2020 IBM Corp. and others

This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -135,7 +135,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
3 changes: 1 addition & 2 deletions buildspecs/linux_riscv64_cross.spec
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2019 IBM Corp. and others
Copyright (c) 2019, 2020 IBM Corp. and others

This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -135,7 +135,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_x86-64.spec
Expand Up @@ -139,7 +139,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_x86-64_cmprssptrs.spec
Expand Up @@ -136,7 +136,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_enableDoubleMap" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/linux_x86.spec
Expand Up @@ -149,7 +149,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="gc_alignObjects" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/osx_x86-64.spec
Expand Up @@ -137,7 +137,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion buildspecs/osx_x86-64_cmprssptrs.spec
Expand Up @@ -134,7 +134,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_littleEndian" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_tlhPrefetchFTA" value="true"/>
Expand Down
3 changes: 1 addition & 2 deletions buildspecs/zos_390-64.spec
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2019 IBM Corp. and others
Copyright (c) 2006, 2020 IBM Corp. and others

This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -130,7 +130,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_hasFPU" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_subpoolsAlias" value="true"/>
Expand Down
3 changes: 1 addition & 2 deletions buildspecs/zos_390-64_cmprssptrs.spec
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, 2019 IBM Corp. and others
Copyright (c) 2006, 2020 IBM Corp. and others

This program and the accompanying materials are made available under
the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -129,7 +129,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<flag id="env_hasFPU" value="true"/>
<flag id="gc_batchClearTLH" value="true"/>
<flag id="gc_debugAsserts" value="true"/>
<flag id="gc_idleHeapManager" value="true"/>
<flag id="gc_inlinedAllocFields" value="true"/>
<flag id="gc_minimumObjectSize" value="true"/>
<flag id="gc_subpoolsAlias" value="true"/>
Expand Down
1 change: 0 additions & 1 deletion runtime/cmake/caches/aix_ppc-64.cmake
Expand Up @@ -28,7 +28,6 @@ set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP OFF CACHE BOOL "")
set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")

set(J9VM_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")
set(J9VM_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
set(J9VM_GC_SUBPOOLS_ALIAS ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
Expand Down
4 changes: 2 additions & 2 deletions runtime/cmake/caches/linux_390-64.cmake
Expand Up @@ -28,12 +28,12 @@ set(J9VM_ENV_LITTLE_ENDIAN OFF CACHE BOOL "")
set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP ON CACHE BOOL "")
set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")

set(J9VM_GC_IDLE_HEAP_MANAGER ON CACHE BOOL "")

set(J9VM_PORT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
set(J9VM_JIT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
set(J9VM_JIT_TRANSACTION_DIAGNOSTIC_THREAD_BLOCK ON CACHE BOOL "")

set(OMR_GC_IDLE_HEAP_MANAGER ON CACHE BOOL "")

# Note: In CMake, 'set's on cache variables only apply if the cache variable
# is not already set. Thus any cache varaibles set in this file, override
# anything set in common.cmake
Expand Down
5 changes: 2 additions & 3 deletions runtime/cmake/caches/linux_ppc-64_le.cmake
Expand Up @@ -29,19 +29,18 @@ set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP ON CACHE BOOL "")
set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")
set(J9VM_ENV_USE_GCC ON CACHE BOOL "")

set(OMR_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")
set(OMR_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
set(J9VM_JIT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
set(J9VM_PORT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
set(J9VM_MODULE_CODEGEN_PPC ON CACHE BOOL "")
set(J9VM_MODULE_THRTRACE ON CACHE BOOL "")
set(J9VM_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")
set(J9VM_OPT_SWITCH_STACKS_FOR_SIGNAL_HANDLER OFF CACHE BOOL "")
set(J9VM_PORT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")

set(OMR_GC_IDLE_HEAP_MANAGER ON CACHE BOOL "")
set(OMR_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
set(OMR_PORT_NUMA_SUPPORT ON CACHE BOOL "")

include("${CMAKE_CURRENT_LIST_DIR}/linux.cmake")
Expand Down
1 change: 0 additions & 1 deletion runtime/cmake/caches/linux_x86-64.cmake
Expand Up @@ -32,7 +32,6 @@ set(J9VM_MODULE_CODERT_IA32 ON CACHE BOOL "")
set(J9VM_MODULE_JIT_IA32 ON CACHE BOOL "")
set(J9VM_MODULE_JITRT_IA32 ON CACHE BOOL "")
set(J9VM_MODULE_MASM2GAS ON CACHE BOOL "")
set(J9VM_GC_IDLE_HEAP_MANAGER ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")
Expand Down
1 change: 0 additions & 1 deletion runtime/cmake/caches/osx_x86-64.cmake
Expand Up @@ -25,7 +25,6 @@ set(J9VM_ENV_DATA64 ON CACHE BOOL "")
set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")

set(J9VM_GC_IDLE_HEAP_MANAGER ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")
Expand Down
2 changes: 0 additions & 2 deletions runtime/cmake/caches/win_x86-64.cmake
Expand Up @@ -25,8 +25,6 @@ set(J9VM_ENV_DATA64 ON CACHE BOOL "")
set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")

set(J9VM_ENV_HAS_FPU OFF CACHE INTERNAL "")
set(OMR_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")
set(J9VM_GC_IDLE_HEAP_MANAGER OFF CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")
Expand Down
1 change: 0 additions & 1 deletion runtime/cmake/options.cmake
Expand Up @@ -60,7 +60,6 @@ j9vm_shadowed_option(J9VM_GC_DEBUG_ASSERTS "Specialized GC assertions are used i
# become discontiguous whenever this flag is enabled. Since there won’t be any empty arraylet leaves, then arrayoid NULL pointers are no longer required since
# all data is stored in a unique region. It additionaly reduces footprint, mainly for JNI primitive array critical.
j9vm_shadowed_option(J9VM_GC_ENABLE_DOUBLE_MAP OMR_GC_DOUBLE_MAP_ARRAYLETS "Allows LINUX systems to double map arrays that are stored as arraylets.")
j9vm_shadowed_option(J9VM_GC_IDLE_HEAP_MANAGER "Enable VM idle java heap management(decommit excess free java heap pages)")
j9vm_shadowed_option(J9VM_GC_LARGE_OBJECT_AREA "Enable large object area (LOA) support")
j9vm_shadowed_option(J9VM_GC_LEAF_BITS "Add leaf bit instance descriptions to classes")
j9vm_shadowed_option(J9VM_GC_MINIMUM_OBJECT_SIZE "Guarantee a minimum size to all objects allocated")
Expand Down
12 changes: 6 additions & 6 deletions runtime/gc_base/GCExtensions.cpp
Expand Up @@ -32,9 +32,9 @@

#include "EnvironmentBase.hpp"
#include "Forge.hpp"
#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
#include "IdleGCManager.hpp"
#endif /* defined(J9VM_GC_IDLE_HEAP_MANAGER) */
#endif /* defined(OMR_GC_IDLE_HEAP_MANAGER) */
#include "MemorySpace.hpp"
#include "MemorySubSpace.hpp"
#include "ObjectModel.hpp"
Expand Down Expand Up @@ -124,7 +124,7 @@ MM_GCExtensions::initialize(MM_EnvironmentBase *env)
}
}

#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
/* absorbs GC specific idle tuning flags */
if (J9_IDLE_TUNING_GC_ON_IDLE == (getJavaVM()->vmRuntimeStateListener.idleTuningFlags & J9_IDLE_TUNING_GC_ON_IDLE)) {
gcOnIdle = true;
Expand All @@ -133,7 +133,7 @@ MM_GCExtensions::initialize(MM_EnvironmentBase *env)
compactOnIdle = true;
}
idleMinimumFree = getJavaVM()->vmRuntimeStateListener.idleMinFreeHeap;
#endif /* if defined(J9VM_GC_IDLE_HEAP_MANAGER) */
#endif /* if defined(OMR_GC_IDLE_HEAP_MANAGER) */

return true;

Expand Down Expand Up @@ -172,12 +172,12 @@ MM_GCExtensions::tearDown(MM_EnvironmentBase *env)
*tmpHookInterface = NULL; /* avoid issues with double teardowns */
}

#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
if (NULL != idleGCManager) {
idleGCManager->kill(env);
idleGCManager = NULL;
}
#endif /* defined(J9VM_GC_IDLE_HEAP_MANAGER) */
#endif /* defined(OMR_GC_IDLE_HEAP_MANAGER) */

MM_GCExtensionsBase::tearDown(env);
}
Expand Down
6 changes: 3 additions & 3 deletions runtime/gc_base/GCExtensions.hpp
Expand Up @@ -69,7 +69,7 @@ class GC_FinalizeListManager;
class MM_ReferenceObjectList;
#endif /* J9VM_GC_REALTIME */

#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
class MM_IdleGCManager;
#endif

Expand Down Expand Up @@ -180,7 +180,7 @@ class MM_GCExtensions : public MM_GCExtensionsBase {

bool _HeapManagementMXBeanBackCompatibilityEnabled;

#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
MM_IdleGCManager* idleGCManager; /**< Manager which registers for VM Runtime State notification & manages free heap on notification */
#endif

Expand Down Expand Up @@ -312,7 +312,7 @@ class MM_GCExtensions : public MM_GCExtensionsBase {
, _asyncCallbackKey(-1)
, _TLHAsyncCallbackKey(-1)
, _HeapManagementMXBeanBackCompatibilityEnabled(false)
#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
, idleGCManager(NULL)
#endif
, maxRAMPercent(0.0) /* this would get overwritten by user specified value */
Expand Down
6 changes: 3 additions & 3 deletions runtime/gc_base/IdleGCManager.cpp
@@ -1,6 +1,6 @@

/*******************************************************************************
* Copyright (c) 1991, 2014 IBM Corp. and others
* Copyright (c) 1991, 2020 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand All @@ -23,7 +23,7 @@

#include "j9.h"
#include "j9cfg.h"
#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
#include "j9protos.h"
#include "j9consts.h"
#include "vmhook_internal.h"
Expand Down Expand Up @@ -97,4 +97,4 @@ void idleGCManagerVMStateHook(J9HookInterface** hook, uintptr_t eventNum, void*
}
}
} /*end extern "C" */
#endif /* defined(J9VM_GC_IDLE_HEAP_MANAGER) */
#endif /* defined(OMR_GC_IDLE_HEAP_MANAGER) */
6 changes: 3 additions & 3 deletions runtime/gc_base/IdleGCManager.hpp
@@ -1,6 +1,6 @@

/*******************************************************************************
* Copyright (c) 1991, 2014 IBM Corp. and others
* Copyright (c) 1991, 2020 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -29,7 +29,7 @@
#define IDLERESOURCEMANAGERHPP_
#include "j9.h"
#include "j9cfg.h"
#if defined(J9VM_GC_IDLE_HEAP_MANAGER)
#if defined(OMR_GC_IDLE_HEAP_MANAGER)
#include "BaseNonVirtual.hpp"
#include "EnvironmentBase.hpp"
#include "GCExtensions.hpp"
Expand Down Expand Up @@ -90,5 +90,5 @@ class MM_IdleGCManager : public MM_BaseNonVirtual
_typeId = __FUNCTION__;
}
};
#endif /* defined(J9VM_GC_IDLE_HEAP_MANAGER) */
#endif /* defined(OMR_GC_IDLE_HEAP_MANAGER) */
#endif /* IDLERESOURCEMANAGERHPP_ */

0 comments on commit dc9a6dd

Please sign in to comment.