changeset 1004:9a66e03cd539

7901025: Prepend all internal settings with "jmh."
author shade
date Wed, 10 Sep 2014 17:17:09 +0400
parents df2964b5c7c7
children 76d7ea927d5d
files jmh-core-it/src/test/java/org/openjdk/jmh/it/Fixtures.java jmh-core/src/main/java/org/openjdk/jmh/runner/BaseBenchmarkHandler.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/Fixtures.java	Thu Sep 04 17:16:15 2014 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/Fixtures.java	Wed Sep 10 17:17:09 2014 +0400
@@ -28,7 +28,7 @@
 
 public class Fixtures {
 
-    private static final int REPS = Integer.getInteger("it.reps", 1);
+    private static final int REPS = Integer.getInteger("jmh.it.reps", 1);
 
     public static int repetitionCount() {
         return REPS;
--- a/jmh-core/src/main/java/org/openjdk/jmh/runner/BaseBenchmarkHandler.java	Thu Sep 04 17:16:15 2014 +0400
+++ b/jmh-core/src/main/java/org/openjdk/jmh/runner/BaseBenchmarkHandler.java	Wed Sep 10 17:17:09 2014 +0400
@@ -129,7 +129,7 @@
     }
 
 
-    private static final ExecutorType EXECUTOR_TYPE = Enum.valueOf(ExecutorType.class, System.getProperty("harness.executor", ExecutorType.FIXED_TPE.name()));
+    private static final ExecutorType EXECUTOR_TYPE = Enum.valueOf(ExecutorType.class, System.getProperty("jmh.executor", ExecutorType.FIXED_TPE.name()));
 
     private enum ExecutorType {
 
@@ -189,7 +189,7 @@
         CUSTOM {
             @Override
             ExecutorService createExecutor(int maxThreads, String prefix) throws Exception {
-                String className = System.getProperty("harness.executor.class");
+                String className = System.getProperty("jmh.executor.class");
                 return (ExecutorService) Class.forName(className).getConstructor(int.class, String.class)
                         .newInstance(maxThreads, prefix);
             }