wip

Author: fogus

src/main/clojure/clojure/core/async.clj

@@ -467,7 +467,7 @@ to catch and handle."
   [f workload]
   (let [c (chan 1)]
     (let [binds (Var/getThreadBindingFrame)]
-      (dispatch/executor-service-call
+      (dispatch/exec
        (fn []
          (Var/resetThreadBindingFrame binds)
          (try

src/main/clojure/clojure/core/async/impl/dispatch.clj

@@ -10,7 +10,7 @@
   clojure.core.async.impl.dispatch
   (:require [clojure.core.async.impl.protocols :as impl]
             [clojure.core.async.impl.exec.threadpool :as tp])
-  (:import [java.util.concurrent ExecutorService]))
+  (:import [java.util.concurrent Executors ExecutorService]))
 
 (set! *warn-on-reflection* true)
 
@@ -38,14 +38,23 @@
       (.uncaughtException (Thread/currentThread) ex))
   nil)
 
+(defonce ^ExecutorService mixed-executor
+  (Executors/newCachedThreadPool (conc/counted-thread-factory "async-mixed-%d" true)))
+
+(defonce ^ExecutorService io-executor
+  (Executors/newCachedThreadPool (conc/counted-thread-factory "async-io-%d" true)))
+
+(defonce ^ExecutorService compute-executor
+  (Executors/newCachedThreadPool (conc/counted-thread-factory "async-compute-%d" true)))
+
 (defn run
   "Runs Runnable r on current thread when :on-caller? meta true, else in a thread pool thread."
   [^Runnable r]
   (if (-> r meta :on-caller?)
     (try (.run r) (catch Throwable t (ex-handler t)))
     (impl/exec @executor r)))
 
-(defn executor-service-call
+(defn exec
   [f exec]
   (let [^ExecutorService e (case exec
                              :compute tp/compute-executor

src/main/clojure/clojure/core/async/impl/exec/threadpool.clj

@@ -9,7 +9,7 @@
 (ns clojure.core.async.impl.exec.threadpool
   (:require [clojure.core.async.impl.protocols :as impl]
             [clojure.core.async.impl.concurrent :as conc])
-  (:import [java.util.concurrent Executors ExecutorService]))
+  (:import [java.util.concurrent Executors]))
 
 (set! *warn-on-reflection* true)
 
@@ -30,12 +30,3 @@
      (reify impl/Executor
        (impl/exec [_ r]
          (.execute executor-svc ^Runnable r))))))
-
-(defonce ^ExecutorService mixed-executor
-  (Executors/newCachedThreadPool (conc/counted-thread-factory "async-mixed-%d" true)))
-
-(defonce ^ExecutorService io-executor
-  (Executors/newCachedThreadPool (conc/counted-thread-factory "async-io-%d" true)))
-
-(defonce ^ExecutorService compute-executor
-  (Executors/newCachedThreadPool (conc/counted-thread-factory "async-compute-%d" true)))