changeset 5808:bf47dae82737

Merge
author asaha
date Tue, 18 Nov 2014 08:37:36 -0800
parents 6c8949f0d39d 1166d5118d6d
children 90507198bf02
files .hgtags
diffstat 8 files changed, 28 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Nov 11 15:35:04 2014 -0800
+++ b/.hgtags	Tue Nov 18 08:37:36 2014 -0800
@@ -761,6 +761,7 @@
 2ec4b796b1de3cfe58f051111dfd70ab367e553e jdk7u75-b06
 1d3906064cae18fdb0ff9a2045f2d8d48067bcd1 jdk7u75-b07
 dfcf951330b6f7c1a3cb88c819e94f680054a970 jdk7u75-b08
+ca20e7886db63792593f048f7308aed383775829 jdk7u75-b09
 3c01618f40c059bf192c0b16176b144113965ea7 jdk7u76-b00
 7b5d132c3a70f3c0667fe9df4cae045b46673267 jdk7u76-b01
 10c2cb5743cac7d6fedc9307af8450283367e5e2 jdk7u76-b02
@@ -770,5 +771,6 @@
 8580db8e38a232978f69fe627f3373e12c467803 jdk7u76-b06
 475a5cf6fc80c085c1be11b502ef44e7206c73d3 jdk7u76-b07
 64a7fa638019deebae59be4a4a262cfa1d7947ad jdk7u76-b08
+103eec0b084f7dfa0afce1ed9adebd6a9fab1aa8 jdk7u76-b09
 2480d9d778301a3f88b0ab8ee35a585df82528e5 jdk7u79-b00
 
--- a/make/bsd/makefiles/mapfile-vers-debug	Tue Nov 11 15:35:04 2014 -0800
+++ b/make/bsd/makefiles/mapfile-vers-debug	Tue Nov 18 08:37:36 2014 -0800
@@ -158,6 +158,7 @@
                 _JVM_GetStackTraceElement
                 _JVM_GetSystemPackage
                 _JVM_GetSystemPackages
+                _JVM_GetTemporaryDirectory
                 _JVM_GetThreadStateNames
                 _JVM_GetThreadStateValues
                 _JVM_GetVersionInfo
--- a/make/bsd/makefiles/mapfile-vers-product	Tue Nov 11 15:35:04 2014 -0800
+++ b/make/bsd/makefiles/mapfile-vers-product	Tue Nov 18 08:37:36 2014 -0800
@@ -158,6 +158,7 @@
                 _JVM_GetStackTraceElement
                 _JVM_GetSystemPackage
                 _JVM_GetSystemPackages
+                _JVM_GetTemporaryDirectory
                 _JVM_GetThreadStateNames
                 _JVM_GetThreadStateValues
                 _JVM_GetVersionInfo
--- a/make/linux/makefiles/mapfile-vers-debug	Tue Nov 11 15:35:04 2014 -0800
+++ b/make/linux/makefiles/mapfile-vers-debug	Tue Nov 18 08:37:36 2014 -0800
@@ -123,7 +123,7 @@
                 JVM_GetClassModifiers;
                 JVM_GetClassName;
                 JVM_GetClassNameUTF;
-		JVM_GetClassSignature;
+                JVM_GetClassSignature;
                 JVM_GetClassSigners;
                 JVM_GetComponentType;
                 JVM_GetDeclaredClasses;
@@ -160,6 +160,7 @@
                 JVM_GetStackTraceElement;
                 JVM_GetSystemPackage;
                 JVM_GetSystemPackages;
+                JVM_GetTemporaryDirectory;
                 JVM_GetThreadStateNames;
                 JVM_GetThreadStateValues;
                 JVM_GetVersionInfo;
--- a/make/linux/makefiles/mapfile-vers-product	Tue Nov 11 15:35:04 2014 -0800
+++ b/make/linux/makefiles/mapfile-vers-product	Tue Nov 18 08:37:36 2014 -0800
@@ -160,6 +160,7 @@
                 JVM_GetStackTraceElement;
                 JVM_GetSystemPackage;
                 JVM_GetSystemPackages;
+                JVM_GetTemporaryDirectory;
                 JVM_GetThreadStateNames;
                 JVM_GetThreadStateValues;
                 JVM_GetVersionInfo;
--- a/make/solaris/makefiles/mapfile-vers	Tue Nov 11 15:35:04 2014 -0800
+++ b/make/solaris/makefiles/mapfile-vers	Tue Nov 18 08:37:36 2014 -0800
@@ -160,6 +160,7 @@
 		JVM_GetStackTraceElement;
 		JVM_GetSystemPackage;
 		JVM_GetSystemPackages;
+		JVM_GetTemporaryDirectory;
 		JVM_GetThreadStateNames;
 		JVM_GetThreadStateValues;
 		JVM_GetVersionInfo;
--- a/src/share/vm/prims/jvm.cpp	Tue Nov 11 15:35:04 2014 -0800
+++ b/src/share/vm/prims/jvm.cpp	Tue Nov 18 08:37:36 2014 -0800
@@ -388,6 +388,23 @@
 JVM_END
 
 
+/*
+ * Return the temporary directory that the VM uses for the attach
+ * and perf data files.
+ *
+ * It is important that this directory is well-known and the
+ * same for all VM instances. It cannot be affected by configuration
+ * variables such as java.io.tmpdir.
+ */
+JVM_ENTRY(jstring, JVM_GetTemporaryDirectory(JNIEnv *env))
+  JVMWrapper("JVM_GetTemporaryDirectory");
+  HandleMark hm(THREAD);
+  const char* temp_dir = os::get_temp_directory();
+  Handle h = java_lang_String::create_from_platform_dependent_str(temp_dir, CHECK_NULL);
+  return (jstring) JNIHandles::make_local(env, h());
+JVM_END
+
+
 // java.lang.Runtime /////////////////////////////////////////////////////////////////////////
 
 extern volatile jint vm_created;
--- a/src/share/vm/prims/jvm.h	Tue Nov 11 15:35:04 2014 -0800
+++ b/src/share/vm/prims/jvm.h	Tue Nov 18 08:37:36 2014 -0800
@@ -1477,6 +1477,9 @@
 JNIEXPORT jobject JNICALL
 JVM_InitAgentProperties(JNIEnv *env, jobject agent_props);
 
+JNIEXPORT jstring JNICALL
+JVM_GetTemporaryDirectory(JNIEnv *env);
+
 /* Generics reflection support.
  *
  * Returns information about the given class's EnclosingMethod