Merge pull request #22211 from adpopescu/jfr-gc-pauses

Add GC pause info for use in JFR

Author: amicic

runtime/gc_realtime/RealtimeGC.cpp

@@ -361,6 +361,7 @@ MM_RealtimeGC::internalPreCollect(MM_EnvironmentBase *env, MM_MemorySubSpace *su
 	env->_cycleState->_gcCode = MM_GCCode(gcCode);
 	env->_cycleState->_type = _cycleType;
 	env->_cycleState->_activeSubSpace = subSpace;
+	env->_cycleState->_collectionStatistics = &_collectionStatistics;
 
 	/* If we are in an excessiveGC level beyond normal then an aggressive GC is
 	 * conducted to free up as much space as possible
@@ -387,6 +388,7 @@ MM_RealtimeGC::internalPreCollect(MM_EnvironmentBase *env, MM_MemorySubSpace *su
 	}
 	/* we are about to collect so generate the appropriate cycle start and increment start events */
 	reportGCCycleStart(rtEnv);
+	reportGCIncrementStart(rtEnv);
 	_sched->reportStartGCIncrement(rtEnv);
 }
 
@@ -447,6 +449,7 @@ MM_RealtimeGC::internalPostCollect(MM_EnvironmentBase *env, MM_MemorySubSpace *s
 	 * the METRONOME_INCREMENT_START/END events become out of order and verbose GC will fail.
 	 */
 	reportGCCycleFinalIncrementEnding(env);
+	reportGCIncrementEnd(env);
 
 	MM_EnvironmentRealtime *rtEnv = MM_EnvironmentRealtime::getEnvironment(env);
 	_sched->reportStopGCIncrement(rtEnv, true);
@@ -613,6 +616,24 @@ MM_RealtimeGC::reportGCCycleEnd(MM_EnvironmentBase *env)
 	omrthread_monitor_exit(env->getOmrVM()->_gcCycleOnMonitor);
 }
 
+void
+MM_RealtimeGC::reportGCIncrementStart(MM_EnvironmentBase *env)
+{
+	PORT_ACCESS_FROM_ENVIRONMENT(env);
+	MM_CollectionStatistics *stats = (MM_CollectionStatistics *)env->_cycleState->_collectionStatistics;
+	stats->_startTime = j9time_hires_clock();
+}
+
+void
+MM_RealtimeGC::reportGCIncrementEnd(MM_EnvironmentBase *env)
+{
+	PORT_ACCESS_FROM_ENVIRONMENT(env);
+	MM_CollectionStatistics *stats = (MM_CollectionStatistics *)env->_cycleState->_collectionStatistics;
+
+	stats->_endTime = j9time_hires_clock();
+	stats->processPauseDuration();
+}
+
 /**
  * @todo Provide method documentation
  * @ingroup GC_Metronome methodGroup

runtime/gc_realtime/RealtimeGC.hpp

@@ -40,6 +40,7 @@
 #include "OMRVMInterface.hpp"
 #include "Scheduler.hpp"
 #include "WorkPacketsRealtime.hpp"
+#include "CollectionStatistics.hpp"
 
 class MM_ParallelDispatcher;
 class MM_EnvironmentBase;
@@ -69,6 +70,7 @@ class MM_RealtimeGC : public MM_GlobalCollector
 	uintptr_t _gcPhase; /**< What gc phase are we currently in? */
 
 	MM_CycleState _cycleState;  /**< Embedded cycle state to be used as the main cycle state for GC activity */
+	MM_CollectionStatistics _collectionStatistics;  /** Common collect stats (memory, time etc.) */
 
 	bool _moreTracingRequired; /**< Is used to decide if there needs to be another pass of the tracing loop. */
 
@@ -105,6 +107,8 @@ class MM_RealtimeGC : public MM_GlobalCollector
 	void reportSweepEnd(MM_EnvironmentBase *env);
 	void reportGCStart(MM_EnvironmentBase *env);
 	void reportGCEnd(MM_EnvironmentBase *env);
+	void reportGCIncrementStart(MM_EnvironmentBase *env);
+	void reportGCIncrementEnd(MM_EnvironmentBase *env);
 
 public:
 	void mainSetupForGC(MM_EnvironmentBase *env);

runtime/gc_vlhgc/IncrementalGenerationalGC.cpp

@@ -2140,6 +2140,8 @@ void
 MM_IncrementalGenerationalGC::reportGCCycleStart(MM_EnvironmentBase *env)
 {
 	PORT_ACCESS_FROM_ENVIRONMENT(env);
+	MM_CollectionStatisticsVLHGC *stats = (MM_CollectionStatisticsVLHGC *)env->_cycleState->_collectionStatistics;
+	stats->clearPauseStats();
 	MM_GCExtensions* extensions = MM_GCExtensions::getExtensions(env);
 	MM_CommonGCData commonData;
 
@@ -2363,6 +2365,7 @@ MM_IncrementalGenerationalGC::reportGCIncrementEnd(MM_EnvironmentBase *env)
 	}
 
 	stats->_endTime = j9time_hires_clock();
+	stats->processPauseDuration();
 	stats->_stallTime = static_cast<MM_CycleStateVLHGC*>(env->_cycleState)->_vlhgcIncrementStats.getTotalStallTime();
 
 	TRIGGER_J9HOOK_MM_PRIVATE_GC_INCREMENT_END(