Fixes eclipse-openj9#8020

`heapReconfigured` API changes resulting from eclipse-omr/omr#4716 Signed-off-by: Salman Rana <salman.rana@ibm.com>
RSalman · Jan 17, 2020 · efdf32a · efdf32a
1 parent 3ab4200
commit efdf32a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/runtime/gc_realtime/RealtimeGC.cpp b/runtime/gc_realtime/RealtimeGC.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2019 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
@@ -692,17 +692,6 @@ MM_RealtimeGC::heapRemoveRange(
 	return result;
 }
 
-/**
- * Re-size all structures which are dependent on the current size of the heap.
- * No new memory has been added to a heap reconfiguration.  This call typically is the result
- * of having segment range changes (memory redistributed between segments) or the meaning of
- * memory changed.
- */
-void
-MM_RealtimeGC::heapReconfigured(MM_EnvironmentBase *env)
-{
-}
-
 /**
  */
 bool

diff --git a/runtime/gc_realtime/RealtimeGC.hpp b/runtime/gc_realtime/RealtimeGC.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2019 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
@@ -198,7 +198,6 @@ class MM_RealtimeGC : public MM_GlobalCollector
 	virtual bool heapRemoveRange(
 		MM_EnvironmentBase *env, MM_MemorySubSpace *subspace, uintptr_t size, void *lowAddress, void *highAddress,
 		void *lowValidAddress, void *highValidAddress);
-	virtual void heapReconfigured(MM_EnvironmentBase *env);
 
 	void workerSetupForGC(MM_EnvironmentBase *env);
 	void allThreadsAllocateUnmarked(MM_EnvironmentBase *env);

diff --git a/runtime/gc_vlhgc/IncrementalGenerationalGC.cpp b/runtime/gc_vlhgc/IncrementalGenerationalGC.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2019 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
@@ -623,7 +623,7 @@ MM_IncrementalGenerationalGC::heapRemoveRange(MM_EnvironmentBase *env, MM_Memory
  * @see MM_GlobalCollector::heapReconfigured()
  */
 void
-MM_IncrementalGenerationalGC::heapReconfigured(MM_EnvironmentBase *env)
+MM_IncrementalGenerationalGC::heapReconfigured(MM_EnvironmentBase *env, HeapReconfigReason reason, MM_MemorySubSpace *subspace, void *lowAddress, void *highAddress)
 {
 	MM_EnvironmentVLHGC *envVLHGC = MM_EnvironmentVLHGC::getEnvironment(env);
 

diff --git a/runtime/gc_vlhgc/IncrementalGenerationalGC.hpp b/runtime/gc_vlhgc/IncrementalGenerationalGC.hpp
@@ -1,6 +1,6 @@
 
 /*******************************************************************************
- * Copyright (c) 1991, 2019 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
@@ -236,7 +236,7 @@ class MM_IncrementalGenerationalGC : public MM_GlobalCollector
 
 	virtual bool heapAddRange(MM_EnvironmentBase *env, MM_MemorySubSpace *subspace, UDATA size, void *lowAddress, void *highAddress);
 	virtual bool heapRemoveRange(MM_EnvironmentBase *env, MM_MemorySubSpace *subspace, UDATA size, void *lowAddress, void *highAddress, void *lowValidAddress, void *highValidAddress);
-	virtual void heapReconfigured(MM_EnvironmentBase *env);
+	virtual void heapReconfigured(MM_EnvironmentBase *env, HeapReconfigReason reason, MM_MemorySubSpace *subspace, void *lowAddress, void *highAddress);
 	/**
 	 * @see MM_Collector::collectorExpanded
 	 */