Merge pull request #24243 from tajila/jfr3

gacholio · web-flow · commit f8b93be2561e · 2026-06-26T06:21:37.000-04:00
Remove sampler mutex in jfr shutdown
diff --git a/runtime/vm/jfr.cpp b/runtime/vm/jfr.cpp
@@ -1134,8 +1134,6 @@ stopJFRRecording(J9JavaVM *vm)
 			}
 		}
 		omrthread_monitor_exit(vm->jfrSamplerMutex);
-		omrthread_monitor_destroy(vm->jfrSamplerMutex);
-		vm->jfrSamplerMutex = NULL;
 	}
 	vm->jfrSamplerState = J9JFR_SAMPLER_STATE_UNINITIALIZED;
 
@@ -1207,6 +1205,8 @@ tearDownJFR(J9JavaVM *vm)
 		J9UnregisterAsyncEvent(vm, vm->jfrThreadCPULoadAsyncKey);
 		vm->jfrThreadCPULoadAsyncKey = -1;
 	}
+	omrthread_monitor_destroy(vm->jfrSamplerMutex);
+	vm->jfrSamplerMutex = NULL;
 }
 
 static I_64

Original file line number	Diff line number	Diff line change
`@@ -1134,8 +1134,6 @@ stopJFRRecording(J9JavaVM *vm)`
`1134`	`1134`	`}`
`1135`	`1135`	`}`
`1136`	`1136`	`omrthread_monitor_exit(vm->jfrSamplerMutex);`
`1137`		`- omrthread_monitor_destroy(vm->jfrSamplerMutex);`
`1138`		`- vm->jfrSamplerMutex = NULL;`
`1139`	`1137`	`}`
`1140`	`1138`	`vm->jfrSamplerState = J9JFR_SAMPLER_STATE_UNINITIALIZED;`
`1141`	`1139`
`@@ -1207,6 +1205,8 @@ tearDownJFR(J9JavaVM *vm)`
`1207`	`1205`	`J9UnregisterAsyncEvent(vm, vm->jfrThreadCPULoadAsyncKey);`
`1208`	`1206`	`vm->jfrThreadCPULoadAsyncKey = -1;`
`1209`	`1207`	`}`
	`1208`	`+ omrthread_monitor_destroy(vm->jfrSamplerMutex);`
	`1209`	`+ vm->jfrSamplerMutex = NULL;`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`	`1212`	`static I_64`