commit 9c17a6d72a3e6dbd1b85f3494db0358c88dc070c
author Thomas Vachuska <tom@onlab.us> Tue Feb 17 23:36:43 2015 -0800
committer Ray Milkey <ray@onlab.us> Wed Feb 18 19:04:51 2015 +0000
tree 0efe4e4f89c7838dd497d0fbb2534eafae649209
parent da36c40e9d2d1229c8fbc63ef96b6927faa42ebf

Adding ability to easily create name thread factories with threads belonging to hierarchical thread groups.

Change-Id: Iaab3251c13e14b73c54a8edc945f5aa476a7ca54

utils/misc/src/main/java/org/onlab/util/Tools.java

diff --git a/utils/misc/src/main/java/org/onlab/util/Tools.java b/utils/misc/src/main/java/org/onlab/util/Tools.java
index 5e28fcd..9e690c0 100644
--- a/utils/misc/src/main/java/org/onlab/util/Tools.java
+++ b/utils/misc/src/main/java/org/onlab/util/Tools.java
@@ -15,16 +15,16 @@
  */
 package org.onlab.util;
 
-import static java.nio.file.Files.delete;
-import static java.nio.file.Files.walkFileTree;
-import static org.slf4j.LoggerFactory.getLogger;
+import com.google.common.base.Strings;
+import com.google.common.primitives.UnsignedLongs;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.slf4j.Logger;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.lang.Thread.UncaughtExceptionHandler;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -38,11 +38,10 @@
 import java.util.List;
 import java.util.concurrent.ThreadFactory;
 
-import org.slf4j.Logger;
-
-import com.google.common.base.Strings;
-import com.google.common.primitives.UnsignedLongs;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import static java.nio.file.Files.delete;
+import static java.nio.file.Files.walkFileTree;
+import static org.onlab.util.GroupedThreadFactory.groupedThreadFactory;
+import static org.slf4j.LoggerFactory.getLogger;
 
 public abstract class Tools {
 
@@ -62,13 +61,25 @@
         return new ThreadFactoryBuilder()
                 .setNameFormat(pattern)
                         // FIXME remove UncaughtExceptionHandler before release
-                .setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+                .setUncaughtExceptionHandler((t, e) -> log.error("Uncaught exception on {}", t.getName(), e)).build();
+    }
 
-                    @Override
-                    public void uncaughtException(Thread t, Throwable e) {
-                        log.error("Uncaught exception on {}", t.getName(), e);
-                    }
-                }).build();
+    /**
+     * Returns a thread factory that produces threads named according to the
+     * supplied name pattern and from the specified thread-group. The thread
+     * group name is expected to be specified in slash-delimited format, e.g.
+     * {@code onos/intent}.
+     *
+     * @param groupName group name in slash-delimited format to indicate hierarchy
+     * @param pattern   name pattern
+     * @return thread factory
+     */
+    public static ThreadFactory groupedThreads(String groupName, String pattern) {
+        return new ThreadFactoryBuilder()
+                .setThreadFactory(groupedThreadFactory(groupName))
+                .setNameFormat(pattern)
+                        // FIXME remove UncaughtExceptionHandler before release
+                .setUncaughtExceptionHandler((t, e) -> log.error("Uncaught exception on {}", t.getName(), e)).build();
     }
 
     /**