Changeset 16995 in josm

Timestamp:

2020-08-31T20:11:46+02:00 (4 years ago)

Author:

simon04

Message:

see #19729, see #19735 - Revert "Main initialization: use ForkJoinPool.commonPool"

This reverts commit r16958

File:

• trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/spi/lifecycle/Lifecycle.java

@@ -6 +6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 
@@ -71 +73 @@
         // Initializes tasks to be executed (in parallel) by a ExecutorService
         try {
-            ExecutorService service = ForkJoinPool.commonPool();
+            ExecutorService service = Executors.newFixedThreadPool(
+                    Runtime.getRuntime().availableProcessors(), Utils.newThreadFactory("main-init-%d", Thread.NORM_PRIORITY));
             for (Future<Void> i : service.invokeAll(initSequence.parallelInitializationTasks())) {
                 i.get();
@@ -78 +81 @@
             initSequence.asynchronousRunnableTasks().forEach(service::submit);
             initSequence.asynchronousCallableTasks().forEach(service::submit);
+            try {
+                service.shutdown();
+            } catch (SecurityException e) {
+                Logging.log(Logging.LEVEL_ERROR, "Unable to shutdown executor service", e);
+            }
         } catch (InterruptedException | ExecutionException ex) {
             throw new JosmRuntimeException(ex);