Merge branch '1.7-dev' into dev-vthreads-exec

Author: puredanger

README.md

@@ -65,6 +65,8 @@ Copyright © Rich Hickey and contributors
 
 ## Changelog
 
+* Release 1.8.726-beta3 on 2025.03.31
+  * [ASYNC-259](https://clojure.atlassian.net/browse/ASYNC-259) (CLJ) Update `clojure.core.async.go-checking` with new executor pools
 * Release 1.8.718-beta2 on 2025.03.10
   * [ASYNC-259](https://clojure.atlassian.net/browse/ASYNC-259) (CLJ) Implement `clojure.core.async.go-checking` with new executor pools
   * [ASYNC-260](https://clojure.atlassian.net/browse/ASYNC-260) (CLJ) Remove now unused property `clojure.core.async.pool-size`

VERSION_TEMPLATE

@@ -1 +1 @@
-1.8.GENERATED_VERSION-beta2
+1.8.GENERATED_VERSION-beta3

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

@@ -35,13 +35,24 @@
              (.setName (format name-format (swap! counter inc)))
              (.setDaemon daemon))))))))
 
-;; used only for implementing go-checking
-(def ^:private ^:dynamic *in-go-dispatch* false)
+;; go blocking checking
+
+(defonce in-go-dispatch (ThreadLocal.))
+
+(defmacro with-dispatch-thread-marking
+  [& body]
+  (if (Boolean/getBoolean "clojure.core.async.go-checking")
+    `(try
+       (.set in-go-dispatch true)
+       ~@body
+       (finally
+         (.set in-go-dispatch false)))
+    `(do ~@body)))
 
 (defn in-dispatch-thread?
   "Returns true if the current thread is used for go block dispatch"
   []
-  (boolean *in-go-dispatch*))
+  (boolean (.get ^ThreadLocal in-go-dispatch)))
 
 (defn check-blocking-in-dispatch
   "If the current thread is being used for go block dispatch, throw an exception"

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

@@ -1041,23 +1041,19 @@
       second
       (emit-state-machine num-user-params user-transitions))))
 
-(def ^:private go-checking (Boolean/getBoolean "clojure.core.async.go-checking"))
-
 (defn go-impl
   [env body]
-  (let [crossing-env (zipmap (keys env) (repeatedly gensym))
-        run-body `(let [c# (clojure.core.async/chan 1)
-                        captured-bindings# (Var/getThreadBindingFrame)]
-                    (dispatch/run
-                      (^:once fn* []
-                        (let [~@(mapcat (fn [[l sym]] [sym `(^:once fn* [] ~(vary-meta l dissoc :tag))]) crossing-env)
-                              f# ~(state-machine
-                                    `(do ~@body) 1 [crossing-env env] rt/async-custom-terminators)
-                              state# (-> (f#)
-                                       (rt/aset-all! rt/USER-START-IDX c#
-                                         rt/BINDINGS-IDX captured-bindings#))]
-                          (rt/run-state-machine-wrapped state#))))
-                    c#)]
-    (if go-checking
-      (list 'binding ['clojure.core.async.impl.dispatch/*in-go-dispatch* true] run-body)
-      run-body)))
+  (let [crossing-env (zipmap (keys env) (repeatedly gensym))]
+    `(let [c# (clojure.core.async/chan 1)
+           captured-bindings# (Var/getThreadBindingFrame)]
+       (dispatch/run
+         (^:once fn* []
+           (dispatch/with-dispatch-thread-marking
+             (let [~@(mapcat (fn [[l sym]] [sym `(^:once fn* [] ~(vary-meta l dissoc :tag))]) crossing-env)
+                   f# ~(state-machine
+                         `(do ~@body) 1 [crossing-env env] rt/async-custom-terminators)
+                   state# (-> (f#)
+                            (rt/aset-all! rt/USER-START-IDX c#
+                              rt/BINDINGS-IDX captured-bindings#))]
+               (rt/run-state-machine-wrapped state#)))))
+       c#)))