Rename JFR BuildResult to JfrBuildResult

keithc-ca · keithc-ca · commit 291173f30b37 · 2025-06-09T18:10:16.000-04:00
Avoid conflict with pre-existing type declared in BuildResult.hpp.

Signed-off-by: Keith W. Campbell &lt;keithc@ca.ibm.com&gt;
diff --git a/runtime/vm/JFRChunkWriter.hpp b/runtime/vm/JFRChunkWriter.hpp
@@ -126,7 +126,7 @@ class VM_JFRChunkWriter {
 private:
 	J9VMThread *_currentThread;
 	J9JavaVM *_vm;
-	BuildResult _buildResult;
+	JfrBuildResult _buildResult;
 	bool _debug;
 	J9PortLibrary *privatePortLibrary; //PORT_ACCESS_FROM...
 	bool _finalWrite;
@@ -272,7 +272,7 @@ class VM_JFRChunkWriter {
 		return _buildResult == OK;
 	}
 
-	BuildResult buildResult()
+	JfrBuildResult buildResult()
 	{
 		return _buildResult;
 	}
diff --git a/runtime/vm/JFRConstantPoolTypes.hpp b/runtime/vm/JFRConstantPoolTypes.hpp
@@ -352,7 +352,7 @@ class VM_JFRConstantPoolTypes {
 private:
 	J9VMThread *_currentThread;
 	J9JavaVM *_vm;
-	BuildResult _buildResult;
+	JfrBuildResult _buildResult;
 	bool _debug;
 	J9PortLibrary *privatePortLibrary;
 
@@ -967,7 +967,7 @@ class VM_JFRConstantPoolTypes {
 
 	void printTables();
 
-	BuildResult getBuildResult()
+	JfrBuildResult getBuildResult()
 	{
 		return _buildResult;
 	}
@@ -1085,7 +1085,7 @@ class VM_JFRConstantPoolTypes {
 	 *
 	 * @param vm[in] the J9JavaVM
 	 */
-	static void initializeJFRConstantEvents(J9JavaVM *vm, J9VMThread *currentThread, BuildResult *result)
+	static void initializeJFRConstantEvents(J9JavaVM *vm, J9VMThread *currentThread, JfrBuildResult *result)
 	{
 		initializeJVMInformationEvent(vm, currentThread, result);
 		initializeCPUInformationEvent(vm, currentThread, result);
@@ -1116,7 +1116,7 @@ class VM_JFRConstantPoolTypes {
 	 *
 	 * @param vm[in] the J9JavaVM
 	 */
-	static void initializeJVMInformationEvent(J9JavaVM *vm, J9VMThread *currentThread, BuildResult *result)
+	static void initializeJVMInformationEvent(J9JavaVM *vm, J9VMThread *currentThread, JfrBuildResult *result)
 	{
 		PORT_ACCESS_FROM_JAVAVM(vm);
 		/* Initialize JVM Information */
@@ -1183,7 +1183,7 @@ class VM_JFRConstantPoolTypes {
 	 *
 	 * @param vm[in] the J9JavaVM
 	 */
-	static void initializeCPUInformationEvent(J9JavaVM *vm, J9VMThread *currentThread, BuildResult *result)
+	static void initializeCPUInformationEvent(J9JavaVM *vm, J9VMThread *currentThread, JfrBuildResult *result)
 	{
 		PORT_ACCESS_FROM_JAVAVM(vm);
 		OMRPORT_ACCESS_FROM_J9PORT(privatePortLibrary);
@@ -1265,7 +1265,7 @@ class VM_JFRConstantPoolTypes {
 	 *
 	 * @param vm[in] the J9JavaVM
 	 */
-	static void initializeOSInformation(J9JavaVM *vm, BuildResult *result)
+	static void initializeOSInformation(J9JavaVM *vm, JfrBuildResult *result)
 	{
 		PORT_ACCESS_FROM_JAVAVM(vm);
 
diff --git a/runtime/vm/JFRUtils.hpp b/runtime/vm/JFRUtils.hpp
@@ -28,7 +28,7 @@
 
 #if defined(J9VM_OPT_JFR)
 
-enum BuildResult {
+enum JfrBuildResult {
 	OK,
 	OutOfMemory,
 	InternalVMError,
@@ -57,7 +57,7 @@ class VM_JFRUtils {
 
 public:
 
-	static U_64 getCurrentTimeNanos(J9PortLibrary *privatePortLibrary, BuildResult &buildResult)
+	static U_64 getCurrentTimeNanos(J9PortLibrary *privatePortLibrary, JfrBuildResult &buildResult)
 	{
 		UDATA success = 0;
 		U_64 result = (U_64) j9time_current_time_nanos(&success);

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ class VM_JFRChunkWriter {`
`126`	`126`	`private:`
`127`	`127`	`J9VMThread *_currentThread;`
`128`	`128`	`J9JavaVM *_vm;`
`129`		`- BuildResult _buildResult;`
	`129`	`+ JfrBuildResult _buildResult;`
`130`	`130`	`bool _debug;`
`131`	`131`	`J9PortLibrary *privatePortLibrary; //PORT_ACCESS_FROM...`
`132`	`132`	`bool _finalWrite;`
`@@ -272,7 +272,7 @@ class VM_JFRChunkWriter {`
`272`	`272`	`return _buildResult == OK;`
`273`	`273`	`}`
`274`	`274`
`275`		`- BuildResult buildResult()`
	`275`	`+ JfrBuildResult buildResult()`
`276`	`276`	`{`
`277`	`277`	`return _buildResult;`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ class VM_JFRConstantPoolTypes {`
`352`	`352`	`private:`
`353`	`353`	`J9VMThread *_currentThread;`
`354`	`354`	`J9JavaVM *_vm;`
`355`		`- BuildResult _buildResult;`
	`355`	`+ JfrBuildResult _buildResult;`
`356`	`356`	`bool _debug;`
`357`	`357`	`J9PortLibrary *privatePortLibrary;`
`358`	`358`
`@@ -967,7 +967,7 @@ class VM_JFRConstantPoolTypes {`
`967`	`967`
`968`	`968`	`void printTables();`
`969`	`969`
`970`		`- BuildResult getBuildResult()`
	`970`	`+ JfrBuildResult getBuildResult()`
`971`	`971`	`{`
`972`	`972`	`return _buildResult;`
`973`	`973`	`}`
`@@ -1085,7 +1085,7 @@ class VM_JFRConstantPoolTypes {`
`1085`	`1085`	`*`
`1086`	`1086`	`* @param vm[in] the J9JavaVM`
`1087`	`1087`	`*/`
`1088`		`- static void initializeJFRConstantEvents(J9JavaVM vm, J9VMThread currentThread, BuildResult *result)`
	`1088`	`+ static void initializeJFRConstantEvents(J9JavaVM vm, J9VMThread currentThread, JfrBuildResult *result)`
`1089`	`1089`	`{`
`1090`	`1090`	`initializeJVMInformationEvent(vm, currentThread, result);`
`1091`	`1091`	`initializeCPUInformationEvent(vm, currentThread, result);`
`@@ -1116,7 +1116,7 @@ class VM_JFRConstantPoolTypes {`
`1116`	`1116`	`*`
`1117`	`1117`	`* @param vm[in] the J9JavaVM`
`1118`	`1118`	`*/`
`1119`		`- static void initializeJVMInformationEvent(J9JavaVM vm, J9VMThread currentThread, BuildResult *result)`
	`1119`	`+ static void initializeJVMInformationEvent(J9JavaVM vm, J9VMThread currentThread, JfrBuildResult *result)`
`1120`	`1120`	`{`
`1121`	`1121`	`PORT_ACCESS_FROM_JAVAVM(vm);`
`1122`	`1122`	`/* Initialize JVM Information */`
`@@ -1183,7 +1183,7 @@ class VM_JFRConstantPoolTypes {`
`1183`	`1183`	`*`
`1184`	`1184`	`* @param vm[in] the J9JavaVM`
`1185`	`1185`	`*/`
`1186`		`- static void initializeCPUInformationEvent(J9JavaVM vm, J9VMThread currentThread, BuildResult *result)`
	`1186`	`+ static void initializeCPUInformationEvent(J9JavaVM vm, J9VMThread currentThread, JfrBuildResult *result)`
`1187`	`1187`	`{`
`1188`	`1188`	`PORT_ACCESS_FROM_JAVAVM(vm);`
`1189`	`1189`	`OMRPORT_ACCESS_FROM_J9PORT(privatePortLibrary);`
`@@ -1265,7 +1265,7 @@ class VM_JFRConstantPoolTypes {`
`1265`	`1265`	`*`
`1266`	`1266`	`* @param vm[in] the J9JavaVM`
`1267`	`1267`	`*/`
`1268`		`- static void initializeOSInformation(J9JavaVM vm, BuildResult result)`
	`1268`	`+ static void initializeOSInformation(J9JavaVM vm, JfrBuildResult result)`
`1269`	`1269`	`{`
`1270`	`1270`	`PORT_ACCESS_FROM_JAVAVM(vm);`
`1271`	`1271`