diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java index 8a358385820..c3146117141 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Function.java @@ -74,7 +74,7 @@ abstract class Function { } if (aggregator == Aggregator.P90) { - return createPercentile(field, 0.95); + return createPercentile(field, 0.90); } if (aggregator == Aggregator.P95) { diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java index 31f14e35d64..a22c64c931e 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/View.java @@ -102,7 +102,7 @@ public final class View extends Command { public List getOptionSyntax() { List list = new ArrayList<>(); list.add("[--verbose]"); - list.add("[--width "); + list.add("[--width ]"); list.add("[--truncate ]"); list.add("[--cell-height ]"); list.add(""); @@ -138,7 +138,7 @@ public final class View extends Command { if (acceptOption(options, "--width")) { configuration.width = acceptInt(options, "width"); } - if (options.size() == 1) { + if (options.size() == 1 && !options.peek().startsWith("-")) { String view = options.pop(); try (EventStream stream = EventStream.openFile(file)) { ViewPrinter vp = new ViewPrinter(configuration, stream); @@ -149,8 +149,6 @@ public final class View extends Command { couldNotReadError(file, ioe); } } - System.out.println("count:" + optionCount); - System.out.println("size:" + options.size()); if (optionCount == options.size()) { String peek = options.peek(); if (peek == null) { diff --git a/test/jdk/jdk/jfr/tool/TestView.java b/test/jdk/jdk/jfr/tool/TestView.java index bf9cdce8449..fda82939c37 100644 --- a/test/jdk/jdk/jfr/tool/TestView.java +++ b/test/jdk/jdk/jfr/tool/TestView.java @@ -37,7 +37,7 @@ import jdk.test.lib.process.OutputAnalyzer; * & vm.opt.ExplicitGCInvokesConcurrent != false * @library /test/lib /test/jdk * @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:-DisableExplicitGC - * -XX:+UseG1GC jdk.jfr.jcmd.TestJcmdView + * -XX:+UseG1GC jdk.jfr.tool.TestView */ public class TestView {