avoid virtual thread pinning in RestClientsConfig

mariofusco · Jul 16, 2024 · 3f1747b · 3f1747b
1 parent 75b4ed4
commit 3f1747b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/...t-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java b/...t-client-config/runtime/src/main/java/io/quarkus/restclient/config/RestClientsConfig.java
@@ -4,7 +4,10 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Function;
 
+import io.quarkus.bootstrap.runner.VirtualThreadSupport;
 import jakarta.enterprise.inject.CreationException;
 
 import org.eclipse.microprofile.rest.client.ext.QueryParamStyle;
@@ -37,7 +40,7 @@ public class RestClientsConfig {
     // The @Deprecated annotation prevents this field from being included in generated docs. We only want the `configKey` field
     // above to be included.
     @Deprecated
-    private final Map<String, RestClientConfig> configs = new ConcurrentHashMap<>();
+    private final ConcurrentVThreadMap<String, RestClientConfig> configs = new ConcurrentVThreadMap<>();
 
     /**
      * Mode in which the form data are encoded. Possible values are `HTML5`, `RFC1738` and `RFC3986`.
@@ -363,4 +366,33 @@ public static RestClientsConfig getInstance() {
         }
         return configHandle.get();
     }
+
+    private static class ConcurrentVThreadMap<K, V> extends ConcurrentHashMap<K, V> {
+
+        private final ReentrantLock lock = new ReentrantLock();
+
+        @Override
+        public V computeIfAbsent(K key, Function<? super K, ? extends V> mappingFunction) {
+            if (!VirtualThreadSupport.isVirtualThread()) {
+                return super.computeIfAbsent(key, mappingFunction);
+            }
+
+            V value = get(key);
+            return value != null ? value : threadSafePutIfAbsent(key, mappingFunction);
+        }
+
+        private V threadSafePutIfAbsent(K key, Function<? super K, ? extends V> mappingFunction) {
+            lock.lock();
+            try {
+                V value = get(key);
+                if (value == null) {
+                    value = mappingFunction.apply(key);
+                    put(key, value);
+                }
+                return value;
+            } finally {
+                lock.unlock();
+            }
+        }
+    }
 }
diff --git a/...ects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/VirtualThreadSupport.java b/...ects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/VirtualThreadSupport.java
@@ -19,7 +19,7 @@ private static MethodHandle findVirtualMH() {
         }
     }
 
-    static boolean isVirtualThread() {
+    public static boolean isVirtualThread() {
         if (virtualMh == null) {
             return false;
         }
@@ -30,11 +30,11 @@ static boolean isVirtualThread() {
         }
     }
 
-    static int majorVersionFromJavaSpecificationVersion() {
+    private static int majorVersionFromJavaSpecificationVersion() {
         return majorVersion(System.getProperty("java.specification.version", "17"));
     }
 
-    static int majorVersion(String javaSpecVersion) {
+    private static int majorVersion(String javaSpecVersion) {
         String[] components = javaSpecVersion.split("\\.");
         int[] version = new int[components.length];