Skip to content

Commit 84d010a

Browse files
committed
8309928: JFR: View issues
Reviewed-by: mgronlun
1 parent 9872a14 commit 84d010a

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static Function create(Field field) {
7474
}
7575

7676
if (aggregator == Aggregator.P90) {
77-
return createPercentile(field, 0.95);
77+
return createPercentile(field, 0.90);
7878
}
7979

8080
if (aggregator == Aggregator.P95) {

src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void displayOptionUsage(PrintStream stream) {
102102
public List<String> getOptionSyntax() {
103103
List<String> list = new ArrayList<>();
104104
list.add("[--verbose]");
105-
list.add("[--width <integer>");
105+
list.add("[--width <integer>]");
106106
list.add("[--truncate <mode>]");
107107
list.add("[--cell-height <integer>]");
108108
list.add("<view>");
@@ -138,7 +138,7 @@ public void execute(Deque<String> options) throws UserSyntaxException, UserDataE
138138
if (acceptOption(options, "--width")) {
139139
configuration.width = acceptInt(options, "width");
140140
}
141-
if (options.size() == 1) {
141+
if (options.size() == 1 && !options.peek().startsWith("-")) {
142142
String view = options.pop();
143143
try (EventStream stream = EventStream.openFile(file)) {
144144
ViewPrinter vp = new ViewPrinter(configuration, stream);
@@ -149,8 +149,6 @@ public void execute(Deque<String> options) throws UserSyntaxException, UserDataE
149149
couldNotReadError(file, ioe);
150150
}
151151
}
152-
System.out.println("count:" + optionCount);
153-
System.out.println("size:" + options.size());
154152
if (optionCount == options.size()) {
155153
String peek = options.peek();
156154
if (peek == null) {

test/jdk/jdk/jfr/tool/TestView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* & vm.opt.ExplicitGCInvokesConcurrent != false
3838
* @library /test/lib /test/jdk
3939
* @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:-DisableExplicitGC
40-
* -XX:+UseG1GC jdk.jfr.jcmd.TestJcmdView
40+
* -XX:+UseG1GC jdk.jfr.tool.TestView
4141
*/
4242
public class TestView {
4343

0 commit comments

Comments
 (0)