Revert "[new] [Server] Add experimental support for Java 19 virtual t…

…hreads" This reverts commit c37f779.
http-kit · Mar 9, 2023 · 23aa09f · 23aa09f
1 parent c37f779
commit 23aa09f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/src/org/httpkit/server.clj b/src/org/httpkit/server.clj
@@ -1,8 +1,7 @@
 (ns org.httpkit.server
   (:require
    [clojure.string :as str]
-   [org.httpkit.encode :refer [base64-encode]]
-   [org.httpkit.utils :as utils])
+   [org.httpkit.encode :refer [base64-encode]])
 
   (:import
    [org.httpkit.server AsyncChannel HttpServer RingHandler ProxyProtocolOption HttpServer$AddressFinder HttpServer$ServerChannelFactory]
@@ -43,10 +42,6 @@
   ([http-server     ] (-server-stop! http-server nil))
   ([http-server opts] (-server-stop! http-server opts)))
 
-(def ^:private ^:experimental get-virtual-executor
-  (utils/try-eval
-    (fn [] (java.util.concurrent.Executors/newVirtualThreadPerTaskExecutor))))
-
 (defn run-server
   "Starts a mostly[1] Ring-compatible HttpServer with options:
 
@@ -137,14 +132,7 @@
 
         ^org.httpkit.server.IHandler h
         (if worker-pool
-          (let [worker-pool
-                (if (= worker-pool :experimental/virtual)
-                  (if-let [f get-virtual-executor]
-                    (f)
-                    (throw (ex-info "No virtual threads support detected" {})))
-                  worker-pool)]
-
-            (RingHandler. handler worker-pool err-logger evt-logger evt-names server-header))
+          (RingHandler. handler worker-pool err-logger evt-logger evt-names server-header)
           (RingHandler. thread handler worker-name-prefix queue-size server-header err-logger evt-logger evt-names))
 
         ^ProxyProtocolOption proxy-enum

diff --git a/src/org/httpkit/utils.clj b/src/org/httpkit/utils.clj
@@ -24,17 +24,3 @@
   (delay (parse-java-version (str (System/getProperty "java.version")))))
 
 (defn java-version>= [n] (>= ^long @java-version_ (long n)))
-
-(defmacro compile-if
-  "Evaluates `test`. If it returns logical true (and doesn't throw), expands
-  to `then`, otherwise expands to `else`."
-  ;; Copied from `taoensso.encore`
-  [test then else]
-  (if (try (eval test) (catch Throwable _ false))
-    `(do ~then)
-    `(do ~else)))
-
-(defmacro try-eval
-  "Evaluates `form`. If eval doesn't throw, expands to `form`, otherwise to nil."
-  ;; Copied from `taoensso.encore`
-  [form] `(compile-if ~form ~form nil))