Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JFR dump to Jcmd current working directory by default #21076

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JFR dump to Jcmd current working directory by default #21076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 57 additions & 4 deletions jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@

package openj9.internal.tools.attach.target;

import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -144,6 +148,9 @@ public class DiagnosticUtils {
private static final String DIAGNOSTICS_JFR_START = "JFR.start";
private static final String DIAGNOSTICS_JFR_DUMP = "JFR.dump";
private static final String DIAGNOSTICS_JFR_STOP = "JFR.stop";

private static final int ERROR_NO_TIME_UNIT = -1;
private static final int ERROR_NO_TIME_DURATION = -2;
/*[ENDIF] JFR_SUPPORT */

/**
Expand Down Expand Up @@ -209,7 +216,39 @@ public static String makeThreadPrintCommand(boolean lockedSynchronizers) {
* @return formatted string
*/
public static String makeJcmdCommand(String[] options, int skip) {
String cmd = String.join(DIAGNOSTICS_OPTION_SEPARATOR, Arrays.asList(options).subList(skip, options.length));
int optionsLength = options.length;
/*[IF JFR_SUPPORT]*/
if (optionsLength >= 2) {
// there is a jcmd command
if (DIAGNOSTICS_JFR_START.equalsIgnoreCase(options[1])) {
// search JFR.start options
for (int i = 2; i < optionsLength; i++) {
String option = options[i];
IPC.logMessage("makeJcmdCommand: option = ", option);
if (option.startsWith("filename=")) {
String fileName = option.substring(option.indexOf("=") + 1);
try {
Path filePath = Paths.get(fileName);
if (!filePath.isAbsolute()) {
// default recording file path is jcmd current working directory
String jcmdPWD = Paths.get("").toAbsolutePath().toString();
fileName = jcmdPWD + File.separator + fileName;
IPC.logMessage("makeJcmdCommand: absolute filename = ", fileName);
// replace existing entry with an absolute jcmd pwd path for the target VM
options[i] = "filename=" + fileName;
}
} catch (InvalidPathException ipe) {
// ignore this exception and keep the original entry
IPC.logMessage("makeJcmdCommand: ipe = ", ipe.getMessage());
}
// only one filename is allowed
break;
}
}
}
}
/*[ENDIF] JFR_SUPPORT */
String cmd = String.join(DIAGNOSTICS_OPTION_SEPARATOR, Arrays.asList(options).subList(skip, optionsLength));
return cmd;
}

Expand Down Expand Up @@ -415,13 +454,25 @@ private static long convertToMilliseconds(String timeValue) {
timeInMilli = TimeUnit.DAYS.toMillis(time);
break;
default:
// no unit or unrecognized unit, assume milliseconds
timeInMilli = time;
// no unit or unrecognized unit, return ERROR_NO_TIME_UNIT
timeInMilli = ERROR_NO_TIME_UNIT;
break;
}
return timeInMilli;
}

/**
* Parse a time parameter, and return the duration in milliseconds.
* If the time unit is missing, ERROR_NO_TIME_UNIT is returned.
* If the paramName is not in parameters, ERROR_NO_TIME_DURATION is returned.
*
* @param paramName the parameter name
* @param parameters the parameter array
*
* @return the duration in milliseconds,
* ERROR_NO_TIME_UNIT if no time unit,
* ERROR_NO_TIME_DURATION if paramName wasn't found.
*/
private static long parseTimeParameter(String paramName, String[] parameters) {
for (String param : parameters) {
if (param.startsWith(paramName + "=")) {
Expand All @@ -431,7 +482,7 @@ private static long parseTimeParameter(String paramName, String[] parameters) {
}
}
}
return -1;
return ERROR_NO_TIME_DURATION;
}

private static String parseStringParameter(String paramName, String[] parameters, String defaultValue) {
Expand Down Expand Up @@ -488,6 +539,8 @@ public void run() {
}
};
timer.schedule(jfrDumpTask, duration);
} if (duration == ERROR_NO_TIME_UNIT) {
return DiagnosticProperties.makeErrorProperties("The duration doesn't have a time unit.");
} else {
// the recording is on until JFR.stop
}
Expand Down