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

Jump to bottom

Backport "Enables parsing units for maxsize, fixes units for delay in JfrManager.java" #282

Merged
merged 2 commits into from
Aug 19, 2021
Merged

Backport "Enables parsing units for maxsize, fixes units for delay in JfrManager.java" #282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d65b53
Enables parsing units for maxsize in JfrManager.java
Karm Jul 30, 2021
3e6f3af
Fixes duration unit for days from 'f' to 'd'
Karm Aug 2, 2021
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
56 changes: 41 additions & 15 deletions substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private static void initRecording() {
Boolean disk = parseBoolean(args, JfrStartArgument.Disk);
String path = args.get(JfrStartArgument.Filename);
Long maxAge = parseDuration(args, JfrStartArgument.MaxAge);
Long maxSize = parseLong(args, JfrStartArgument.MaxSize);
Long maxSize = parseMaxSize(args, JfrStartArgument.MaxSize);
Boolean dumpOnExit = parseBoolean(args, JfrStartArgument.DumpOnExit);
Boolean pathToGcRoots = parseBoolean(args, JfrStartArgument.PathToGCRoots);

Expand Down Expand Up @@ -160,19 +160,6 @@ private static Boolean parseBoolean(Map<JfrStartArgument, String> args, JfrStart
}
}

private static Long parseLong(Map<JfrStartArgument, String> args, JfrStartArgument key) throws IllegalArgumentException {
String value = args.get(key);
if (value == null) {
return null;
} else {
try {
return Long.valueOf(value);
} catch (NumberFormatException ex) {
throw UserError.abort("Could not parse JFR argument '" + key.cmdLineKey + "=" + value + "'. Expected a number.");
}
}
}

private static Long parseDuration(Map<JfrStartArgument, String> args, JfrStartArgument key) {
String value = args.get(key);
if (value != null) {
Expand Down Expand Up @@ -206,7 +193,7 @@ private static Long parseDuration(Map<JfrStartArgument, String> args, JfrStartAr
return Duration.ofMinutes(time).toNanos();
} else if ("h".equals(unit)) {
return Duration.ofHours(time).toNanos();
} else if ("f".equals(unit)) {
} else if ("d".equals(unit)) {
return Duration.ofDays(time).toNanos();
}
throw new IllegalArgumentException("Unit is invalid.");
Expand All @@ -217,6 +204,45 @@ private static Long parseDuration(Map<JfrStartArgument, String> args, JfrStartAr
return null;
}

private static Long parseMaxSize(Map<JfrStartArgument, String> args, JfrStartArgument key) {
final String value = args.get(key);
if (value != null) {
try {
int idx = indexOfFirstNonDigitCharacter(value);
long number;
try {
number = Long.parseLong(value.substring(0, idx));
} catch (NumberFormatException e) {
throw new IllegalArgumentException("Expected a number.");
}

// Missing unit, number is plain bytes
if (idx == value.length()) {
return number;
}

final char unit = value.substring(idx).charAt(0);
switch (unit) {
case 'k':
case 'K':
return number * 1024;
case 'm':
case 'M':
return number * 1024 * 1024;
case 'g':
case 'G':
return number * 1024 * 1024 * 1024;
default:
// Unknown unit, number is treated as plain bytes
return number;
}
} catch (IllegalArgumentException e) {
throw UserError.abort("Could not parse JFR argument '" + key.cmdLineKey + "=" + value + "'. " + e.getMessage());
}
}
return null;
}

private static int indexOfFirstNonDigitCharacter(String durationText) {
int idx = 0;
while (idx < durationText.length() && Character.isDigit(durationText.charAt(idx))) {
Expand Down