stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7132199: sun/management/jmxremote/bootstrap/JvmstatCountersTest.java failing on all platforms

Browse Source 
Make sure HotSpot and JDK looks for well-known files in the same location

Reviewed-by: dholmes, dsamersoff
This commit is contained in:
Staffan Larsen 2012-01-31 10:46:34 +01:00
parent 45569b3a65
commit c3ee1cf7f9
3 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java
View File

@ -37,8 +37,12 @@ import java.util.Properties;
* Linux implementation of HotSpotVirtualMachine
*/
public class LinuxVirtualMachine extends HotSpotVirtualMachine {
// temp directory for socket file
private static final String tmpdir = System.getProperty("java.io.tmpdir");
// "/tmp" is used as a global well-known location for the files
// .java_pid<pid>. and .attach_pid<pid>. It is important that this
// location is the same for all processes, otherwise the tools
// will not be able to find all Hotspot processes.
// Any changes to this needs to be synchronized with HotSpot.
private static final String tmpdir = "/tmp";
// Indicates if this machine uses the old LinuxThreads
static boolean isLinuxThreads;
@ -261,20 +265,12 @@ public class LinuxVirtualMachine extends HotSpotVirtualMachine {
}
// Return the socket file for the given process.
// Checks working directory of process for .java_pid<pid>. If not
// found it looks in temp directory.
private String findSocketFile(int pid) {
// First check for a .java_pid<pid> file in the working directory
// of the target process
String fn = ".java_pid" + pid;
String path = "/proc/" + pid + "/cwd/" + fn;
File f = new File(path);
File f = new File(tmpdir, ".java_pid" + pid);
if (!f.exists()) {
// Not found, so try temp directory
f = new File(tmpdir, fn);
path = f.exists() ? f.getPath() : null;
return null;
}
return path;
return f.getPath();
}
// On Solaris/Linux a simple handshake is used to start the attach mechanism

26
jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java
View File

@ -38,11 +38,12 @@ import java.util.Properties;
* Solaris implementation of HotSpotVirtualMachine.
*/
public class SolarisVirtualMachine extends HotSpotVirtualMachine {
// Use /tmp instead of /var/tmp on Solaris as /tmp is the default used by
// HotSpot when the property is not set on the command line.
private static final String tmpdir1 = System.getProperty("java.io.tmpdir");
private static final String tmpdir =
(tmpdir1.equals("/var/tmp") || tmpdir1.equals("/var/tmp/")) ? "/tmp" : tmpdir1;
// "/tmp" is used as a global well-known location for the files
// .java_pid<pid>. and .attach_pid<pid>. It is important that this
// location is the same for all processes, otherwise the tools
// will not be able to find all Hotspot processes.
// Any changes to this needs to be synchronized with HotSpot.
private static final String tmpdir = "/tmp";
// door descriptor;
private int fd = -1;
@ -191,19 +192,10 @@ public class SolarisVirtualMachine extends HotSpotVirtualMachine {
}
}
// The door is attached to .java_pid<pid> in the target VM's working
// directory or temporary directory.
// The door is attached to .java_pid<pid> in the temporary directory.
private int openDoor(int pid) throws IOException {
// First check for a .java_pid<pid> file in the working directory
// of the target process
String fn = ".java_pid" + pid;
String path = "/proc/" + pid + "/cwd/" + fn;
try {
fd = open(path);
} catch (FileNotFoundException fnf) {
path = tmpdir + "/" + fn;
fd = open(path);
}
String path = tmpdir + "/.java_pid" + pid;;
fd = open(path);
// Check that the file owner/permission to avoid attaching to
// bogus process

3
jdk/test/ProblemList.txt
View File

@ -284,9 +284,6 @@ sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh generic-all
# Windows X64, java.lang.IllegalStateException
javax/management/monitor/AttributeArbitraryDataTypeTest.java generic-all
# 7132199
sun/management/jmxremote/bootstrap/JvmstatCountersTest.java generic-all
############################################################################
# jdk_math