Merge pull request #24246 from tajila/jfr4

gacholio · web-flow · commit 619bdfdf6754 · 2026-06-27T02:56:55.000-04:00
Modify JFR auto chunk flush
diff --git a/runtime/jcl/common/jdk_jfr_internal_JVM_common.cpp b/runtime/jcl/common/jdk_jfr_internal_JVM_common.cpp
@@ -305,7 +305,8 @@ Java_jdk_jfr_internal_JVM_setMemorySize(JNIEnv *env, jobject obj, jlong size)
 void JNICALL
 Java_jdk_jfr_internal_JVM_setOutput(JNIEnv *env, jobject obj, jstring file)
 {
-	if (NULL == file) {
+	J9VMThread *currentThread = (J9VMThread*) env;
+	if (NULL != currentThread->javaVM->jfrState.jfrFileName) {
 		Java_com_ibm_oti_vm_VM_jfrDump(env, NULL);
 	}
 	Java_com_ibm_oti_vm_VM_setJFRRecordingFileName(env, NULL, file);

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,8 @@ Java_jdk_jfr_internal_JVM_setMemorySize(JNIEnv *env, jobject obj, jlong size)`
`305`	`305`	`void JNICALL`
`306`	`306`	`Java_jdk_jfr_internal_JVM_setOutput(JNIEnv *env, jobject obj, jstring file)`
`307`	`307`	`{`
`308`		`- if (NULL == file) {`
	`308`	`+ J9VMThread currentThread = (J9VMThread) env;`
	`309`	`+ if (NULL != currentThread->javaVM->jfrState.jfrFileName) {`
`309`	`310`	`Java_com_ibm_oti_vm_VM_jfrDump(env, NULL);`
`310`	`311`	`}`
`311`	`312`	`Java_com_ibm_oti_vm_VM_setJFRRecordingFileName(env, NULL, file);`