move remaining parallelism tunables to Configuration

fixes #2110

Author: Vladimir Kotal

src/org/opensolaris/opengrok/configuration/Configuration.java

@@ -184,7 +184,7 @@ public final class Configuration {
     private RemoteSCM remoteScmSupported;
     private boolean optimizeDatabase;
     /**
-     * @deprecated This is kept around so not to break object deserialization.
+     * @deprecated This is kept around so not to break object de-serialization.
      * <p>Anyone who is using `--lock on` will now be setting
      * {@link #luceneLocking} and resetting this field back to its default
      * value. This should mean that the configuration is written leaving out
@@ -198,6 +198,8 @@ public final class Configuration {
     private boolean compressXref;
     private boolean indexVersionedFilesOnly;
     private int indexingParallelism;
+    private int historyParallelism;
+    private int historyRenamedParallelism;
     private boolean tagsEnabled;
     private int hitsPerPage;
     private int cachePages;
@@ -1061,6 +1063,22 @@ public void setIndexingParallelism(int value) {
         this.indexingParallelism = value > 0 ? value : 0;
     }
 
+    public int getHistoryParallelism() {
+        return historyParallelism;
+    }
+
+    public void setHistoryParallelism(int value) {
+        this.historyParallelism = value > 0 ? value : 0;
+    }
+    
+    public int getHistoryRenamedParallelism() {
+        return historyRenamedParallelism;
+    }
+
+    public void setHistoryRenamedParallelism(int value) {
+        this.historyRenamedParallelism = value > 0 ? value : 0;
+    }
+    
     public boolean isTagsEnabled() {
         return this.tagsEnabled;
     }

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -178,18 +178,7 @@ public final class RuntimeEnvironment {
     /* Get thread pool used for top-level repository history generation. */
     public static synchronized ExecutorService getHistoryExecutor() {
         if (historyExecutor == null) {
-            int num = Runtime.getRuntime().availableProcessors();
-            String total = System.getProperty("org.opensolaris.opengrok.history.NumCacheThreads");
-            if (total != null) {
-                try {
-                    num = Integer.valueOf(total);
-                } catch (Throwable t) {
-                    LOGGER.log(Level.WARNING, "Failed to parse the number of "
-                            + "cache threads to use for cache creation", t);
-                }
-            }
-
-            historyExecutor = Executors.newFixedThreadPool(num,
+            historyExecutor = Executors.newFixedThreadPool(getInstance().getHistoryParallelism(),
                     new ThreadFactory() {
                 @Override
                 public Thread newThread(Runnable runnable) {
@@ -206,18 +195,7 @@ public Thread newThread(Runnable runnable) {
     /* Get thread pool used for history generation of renamed files. */
     public static synchronized ExecutorService getHistoryRenamedExecutor() {
         if (historyRenamedExecutor == null) {
-            int num = Runtime.getRuntime().availableProcessors();
-            String total = System.getProperty("org.opensolaris.opengrok.history.NumCacheRenamedThreads");
-            if (total != null) {
-                try {
-                    num = Integer.valueOf(total);
-                } catch (Throwable t) {
-                    LOGGER.log(Level.WARNING, "Failed to parse the number of "
-                            + "cache threads to use for cache creation of renamed files", t);
-                }
-            }
-
-            historyRenamedExecutor = Executors.newFixedThreadPool(num,
+            historyRenamedExecutor = Executors.newFixedThreadPool(getInstance().getHistoryRenamedParallelism(),
                     new ThreadFactory() {
                 @Override
                 public Thread newThread(Runnable runnable) {
@@ -1133,6 +1111,28 @@ public int getIndexingParallelism() {
             parallelism;
     }
 
+    /**
+     * Gets the value of {@link Configuration#getHistoryParallelism()} -- or
+     * if zero, then as a default gets the number of available processors.
+     * @return a natural number >= 1
+     */
+    public int getHistoryParallelism() {
+        int parallelism = threadConfig.get().getHistoryParallelism();
+        return parallelism < 1 ? Runtime.getRuntime().availableProcessors() :
+            parallelism;
+    }
+    
+    /**
+     * Gets the value of {@link Configuration#getHistoryRenamedParallelism()} -- or
+     * if zero, then as a default gets the number of available processors.
+     * @return a natural number &gt;= 1
+     */
+    public int getHistoryRenamedParallelism() {
+        int parallelism = threadConfig.get().getHistoryRenamedParallelism();
+        return parallelism < 1 ? Runtime.getRuntime().availableProcessors() :
+            parallelism;
+    }
+    
     public boolean isTagsEnabled() {
         return threadConfig.get().isTagsEnabled();
     }