Initialize exclusive stats in safepoint exclusive

Set a valid default requestor and lastResponder in the exclusive stats when acquiring safepoint exclusive. Fixes: #18260 Signed-off-by: Graham Chapman <[email protected]>
eclipse-openj9 · Oct 20, 2023 · 1095e93 · 1095e93
1 parent b1abbfd
commit 1095e93
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/runtime/vm/VMAccess.cpp b/runtime/vm/VMAccess.cpp
@@ -1139,6 +1139,7 @@ acquireSafePointVMAccess(J9VMThread * vmThread)
 		/* Grant safe point access to the thread now */
 		vm->safePointState = J9_XACCESS_PENDING;
 		vm->safePointResponseCount = 0;
+		initializeExclusiveVMAccessStats(vm, vmThread);
 		omrthread_monitor_exit(vm->exclusiveAccessMutex);
 
 		/* Post a safe point request to all threads */
@@ -1256,6 +1257,9 @@ releaseSafePointVMAccess(J9VMThread * vmThread)
 
 		omrthread_monitor_enter(vm->exclusiveAccessMutex);
 		vm->safePointState = J9_XACCESS_NONE;
+		/* Make sure stale thread pointers don't exist in the stats */
+		vm->omrVM->exclusiveVMAccessStats.requester = NULL;
+		vm->omrVM->exclusiveVMAccessStats.lastResponder = NULL;
 		omrthread_monitor_notify_all(vm->exclusiveAccessMutex);
 		omrthread_monitor_exit(vm->exclusiveAccessMutex);
 		omrthread_monitor_exit(vm->vmThreadListMutex);