Merge pull request #3936 from LinHu2016/mergeFreeEntryStatsAfterCompact

Merge FreeEntryAllocateStats after compaction
eclipse-openj9 · Jun 3, 2019 · 5358dd3 · 5358dd3
2 parents f9804bb + 53f0ad2
commit 5358dd3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/gc/base/standard/ParallelGlobalGC.cpp b/gc/base/standard/ParallelGlobalGC.cpp
@@ -478,6 +478,9 @@ MM_ParallelGlobalGC::masterThreadGarbageCollect(MM_EnvironmentBase *env, MM_Allo
 
 		masterThreadCompact(env, allocDescription, rebuildMarkBits);
 		_collectionStatistics._tenureFragmentation = NO_FRAGMENTATION;
+		if (_extensions->processLargeAllocateStats) {
+			processLargeAllocateStatsAfterCompact(env);
+		}
 	} else {
 		/* If a compaction was prevented, report the reason */
 		CompactPreventedReason compactPreventedReason = (CompactPreventedReason)(_extensions->globalGCStats.compactStats._compactPreventedReason);
@@ -1115,6 +1118,13 @@ MM_ParallelGlobalGC::processLargeAllocateStatsBeforeGC(MM_EnvironmentBase *env)
 	}
 }
 
+void
+MM_ParallelGlobalGC::processLargeAllocateStatsAfterCompact(MM_EnvironmentBase *env)
+{
+	processLargeAllocateStatsAfterSweep(env);
+}
+
+
 void
 MM_ParallelGlobalGC::processLargeAllocateStatsAfterSweep(MM_EnvironmentBase *env)
 {

diff --git a/gc/base/standard/ParallelGlobalGC.hpp b/gc/base/standard/ParallelGlobalGC.hpp
@@ -240,6 +240,12 @@ class MM_ParallelGlobalGC : public MM_GlobalCollector
 	 */
 	virtual void processLargeAllocateStatsAfterSweep(MM_EnvironmentBase *env);
 
+	/**
+	 * compaction would change freeEntries stats, merge FreeEntryAllocateStats after compaction.
+	 * currently processLargeAllocateStatsAfterCompact() is same as processLargeAllocateStatsAfterSweep()
+	 */
+	void processLargeAllocateStatsAfterCompact(MM_EnvironmentBase *env);
+
 	virtual void postMark(MM_EnvironmentBase *env);
 
 	MM_ParallelSweepScheme*