infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-06 16:38:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8206004: [BACKOUT] errant changeset for JDK-8137164

Browse Source 
Reviewed-by: dcubed, egahlin
This commit is contained in:
Daniel D. Daugherty 2018-06-28 10:46:05 -04:00
parent 7f3a801cae
commit dd581def6f
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
View File

@ -39,7 +39,6 @@ import java.util.List;
import jdk.jfr.FlightRecorder;
import jdk.jfr.Recording;
import jdk.jfr.internal.JVM;
import jdk.jfr.internal.SecuritySupport;
import jdk.jfr.internal.SecuritySupport.SafePath;
import jdk.jfr.internal.Utils;
@ -66,17 +65,9 @@ abstract class AbstractDCmd {
return result.toString();
}
public String getPid() {
// Invoking ProcessHandle.current().pid() would require loading more
// classes during startup so instead JVM.getJVM().getPid() is used.
// The pid will not be exposed to running Java application, only when starting
// JFR from command line (-XX:StartFlightRecordin) or jcmd (JFR.start and JFR.check)
return JVM.getJVM().getPid();
}
protected final SafePath resolvePath(Recording recording, String filename) throws InvalidPathException {
if (filename == null) {
return makeGenerated(recording, Paths.get("."));
return makeGenerated(recording, Paths.get("."));
}
Path path = Paths.get(filename);
if (Files.isDirectory(path)) {

2
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdCheck.java
View File

@ -80,7 +80,7 @@ final class DCmdCheck extends AbstractDCmd {
if (!verbose && recordings.isEmpty()) {
println("No available recordings.");
println();
println("Use jcmd " + getPid() + " JFR.start to start a recording.");
println("Use JFR.start to start a recording.");
return;
}
boolean first = true;

3
src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
View File

@ -220,13 +220,12 @@ final class DCmdStart extends AbstractDCmd {
if (name != null) {
recordingspecifier = "name=" + quoteIfNeeded(name);
}
print("Use jcmd " + getPid() + " JFR." + cmd + " " + recordingspecifier + " " + fileOption + "to copy recording data to file.");
print("Use JFR." + cmd + " " + recordingspecifier + " " + fileOption + "to copy recording data to file.");
println();
}
return getResult();
}
// Instruments JDK-events on class load to reduce startup time
private void initializeWithForcedInstrumentation(Map<String, String> settings) {
if (!hasJDKEvents(settings)) {

2
test/jdk/jdk/jfr/jcmd/TestJcmdStartStopDefault.java
View File

@ -66,7 +66,7 @@ public class TestJcmdStartStopDefault {
// Use JFR.dump name=recording-1 filename=FILEPATH to copy recording data to file.
String stdout = output.getStdout();
Pattern p = Pattern.compile(".*Use jcmd \\d+ JFR.dump name=(\\S+).*", Pattern.DOTALL);
Pattern p = Pattern.compile(".*Use JFR.dump name=(\\S+).*", Pattern.DOTALL);
Matcher m = p.matcher(stdout);
Asserts.assertTrue(m.matches(), "Could not parse recording name");
String name = m.group(1);