Merge pull request eclipse-openj9#20640 from tajila/jfr3

Fix potential cycle in JFR ThreadGroupEntry
hangshao0 · Nov 20, 2024 · b73365e · b73365e
2 parents e6ae080 + 2b3f3e1
commit b73365e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/runtime/vm/JFRConstantPoolTypes.cpp b/runtime/vm/JFRConstantPoolTypes.cpp
@@ -853,6 +853,15 @@ VM_JFRConstantPoolTypes::addThreadGroupEntry(j9object_t threadGroup)
 	entry->parentIndex = addThreadGroupEntry(J9VMJAVALANGTHREADGROUP_PARENT(_currentThread, threadGroup));
 	if (isResultNotOKay()) goto done;
 
+	/* Check again to see if the Threadgroup was added recursively. */
+	entry = (ThreadGroupEntry *) hashTableFind(_threadGroupTable, entry);
+	if (NULL != entry) {
+		index = entry->index;
+		goto done;
+	} else {
+		entry = &entryBuffer;
+	}
+
 	entry->name = copyStringToJ9UTF8WithMemAlloc(_currentThread, J9VMJAVALANGTHREADGROUP_NAME(_currentThread, threadGroup), J9_STR_NONE, "", 0, NULL, 0);
 
 	entry->index = _threadGroupCount;