Merge pull request #20761 from thallium/jfr-unknown-thread-0.49

(0.49) Add an unknown thread entry to JFR constant pool
eclipse-openj9 · Dec 5, 2024 · e0b3d55 · e0b3d55
2 parents d06ae14 + add84dd
commit e0b3d55
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/runtime/vm/JFRConstantPoolTypes.cpp b/runtime/vm/JFRConstantPoolTypes.cpp
@@ -1235,7 +1235,10 @@ VM_JFRConstantPoolTypes::freeThreadNameEntries(void *entry, void *userData)
 	J9VMThread *currentThread = (J9VMThread *)userData;
 	PORT_ACCESS_FROM_VMC(currentThread);
 
-	j9mem_free_memory(tableEntry->javaThreadName);
+	/* Name of the unknown thread entry cannot be freed */
+	if (0 != tableEntry->index) {
+		j9mem_free_memory(tableEntry->javaThreadName);
+	}
 	tableEntry->javaThreadName = NULL;
 
 	return FALSE;

diff --git a/runtime/vm/JFRConstantPoolTypes.hpp b/runtime/vm/JFRConstantPoolTypes.hpp
@@ -45,6 +45,7 @@ J9_DECLARE_CONSTANT_UTF8(nativeMethod, "(nativeMethod)");
 J9_DECLARE_CONSTANT_UTF8(nativeMethodSignature, "()");
 J9_DECLARE_CONSTANT_UTF8(defaultPackage, "(defaultPackage)");
 J9_DECLARE_CONSTANT_UTF8(bootLoaderName, "boostrapClassLoader");
+J9_DECLARE_CONSTANT_UTF8(unknownThread, "unknown thread");
 
 enum JFRStringConstants {
 	DefaultString = 0,
@@ -542,6 +543,21 @@ class VM_JFRConstantPoolTypes {
 		return value;
 	}
 
+	void addUnknownThreadEntry() {
+		ThreadEntry unknownThreadEntry = {0};
+		unknownThreadEntry.vmThread = NULL;
+		unknownThreadEntry.index = 0;
+		unknownThreadEntry.osTID = 0;
+		unknownThreadEntry.javaTID = 0;
+		unknownThreadEntry.javaThreadName = (J9UTF8 *)&unknownThread;
+		unknownThreadEntry.osThreadName = (J9UTF8 *)&unknownThread;
+		unknownThreadEntry.threadGroupIndex = 0;
+
+		ThreadEntry *entry = (ThreadEntry *)hashTableAdd(_threadTable, &unknownThreadEntry);
+		_firstThreadEntry = entry;
+		_previousThreadEntry = entry;
+	}
+
 protected:
 
 public:
@@ -1276,6 +1292,7 @@ class VM_JFRConstantPoolTypes {
 
 		/* Leave index 0 as a NULL entry for unknown notifier thread. */
 		_threadCount += 1;
+		addUnknownThreadEntry();
 
 done:
 		return;