Changeset 8734 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-09-08T15:20:34+02:00 (9 years ago)

Author:

simon04

Message:

see #11843 - Give all started threads sensible names

Utils#newThreadFactory creates a ThreadFactory to be used when
obtaining a new Executor via Executors.new….

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (1 diff)
• Utils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -198 +198 @@
     private static final Map<Image, Map<Long, ImageResource>> ROTATE_CACHE = new HashMap<>();
 
-    private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
+    private static final ExecutorService IMAGE_FETCHER =
+            Executors.newSingleThreadExecutor(Utils.newThreadFactory("image-fetcher-%d", Thread.NORM_PRIORITY));
 
     /**

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -47 +47 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1268 +1269 @@
 
     /**
+     * Creates a new {@link ThreadFactory} which creates threads with names according to {@code nameFormat}.
+     * @param nameFormat a {@link String#format(String, Object...)} compatible name format; its first argument is a unique thread index
+     * @param threadPriority the priority of the created threads, see {@link Thread#setPriority(int)}
+     * @return a new {@link ThreadFactory}
+     */
+    public static ThreadFactory newThreadFactory(final String nameFormat, final int threadPriority) {
+        final String ignore = String.format(Locale.ENGLISH, nameFormat, 0);// fail fast
+        return new ThreadFactory() {
+            final AtomicLong count = new AtomicLong(0);
+            @Override
+            public Thread newThread(final Runnable runnable) {
+                final Thread thread = new Thread(runnable, String.format(Locale.ENGLISH, nameFormat, count.getAndIncrement()));
+                thread.setPriority(threadPriority);
+                return thread;
+            }
+        };
+    }
+
+    /**
      * Returns a pair containing the number of threads (n), and a thread pool (if n > 1) to perform
      * multi-thread computation in the context of the given preference key.
      * @param pref The preference key
+     * @param nameFormat see {@link #newThreadFactory(String, int)}
+     * @param threadPriority see {@link #newThreadFactory(String, int)}
      * @return a pair containing the number of threads (n), and a thread pool (if n > 1, null otherwise)
      * @since 7423
      */
-    public static Pair<Integer, ExecutorService> newThreadPool(String pref) {
+    public static Pair<Integer, ExecutorService> newThreadPool(String pref, String nameFormat, int threadPriority) {
         int noThreads = Main.pref.getInteger(pref, Runtime.getRuntime().availableProcessors());
-        ExecutorService pool = noThreads <= 1 ? null : Executors.newFixedThreadPool(noThreads);
+        ExecutorService pool = noThreads <= 1 ? null : Executors.newFixedThreadPool(noThreads, newThreadFactory(nameFormat, threadPriority));
         return new Pair<>(noThreads, pool);
     }
@@ -1427 +1449 @@
         return hashMapInitialCapacity(nEntries, 0.75f);
     }
-
-    /**
-     * @param name to be set for the threads
-     * @return Thread Factory returning named threads
-     */
-    public static ThreadFactory getNamedThreadFactory(final String name) {
-        return new ThreadFactory() {
-            @Override
-            public Thread newThread(Runnable r) {
-                Thread t = Executors.defaultThreadFactory().newThread(r);
-                t.setName(name);
-                return t;
-            }
-        };
-    }
 }