changeset 143:17b018e40f33

Deprecate and remove -tl (trace level) option.
author shade
date Fri, 23 Aug 2013 18:00:09 +0400
parents 197a3dcf3c1f
children ad7c8952983b
files jmh-core/src/main/java/org/openjdk/jmh/output/OutputFormatFactory.java jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java
diffstat 3 files changed, 3 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core/src/main/java/org/openjdk/jmh/output/OutputFormatFactory.java	Fri Aug 23 16:44:34 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/output/OutputFormatFactory.java	Fri Aug 23 18:00:09 2013 +0400
@@ -43,10 +43,7 @@
      * @param format Format enum to use
      * @return a new OutputFormat instance of given type
      */
-    public static OutputFormat createFormatInstance(PrintStream out, OutputFormatType format, int traceLevel, boolean verbose) {
-        // force verbose if non-default trace level is requested
-        if (traceLevel > 0) { verbose = true; }
-
+    public static OutputFormat createFormatInstance(PrintStream out, OutputFormatType format, boolean verbose) {
         assert (format != null) : "format is not null";
 
         switch (format) {
@@ -82,7 +79,7 @@
     }
 
     public static OutputFormat createFormatInstance(boolean verbose) {
-        return createFormatInstance(System.out, OutputFormatType.Pretty, 0, verbose);
+        return createFormatInstance(System.out, OutputFormatType.Pretty, verbose);
     }
 
 }
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java	Fri Aug 23 16:44:34 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/Runner.java	Fri Aug 23 18:00:09 2013 +0400
@@ -88,7 +88,7 @@
             }
         }
 
-        return OutputFormatFactory.createFormatInstance(out, options.getOutputFormat(), options.getTraceLevel(), options.isVerbose());
+        return OutputFormatFactory.createFormatInstance(out, options.getOutputFormat(), options.isVerbose());
     }
 
     /** Main entry point */
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java	Fri Aug 23 16:44:34 2013 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/options/BaseOptions.java	Fri Aug 23 18:00:09 2013 +0400
@@ -99,9 +99,6 @@
     @Option(name = "-v", aliases = {"--verbose"}, usage = "Verbose mode, default off", handler = BooleanOptionHandler.class)
     protected boolean verbose = false;
 
-    @Option(name = "-tl", aliases = {"--tracelevel"}, usage = "Trace level, default 0")
-    protected int traceLevel = -1;
-
     @Option(name = "-odr", aliases = {"--outputdetailedresults"}, usage = "Output detailed results. Default is false", handler = BooleanOptionHandler.class)
     protected boolean outputDetailedResults = false;
 
@@ -404,15 +401,6 @@
     }
 
     /**
-     * Getter
-     *
-     * @return the value
-     */
-    public int getTraceLevel() {
-        return traceLevel;
-    }
-
-    /**
      * Should fail the harness on test error?
      * @return the value
      */