8305935: Resolve multiple definition of 'jmm_<interface|version>' when statically linking with JDK native libraries

jianglizhou · jianglizhou · commit 314bad36135c · 2023-04-14T21:13:11.000Z
Reviewed-by: dholmes
diff --git a/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c b/src/jdk.management/share/native/libmanagement_ext/DiagnosticCommandImpl.c
@@ -30,19 +30,19 @@
 
 JNIEXPORT void JNICALL Java_com_sun_management_internal_DiagnosticCommandImpl_setNotificationEnabled
 (JNIEnv *env, jobject dummy, jboolean enabled) {
-    if (jmm_version <= JMM_VERSION_1_2_2) {
+    if (jmm_version_management_ext <= JMM_VERSION_1_2_2) {
         JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
                         "JMX interface to diagnostic framework notifications is not supported by this VM");
         return;
     }
-    jmm_interface->SetDiagnosticFrameworkNotificationEnabled(env, enabled);
+    jmm_interface_management_ext->SetDiagnosticFrameworkNotificationEnabled(env, enabled);
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommands
   (JNIEnv *env, jobject dummy)
 {
-  return jmm_interface->GetDiagnosticCommands(env);
+  return jmm_interface_management_ext->GetDiagnosticCommands(env);
 }
 
 //
@@ -78,7 +78,7 @@ jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
     JNU_ThrowOutOfMemoryError(env, 0);
     return NULL;
   }
-  jmm_interface->GetDiagnosticCommandArgumentsInfo(env, command,
+  jmm_interface_management_ext->GetDiagnosticCommandArgumentsInfo(env, command,
                                                    dcmd_arg_info_array, num_arg);
   dcmdArgInfoCls = (*env)->FindClass(env,
                                      "com/sun/management/internal/DiagnosticCommandArgumentInfo");
@@ -151,7 +151,7 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
   jobjectArray args;
   jobject obj;
   jmmOptionalSupport mos;
-  jint ret = jmm_interface->GetOptionalSupport(env, &mos);
+  jint ret = jmm_interface_management_ext->GetOptionalSupport(env, &mos);
   jsize num_commands;
   dcmdInfo* dcmd_info_array;
   jstring jname, jdesc, jimpact, cmd;
@@ -189,7 +189,7 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
       JNU_ThrowOutOfMemoryError(env, NULL);
       return NULL;
   }
-  jmm_interface->GetDiagnosticCommandInfo(env, commands, dcmd_info_array);
+  jmm_interface_management_ext->GetDiagnosticCommandInfo(env, commands, dcmd_info_array);
   for (i=0; i<num_commands; i++) {
       // Ensure capacity for 6 + 3 local refs:
       //  6 => jname, jdesc, jimpact, cmd, args, obj
@@ -247,5 +247,5 @@ Java_com_sun_management_internal_DiagnosticCommandImpl_getDiagnosticCommandInfo
 JNIEXPORT jstring JNICALL
 Java_com_sun_management_internal_DiagnosticCommandImpl_executeDiagnosticCommand
 (JNIEnv *env, jobject dummy, jstring command) {
-  return jmm_interface->ExecuteDiagnosticCommand(env, command);
+  return jmm_interface_management_ext->ExecuteDiagnosticCommand(env, command);
 }
diff --git a/src/jdk.management/share/native/libmanagement_ext/Flag.c b/src/jdk.management/share/native/libmanagement_ext/Flag.c
@@ -43,7 +43,7 @@ JNIEXPORT jint JNICALL
 Java_com_sun_management_internal_Flag_getInternalFlagCount
   (JNIEnv *env, jclass cls)
 {
-    jlong count = jmm_interface->GetLongAttribute(env, NULL,
+    jlong count = jmm_interface_management_ext->GetLongAttribute(env, NULL,
                                                   JMM_VM_GLOBAL_COUNT);
     return (jint) count;
 }
@@ -52,7 +52,7 @@ JNIEXPORT jobjectArray JNICALL
   Java_com_sun_management_internal_Flag_getAllFlagNames
 (JNIEnv *env, jclass cls)
 {
-  return jmm_interface->GetVMGlobalNames(env);
+  return jmm_interface_management_ext->GetVMGlobalNames(env);
 }
 
 static jobject find_origin_constant(JNIEnv* env, const char* enum_name) {
@@ -110,7 +110,7 @@ Java_com_sun_management_internal_Flag_getFlags
     }
 
     memset(globals, 0, gsize);
-    num_flags = jmm_interface->GetVMGlobals(env, names, globals, count);
+    num_flags = jmm_interface_management_ext->GetVMGlobals(env, names, globals, count);
     if (num_flags == 0) {
         free(globals);
         return 0;
@@ -209,7 +209,7 @@ Java_com_sun_management_internal_Flag_setLongValue
    jvalue v;
    v.j = value;
 
-   jmm_interface->SetVMGlobal(env, name, v);
+   jmm_interface_management_ext->SetVMGlobal(env, name, v);
 }
 
 JNIEXPORT void JNICALL
@@ -219,7 +219,7 @@ Java_com_sun_management_internal_Flag_setDoubleValue
    jvalue v;
    v.d = value;
 
-   jmm_interface->SetVMGlobal(env, name, v);
+   jmm_interface_management_ext->SetVMGlobal(env, name, v);
 }
 
 JNIEXPORT void JNICALL
@@ -229,7 +229,7 @@ Java_com_sun_management_internal_Flag_setBooleanValue
    jvalue v;
    v.z = value;
 
-   jmm_interface->SetVMGlobal(env, name, v);
+   jmm_interface_management_ext->SetVMGlobal(env, name, v);
 }
 
 JNIEXPORT void JNICALL
@@ -239,5 +239,5 @@ Java_com_sun_management_internal_Flag_setStringValue
    jvalue v;
    v.l = value;
 
-   jmm_interface->SetVMGlobal(env, name, v);
+   jmm_interface_management_ext->SetVMGlobal(env, name, v);
 }
diff --git a/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c b/src/jdk.management/share/native/libmanagement_ext/GarbageCollectorExtImpl.c
@@ -34,8 +34,8 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GarbageCollectorExtImpl_
         JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
         return;
     }
-    if((jmm_version > JMM_VERSION_1_2)
-       || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=1))) {
-      jmm_interface->SetGCNotificationEnabled(env, gc, enabled);
+    if((jmm_version_management_ext > JMM_VERSION_1_2)
+       || (jmm_version_management_ext == JMM_VERSION_1_2 && ((jmm_version_management_ext&0xFF)>=1))) {
+      jmm_interface_management_ext->SetGCNotificationEnabled(env, gc, enabled);
     }
 }
diff --git a/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c b/src/jdk.management/share/native/libmanagement_ext/GcInfoBuilder.c
@@ -37,7 +37,7 @@ JNIEXPORT jint JNICALL Java_com_sun_management_internal_GcInfoBuilder_getNumGcEx
         JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");
         return 0;
     }
-    value = jmm_interface->GetLongAttribute(env, gc,
+    value = jmm_interface_management_ext->GetLongAttribute(env, gc,
                                             JMM_GC_EXT_ATTRIBUTE_INFO_SIZE);
     return (jint) value;
 }
@@ -70,7 +70,7 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GcInfoBuilder_fillGcAttr
         JNU_ThrowOutOfMemoryError(env, 0);
         return;
     }
-    ret = jmm_interface->GetGCExtAttributeInfo(env, gc,
+    ret = jmm_interface_management_ext->GetGCExtAttributeInfo(env, gc,
                                                ext_att_info, num_attributes);
     if (ret != num_attributes) {
         JNU_ThrowInternalError(env, "Unexpected num_attributes");
@@ -231,7 +231,7 @@ JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLast
     }
 
 
-    jmm_interface->GetLastGCStat(env, gc, &gc_stat);
+    jmm_interface_management_ext->GetLastGCStat(env, gc, &gc_stat);
     if (gc_stat.gc_index == 0) {
         if (gc_stat.gc_ext_attribute_values != NULL) {
             free(gc_stat.gc_ext_attribute_values);
diff --git a/src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c b/src/jdk.management/share/native/libmanagement_ext/HotSpotDiagnostic.c
@@ -32,5 +32,5 @@ JNIEXPORT void JNICALL
 Java_com_sun_management_internal_HotSpotDiagnostic_dumpHeap0
   (JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)
 {
-    jmm_interface->DumpHeap0(env, outputfile, live);
+    jmm_interface_management_ext->DumpHeap0(env, outputfile, live);
 }
diff --git a/src/jdk.management/share/native/libmanagement_ext/management_ext.c b/src/jdk.management/share/native/libmanagement_ext/management_ext.c
@@ -31,9 +31,9 @@
 
 #define ERR_MSG_SIZE 128
 
-const JmmInterface* jmm_interface = NULL;
+const JmmInterface* jmm_interface_management_ext = NULL;
 static JavaVM* jvm = NULL;
-jint jmm_version = 0;
+jint jmm_version_management_ext = 0;
 
 JNIEXPORT jint JNICALL
    DEF_JNI_OnLoad(JavaVM *vm, void *reserved) {
@@ -44,13 +44,13 @@ JNIEXPORT jint JNICALL
         return JNI_ERR;
     }
 
-    jmm_interface = (JmmInterface*) JVM_GetManagement(JMM_VERSION);
-    if (jmm_interface == NULL) {
+    jmm_interface_management_ext = (JmmInterface*) JVM_GetManagement(JMM_VERSION);
+    if (jmm_interface_management_ext == NULL) {
         JNU_ThrowInternalError(env, "Unsupported Management version");
         return JNI_ERR;
     }
 
-    jmm_version = jmm_interface->GetVersion(env);
+    jmm_version_management_ext = jmm_interface_management_ext->GetVersion(env);
     return (*env)->GetVersion(env);
 }
 
diff --git a/src/jdk.management/share/native/libmanagement_ext/management_ext.h b/src/jdk.management/share/native/libmanagement_ext/management_ext.h
@@ -31,8 +31,11 @@
 #ifndef _MANAGEMENT_EXT_H_
 #define _MANAGEMENT_EXT_H_
 
-extern const JmmInterface* jmm_interface;
-extern jint jmm_version;
+// These symbols are global in this library but need to be uniquely named to
+// avoid conflicts with same-named symbols in other native libraries, when
+// statically linking.
+extern const JmmInterface* jmm_interface_management_ext;
+extern jint jmm_version_management_ext;
 extern void throw_internal_error(JNIEnv* env, const char* msg);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ JNIEXPORT jint JNICALL`
`43`	`43`	`Java_com_sun_management_internal_Flag_getInternalFlagCount`
`44`	`44`	`(JNIEnv *env, jclass cls)`
`45`	`45`	`{`
`46`		`- jlong count = jmm_interface->GetLongAttribute(env, NULL,`
	`46`	`+ jlong count = jmm_interface_management_ext->GetLongAttribute(env, NULL,`
`47`	`47`	`JMM_VM_GLOBAL_COUNT);`
`48`	`48`	`return (jint) count;`
`49`	`49`	`}`
`@@ -52,7 +52,7 @@ JNIEXPORT jobjectArray JNICALL`
`52`	`52`	`Java_com_sun_management_internal_Flag_getAllFlagNames`
`53`	`53`	`(JNIEnv *env, jclass cls)`
`54`	`54`	`{`
`55`		`- return jmm_interface->GetVMGlobalNames(env);`
	`55`	`+ return jmm_interface_management_ext->GetVMGlobalNames(env);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`static jobject find_origin_constant(JNIEnv* env, const char* enum_name) {`
`@@ -110,7 +110,7 @@ Java_com_sun_management_internal_Flag_getFlags`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`memset(globals, 0, gsize);`
`113`		`- num_flags = jmm_interface->GetVMGlobals(env, names, globals, count);`
	`113`	`+ num_flags = jmm_interface_management_ext->GetVMGlobals(env, names, globals, count);`
`114`	`114`	`if (num_flags == 0) {`
`115`	`115`	`free(globals);`
`116`	`116`	`return 0;`
`@@ -209,7 +209,7 @@ Java_com_sun_management_internal_Flag_setLongValue`
`209`	`209`	`jvalue v;`
`210`	`210`	`v.j = value;`
`211`	`211`
`212`		`- jmm_interface->SetVMGlobal(env, name, v);`
	`212`	`+ jmm_interface_management_ext->SetVMGlobal(env, name, v);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`JNIEXPORT void JNICALL`
`@@ -219,7 +219,7 @@ Java_com_sun_management_internal_Flag_setDoubleValue`
`219`	`219`	`jvalue v;`
`220`	`220`	`v.d = value;`
`221`	`221`
`222`		`- jmm_interface->SetVMGlobal(env, name, v);`
	`222`	`+ jmm_interface_management_ext->SetVMGlobal(env, name, v);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`JNIEXPORT void JNICALL`
`@@ -229,7 +229,7 @@ Java_com_sun_management_internal_Flag_setBooleanValue`
`229`	`229`	`jvalue v;`
`230`	`230`	`v.z = value;`
`231`	`231`
`232`		`- jmm_interface->SetVMGlobal(env, name, v);`
	`232`	`+ jmm_interface_management_ext->SetVMGlobal(env, name, v);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`JNIEXPORT void JNICALL`
`@@ -239,5 +239,5 @@ Java_com_sun_management_internal_Flag_setStringValue`
`239`	`239`	`jvalue v;`
`240`	`240`	`v.l = value;`
`241`	`241`
`242`		`- jmm_interface->SetVMGlobal(env, name, v);`
	`242`	`+ jmm_interface_management_ext->SetVMGlobal(env, name, v);`
`243`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GarbageCollectorExtImpl_`
`34`	`34`	`JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`		`- if((jmm_version > JMM_VERSION_1_2)`
`38`		`- \|\| (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=1))) {`
`39`		`- jmm_interface->SetGCNotificationEnabled(env, gc, enabled);`
	`37`	`+ if((jmm_version_management_ext > JMM_VERSION_1_2)`
	`38`	`+ \|\| (jmm_version_management_ext == JMM_VERSION_1_2 && ((jmm_version_management_ext&0xFF)>=1))) {`
	`39`	`+ jmm_interface_management_ext->SetGCNotificationEnabled(env, gc, enabled);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ JNIEXPORT jint JNICALL Java_com_sun_management_internal_GcInfoBuilder_getNumGcEx`
`37`	`37`	`JNU_ThrowNullPointerException(env, "Invalid GarbageCollectorMXBean");`
`38`	`38`	`return 0;`
`39`	`39`	`}`
`40`		`- value = jmm_interface->GetLongAttribute(env, gc,`
	`40`	`+ value = jmm_interface_management_ext->GetLongAttribute(env, gc,`
`41`	`41`	`JMM_GC_EXT_ATTRIBUTE_INFO_SIZE);`
`42`	`42`	`return (jint) value;`
`43`	`43`	`}`
`@@ -70,7 +70,7 @@ JNIEXPORT void JNICALL Java_com_sun_management_internal_GcInfoBuilder_fillGcAttr`
`70`	`70`	`JNU_ThrowOutOfMemoryError(env, 0);`
`71`	`71`	`return;`
`72`	`72`	`}`
`73`		`- ret = jmm_interface->GetGCExtAttributeInfo(env, gc,`
	`73`	`+ ret = jmm_interface_management_ext->GetGCExtAttributeInfo(env, gc,`
`74`	`74`	`ext_att_info, num_attributes);`
`75`	`75`	`if (ret != num_attributes) {`
`76`	`76`	`JNU_ThrowInternalError(env, "Unexpected num_attributes");`
`@@ -231,7 +231,7 @@ JNIEXPORT jobject JNICALL Java_com_sun_management_internal_GcInfoBuilder_getLast`
`231`	`231`	`}`
`232`	`232`
`233`	`233`
`234`		`- jmm_interface->GetLastGCStat(env, gc, &gc_stat);`
	`234`	`+ jmm_interface_management_ext->GetLastGCStat(env, gc, &gc_stat);`
`235`	`235`	`if (gc_stat.gc_index == 0) {`
`236`	`236`	`if (gc_stat.gc_ext_attribute_values != NULL) {`
`237`	`237`	`free(gc_stat.gc_ext_attribute_values);`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ JNIEXPORT void JNICALL`
`32`	`32`	`Java_com_sun_management_internal_HotSpotDiagnostic_dumpHeap0`
`33`	`33`	`(JNIEnv *env, jobject dummy, jstring outputfile, jboolean live)`
`34`	`34`	`{`
`35`		`- jmm_interface->DumpHeap0(env, outputfile, live);`
	`35`	`+ jmm_interface_management_ext->DumpHeap0(env, outputfile, live);`
`36`	`36`	`}`