Mon, 28 Apr 2014 09:27:47 +0200
8041980: (hotspot) sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms
Reviewed-by: mgronlun, kamg
1.1 --- a/make/aix/makefiles/mapfile-vers-debug Fri May 30 13:30:07 2014 -0700 1.2 +++ b/make/aix/makefiles/mapfile-vers-debug Mon Apr 28 09:27:47 2014 +0200 1.3 @@ -122,7 +122,7 @@ 1.4 JVM_GetClassModifiers; 1.5 JVM_GetClassName; 1.6 JVM_GetClassNameUTF; 1.7 - JVM_GetClassSignature; 1.8 + JVM_GetClassSignature; 1.9 JVM_GetClassSigners; 1.10 JVM_GetClassTypeAnnotations; 1.11 JVM_GetComponentType; 1.12 @@ -163,6 +163,7 @@ 1.13 JVM_GetStackTraceElement; 1.14 JVM_GetSystemPackage; 1.15 JVM_GetSystemPackages; 1.16 + JVM_GetTemporaryDirectory; 1.17 JVM_GetThreadStateNames; 1.18 JVM_GetThreadStateValues; 1.19 JVM_GetVersionInfo;
2.1 --- a/make/aix/makefiles/mapfile-vers-product Fri May 30 13:30:07 2014 -0700 2.2 +++ b/make/aix/makefiles/mapfile-vers-product Mon Apr 28 09:27:47 2014 +0200 2.3 @@ -161,6 +161,7 @@ 2.4 JVM_GetStackTraceElement; 2.5 JVM_GetSystemPackage; 2.6 JVM_GetSystemPackages; 2.7 + JVM_GetTemporaryDirectory; 2.8 JVM_GetThreadStateNames; 2.9 JVM_GetThreadStateValues; 2.10 JVM_GetVersionInfo;
3.1 --- a/make/bsd/makefiles/mapfile-vers-debug Fri May 30 13:30:07 2014 -0700 3.2 +++ b/make/bsd/makefiles/mapfile-vers-debug Mon Apr 28 09:27:47 2014 +0200 3.3 @@ -161,6 +161,7 @@ 3.4 _JVM_GetStackTraceElement 3.5 _JVM_GetSystemPackage 3.6 _JVM_GetSystemPackages 3.7 + _JVM_GetTemporaryDirectory 3.8 _JVM_GetThreadStateNames 3.9 _JVM_GetThreadStateValues 3.10 _JVM_GetVersionInfo
4.1 --- a/make/bsd/makefiles/mapfile-vers-product Fri May 30 13:30:07 2014 -0700 4.2 +++ b/make/bsd/makefiles/mapfile-vers-product Mon Apr 28 09:27:47 2014 +0200 4.3 @@ -161,6 +161,7 @@ 4.4 _JVM_GetStackTraceElement 4.5 _JVM_GetSystemPackage 4.6 _JVM_GetSystemPackages 4.7 + _JVM_GetTemporaryDirectory 4.8 _JVM_GetThreadStateNames 4.9 _JVM_GetThreadStateValues 4.10 _JVM_GetVersionInfo
5.1 --- a/make/linux/makefiles/mapfile-vers-debug Fri May 30 13:30:07 2014 -0700 5.2 +++ b/make/linux/makefiles/mapfile-vers-debug Mon Apr 28 09:27:47 2014 +0200 5.3 @@ -122,7 +122,7 @@ 5.4 JVM_GetClassModifiers; 5.5 JVM_GetClassName; 5.6 JVM_GetClassNameUTF; 5.7 - JVM_GetClassSignature; 5.8 + JVM_GetClassSignature; 5.9 JVM_GetClassSigners; 5.10 JVM_GetClassTypeAnnotations; 5.11 JVM_GetComponentType; 5.12 @@ -163,6 +163,7 @@ 5.13 JVM_GetStackTraceElement; 5.14 JVM_GetSystemPackage; 5.15 JVM_GetSystemPackages; 5.16 + JVM_GetTemporaryDirectory; 5.17 JVM_GetThreadStateNames; 5.18 JVM_GetThreadStateValues; 5.19 JVM_GetVersionInfo;
6.1 --- a/make/linux/makefiles/mapfile-vers-product Fri May 30 13:30:07 2014 -0700 6.2 +++ b/make/linux/makefiles/mapfile-vers-product Mon Apr 28 09:27:47 2014 +0200 6.3 @@ -163,6 +163,7 @@ 6.4 JVM_GetStackTraceElement; 6.5 JVM_GetSystemPackage; 6.6 JVM_GetSystemPackages; 6.7 + JVM_GetTemporaryDirectory; 6.8 JVM_GetThreadStateNames; 6.9 JVM_GetThreadStateValues; 6.10 JVM_GetVersionInfo;
7.1 --- a/make/solaris/makefiles/mapfile-vers Fri May 30 13:30:07 2014 -0700 7.2 +++ b/make/solaris/makefiles/mapfile-vers Mon Apr 28 09:27:47 2014 +0200 7.3 @@ -163,6 +163,7 @@ 7.4 JVM_GetStackTraceElement; 7.5 JVM_GetSystemPackage; 7.6 JVM_GetSystemPackages; 7.7 + JVM_GetTemporaryDirectory; 7.8 JVM_GetThreadStateNames; 7.9 JVM_GetThreadStateValues; 7.10 JVM_GetVersionInfo;
8.1 --- a/src/share/vm/prims/jvm.cpp Fri May 30 13:30:07 2014 -0700 8.2 +++ b/src/share/vm/prims/jvm.cpp Mon Apr 28 09:27:47 2014 +0200 8.3 @@ -392,6 +392,23 @@ 8.4 JVM_END 8.5 8.6 8.7 +/* 8.8 + * Return the temporary directory that the VM uses for the attach 8.9 + * and perf data files. 8.10 + * 8.11 + * It is important that this directory is well-known and the 8.12 + * same for all VM instances. It cannot be affected by configuration 8.13 + * variables such as java.io.tmpdir. 8.14 + */ 8.15 +JVM_ENTRY(jstring, JVM_GetTemporaryDirectory(JNIEnv *env)) 8.16 + JVMWrapper("JVM_GetTemporaryDirectory"); 8.17 + HandleMark hm(THREAD); 8.18 + const char* temp_dir = os::get_temp_directory(); 8.19 + Handle h = java_lang_String::create_from_platform_dependent_str(temp_dir, CHECK_NULL); 8.20 + return (jstring) JNIHandles::make_local(env, h()); 8.21 +JVM_END 8.22 + 8.23 + 8.24 // java.lang.Runtime ///////////////////////////////////////////////////////////////////////// 8.25 8.26 extern volatile jint vm_created;
9.1 --- a/src/share/vm/prims/jvm.h Fri May 30 13:30:07 2014 -0700 9.2 +++ b/src/share/vm/prims/jvm.h Mon Apr 28 09:27:47 2014 +0200 9.3 @@ -1485,6 +1485,9 @@ 9.4 JNIEXPORT jobject JNICALL 9.5 JVM_InitAgentProperties(JNIEnv *env, jobject agent_props); 9.6 9.7 +JNIEXPORT jstring JNICALL 9.8 +JVM_GetTemporaryDirectory(JNIEnv *env); 9.9 + 9.10 /* Generics reflection support. 9.11 * 9.12 * Returns information about the given class's EnclosingMethod