Merge pull request #22180 from adpopescu/jfr-gc-events

Modify scavenger GC count

Author: amicic

runtime/gc_base/modronapi.cpp

@@ -1000,38 +1000,7 @@ UDATA
 j9gc_get_unique_GC_count(J9JavaVM *javaVM)
 {
 	MM_GCExtensions *extensions = MM_GCExtensions::getExtensions(javaVM);
-	OMR_VM *omrVm = javaVM->omrVM;
-	UDATA result = 0;
-
-	switch (omrVm->gcPolicy) {
-		case OMR_GC_POLICY_OPTTHRUPUT:
-		case OMR_GC_POLICY_OPTAVGPAUSE:
-		case OMR_GC_POLICY_METRONOME:
-			result = extensions->globalGCStats.gcCount;
-			break;
-
-		case OMR_GC_POLICY_GENCON:
-			result = extensions->globalGCStats.gcCount;
-#if defined(OMR_GC_MODRON_SCAVENGER)
-			result += extensions->scavengerStats._gcCount;
-#endif
-			break;
-
-		case OMR_GC_POLICY_BALANCED:
-#if defined(OMR_GC_VLHGC)
-			result = extensions->globalVLHGCStats.gcCount;
-#endif
-			break;
-
-		case OMR_GC_POLICY_NOGC:
-			break;
-
-		default :
-			/* Unknown GC policy */
-			Assert_MM_unreachable();
-			break;
-	}
-	return result;
+	return extensions->getUniqueGCCycleCount();
 }
 
 /**

runtime/gc_glue_java/ScavengerDelegate.cpp

@@ -196,7 +196,7 @@ MM_ScavengerDelegate::mainSetupForGC(MM_EnvironmentBase * envBase)
 
 	/* Sort all hot fields for all classes if scavenger dynamicBreadthFirstScanOrdering is enabled */
 	if (MM_GCExtensions::OMR_GC_SCAVENGER_SCANORDERING_DYNAMIC_BREADTH_FIRST == _extensions->scavengerScanOrdering) {
-		MM_HotFieldUtil::sortAllHotFieldData(_javaVM, _extensions->scavengerStats._gcCount);
+		MM_HotFieldUtil::sortAllHotFieldData(_javaVM, _extensions->incrementScavengerStats._gcCount);
 	}
 
 	return;

runtime/gc_trace/TgcConcurrent.cpp

@@ -48,7 +48,7 @@ tgcHookConcurrentBackgroundThreadActivated(J9HookInterface** hook, UDATA eventNu
 
 	concurrentExtensions->gcCountAtBackgroundThreadActivation = 
 #if defined(J9VM_GC_MODRON_SCAVENGER)
-		extensions->scavengerStats._gcCount +
+		extensions->incrementScavengerStats._gcCount +
 #endif /* J9VM_GC_MODRON_SCAVENGER */
 		extensions->globalGCStats.gcCount;
 

runtime/gc_trace/TgcConcurrentcardcleaning.cpp

@@ -55,7 +55,7 @@ tgcHookCardCleaningComplete(J9HookInterface** hook, UDATA eventNum, void* eventD
 
 	tgcExtensions->printf("Card cleaning for GC(%zu)\n",
 #if defined(J9VM_GC_MODRON_SCAVENGER)
-		extensions->scavengerStats._gcCount +
+		extensions->incrementScavengerStats._gcCount +
 #endif /* J9VM_GC_MODRON_SCAVENGER */
 		extensions->globalGCStats.gcCount + 
 		1

runtime/gc_trace/TgcDump.cpp

@@ -61,7 +61,7 @@ tgcHookGlobalGcSweepEnd(J9HookInterface** hook, UDATA eventNum, void* eventData,
 		gcCount = extensions->globalGCStats.gcCount;
 		if (extensions->isStandardGC()) {
 #if defined(J9VM_GC_MODRON_SCAVENGER)
-			gcCount += extensions->scavengerStats._gcCount;
+			gcCount += j9gc_get_unique_GC_count(javaVM);
 #endif /* J9VM_GC_MODRON_SCAVENGER */
 		}
 #endif /* J9VM_GC_MODRON_STANDARD || J9VM_GC_REALTIME */

runtime/gc_trace/TgcParallel.cpp

@@ -241,7 +241,8 @@ tgcHookLocalGcEnd(J9HookInterface** hook, uintptr_t eventNum, void* eventData, v
 {
 	MM_LocalGCEndEvent* event = (MM_LocalGCEndEvent*)eventData;
 	J9VMThread* vmThread = (J9VMThread*)event->currentThread->_language_vmthread;
-	MM_GCExtensions *extensions = MM_GCExtensions::getExtensions(vmThread->javaVM);
+	J9JavaVM* javaVM = vmThread->javaVM;
+	MM_GCExtensions *extensions = MM_GCExtensions::getExtensions(javaVM);
 	MM_TgcExtensions *tgcExtensions = MM_TgcExtensions::getExtensions(extensions);
 
 	J9VMThread *walkThread;
@@ -259,15 +260,15 @@ tgcHookLocalGcEnd(J9HookInterface** hook, uintptr_t eventNum, void* eventData, v
 	tgcExtensions->printf("                   (micros) (micros)  freelist  freelist  scanlist  scanlist      lock    arrays arraysize copycache   lists  deep objs    list\n");
 
 	scavengeTotalTime = event->incrementEndTime - event->incrementStartTime;
-	uintptr_t gcCount = extensions->scavengerStats._gcCount;
+	uintptr_t gcCount = j9gc_get_unique_GC_count(javaVM);
 
 	GC_VMThreadListIterator scavengeThreadListIterator(vmThread);
 	while ((walkThread = scavengeThreadListIterator.nextVMThread()) != NULL) {
 		/* TODO: Are we guaranteed to get the threads in the right order? */
 		MM_EnvironmentBase *env = MM_EnvironmentBase::getEnvironment(walkThread->omrVMThread);
 		if ((walkThread == vmThread) || (env->getThreadType() == GC_WORKER_THREAD)) {
 			/* check if this thread participated in the GC */ 
-			if (env->_scavengerStats._gcCount == extensions->scavengerStats._gcCount) {
+			if (env->_scavengerStats._gcCount == extensions->incrementScavengerStats._gcCount) {
 				intptr_t avgArraySplitAmount = 0;
 				if (0 != env->_scavengerStats._arraySplitCount) {
 					avgArraySplitAmount = env->_scavengerStats._arraySplitAmount / env->_scavengerStats._arraySplitCount;