diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ExecutorsFactory.java b/webserver/webserver/src/main/java/io/helidon/webserver/ExecutorsFactory.java new file mode 100644 index 00000000000..07bf2a26aef --- /dev/null +++ b/webserver/webserver/src/main/java/io/helidon/webserver/ExecutorsFactory.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2024 Oracle and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.helidon.webserver; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; + +import io.helidon.common.task.HelidonTaskExecutor; + +/** + * Encapsulates operations with {@link Executors}. Helps to workaround + * limitations of GraalVM for JDK21 which doesn't support execution of + * virtual threads and Graal.js code together. New versions of GraalVM + * don't have this limitation, but for those who stick with JDK21, this + * is a serious limitations in using Helidon 4.0.x + *

+ * By moving these "factories" into separate class, it is easier + * to use GraalVM's `@Substitute` mechanism and get Helidon and Graal.js working + * on GraalVM for JDK21. More info + * available in PR-10783. + */ +final class ExecutorsFactory { + + private ExecutorsFactory() { + } + + /** + * Used by {@link LoomServer} to allocate its executor service. + * + * @return {@link Executors#newVirtualThreadPerTaskExecutor()} + */ + static ExecutorService newLoomServerVirtualThreadPerTaskExecutor() { + return Executors.newVirtualThreadPerTaskExecutor(); + } + + /** + * Used by {@link ServerListener} to allocate its reader executor. + * + * @return {@link ThreadPerTaskExecutor#create(java.util.concurrent.ThreadFactory)} + */ + static HelidonTaskExecutor newServerListenerReaderExecutor() { + return ThreadPerTaskExecutor.create(virtualThreadFactory()); + } + + /** + * Used by {@link ServerListener} to allocate its shared executor. + * + * @return {@link Executors#newThreadPerTaskExecutor(java.util.concurrent.ThreadFactory)}. + */ + static ExecutorService newServerListenerSharedExecutor() { + return Executors.newThreadPerTaskExecutor(virtualThreadFactory()); + } + + private static ThreadFactory virtualThreadFactory() { + return Thread.ofVirtual().factory(); + } +} diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java b/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java index a9d0bebf800..ee5e28c6f6b 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java @@ -25,7 +25,6 @@ import java.util.Timer; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -71,7 +70,7 @@ class LoomServer implements WebServer { .id("web-" + WEBSERVER_COUNTER.getAndIncrement()) .build()); this.serverConfig = serverConfig; - this.executorService = Executors.newVirtualThreadPerTaskExecutor(); + this.executorService = ExecutorsFactory.newLoomServerVirtualThreadPerTaskExecutor(); Map sockets = new HashMap<>(serverConfig.sockets()); sockets.put(DEFAULT_SOCKET_NAME, serverConfig); diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ServerListener.java b/webserver/webserver/src/main/java/io/helidon/webserver/ServerListener.java index c5e0761f7a1..31e3fd9e799 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/ServerListener.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/ServerListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; @@ -143,12 +142,10 @@ class ServerListener implements ListenerContext { .unstarted(this::listen); // to read requests and execute tasks - this.readerExecutor = ThreadPerTaskExecutor.create(Thread.ofVirtual() - .factory()); + this.readerExecutor = ExecutorsFactory.newServerListenerReaderExecutor(); // to do anything else (writers etc.) - this.sharedExecutor = Executors.newThreadPerTaskExecutor(Thread.ofVirtual() - .factory()); + this.sharedExecutor = ExecutorsFactory.newServerListenerSharedExecutor(); this.closeFuture = new CompletableFuture<>();