Version 1.4.1 - Add an AffinityThreadFactory to support ExecutorService

peter-lawrey · peter-lawrey · commit db40be156c10 · 2012-01-16T16:45:09.000Z
diff --git a/README b/README
@@ -1,5 +1,7 @@
 [ Version History ]
 
+Version 1.4.1 - Add an AffinityThreadFactory to support ExecutorService
+
 Version 1.4 - Support binding of a whole core for hyper-threaded systems. AffinityLock.acquireCore()
 
 Version 1.3 - Support thread layout strategies for using the same/different socket or cores.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>vanilla.java</groupId>
     <artifactId>affinity</artifactId>
-    <version>1.4</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
 
     <licenses>
diff --git a/src/main/java/vanilla/java/affinity/AffinityThreadFactory.java b/src/main/java/vanilla/java/affinity/AffinityThreadFactory.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2011 Peter Lawrey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package vanilla.java.affinity;
+
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * @author peter.lawrey
+ */
+public class AffinityThreadFactory implements ThreadFactory {
+    private final String name;
+    private final boolean daemon;
+    private final AffinityStrategy[] strategies;
+    private AffinityLock lastAffinityLock = null;
+    private int id = 1;
+
+    public AffinityThreadFactory(String name, AffinityStrategy... strategies) {
+        this(name, true, strategies);
+    }
+
+    public AffinityThreadFactory(String name, boolean daemon, AffinityStrategy... strategies) {
+        this.name = name;
+        this.daemon = daemon;
+        this.strategies = strategies;
+    }
+
+    @Override
+    public synchronized Thread newThread(final Runnable r) {
+        String name2 = id <= 1 ? name : (name + '-' + id);
+        id++;
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                AffinityLock al = lastAffinityLock == null ? AffinityLock.acquireLock() : lastAffinityLock.acquireLock(strategies);
+                try {
+                    lastAffinityLock = al;
+                    r.run();
+                } finally {
+                    al.release();
+                }
+            }
+        }, name2);
+        t.setDaemon(daemon);
+        return t;
+    }
+}
diff --git a/src/test/java/vanilla/java/affinity/AffinityThreadFactoryMain.java b/src/test/java/vanilla/java/affinity/AffinityThreadFactoryMain.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011 Peter Lawrey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package vanilla.java.affinity;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static vanilla.java.affinity.AffinityStrategies.*;
+
+/**
+ * @author peter.lawrey
+ */
+public class AffinityThreadFactoryMain {
+    private static final ExecutorService ES = Executors.newFixedThreadPool(4,
+            new AffinityThreadFactory("bg", SAME_CORE, DIFFERENT_SOCKET, ANY));
+
+    public static void main(String... args) throws InterruptedException {
+        for (int i = 0; i < 12; i++)
+            ES.submit(new Callable<Void>() {
+                @Override
+                public Void call() throws InterruptedException {
+                    Thread.sleep(100);
+                    return null;
+                }
+            });
+        Thread.sleep(200);
+        System.out.println("\nThe assignment of CPUs is\n" + AffinityLock.dumpLocks());
+        ES.shutdown();
+        ES.awaitTermination(1, TimeUnit.SECONDS);
+    }
+}
