finer-grained vthreads checking

Author: fogus

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

@@ -156,7 +156,7 @@ unset - default to ioc when aot, always
   (let [as (mapv #(list 'quote %) arglist)
         blockingop (-> op name (str "!") symbol)]
     `(def ~(with-meta op {:arglists `(list ~as) :doc doc})
-       (if (dispatch/targetting-vthreads?)
+       (if (dispatch/runtime-vthreads?)
          (fn [~'& ~'args]
            ~(list* apply blockingop '[args]))
          (fn ~arglist
@@ -511,7 +511,7 @@ unset - default to ioc when aot, always
   Returns a channel which will receive the result of the body when
   completed"
   [& body]
-  (if (dispatch/targetting-vthreads?)
+  (if (or (dispatch/aot-vthreads?) (dispatch/runtime-vthreads?))
     `(thread-call (^:once fn* [] ~@body) :io)
     (#'clojure.core.async.impl.go/go-impl &env body)))
 

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

@@ -75,15 +75,17 @@
   [s]
   (= s (System/getProperty "clojure.core.async.vthreads")))
 
-(defn targetting-vthreads? []
-  (or (and aot-compiling? (vthreads-directive-of "target"))
-      (and (not aot-compiling?)
-           (not (vthreads-directive-of "avoid"))
-           virtual-threads-available?)))
+(defn aot-vthreads? []
+  (and aot-compiling? (vthreads-directive-of "target")))
+
+(defn runtime-vthreads? []
+  (and (not aot-compiling?)
+       (not (vthreads-directive-of "avoid"))
+       virtual-threads-available?))
 
 (defn- make-io-executor
   []
-  (if (targetting-vthreads?)
+  (if (runtime-vthreads?)
     (-> (.getDeclaredMethod Executors "newVirtualThreadPerTaskExecutor" (make-array Class 0))
         (.invoke nil (make-array Class 0)))
     (make-ctp-named :io)))