Updates from review

jetty · May 3, 2024 · 061be04 · 061be04
1 parent 86ba118
commit 061be04
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml
@@ -9,7 +9,7 @@
   <Call class="org.slf4j.LoggerFactory" name="getLogger">
     <Arg>org.eclipse.jetty</Arg>
     <Call name="info">
-      <Arg>All Virtual threads are enabled.</Arg>
+      <Arg>Virtual threads enabled. Using all virtual threads.</Arg>
     </Call>
   </Call>
 </Configure>
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/TrackingExecutor.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/TrackingExecutor.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.util.component.Dumpable;
 
 @ManagedObject("Tracking Executor wrapper")
-class TrackingExecutor implements Executor, Dumpable
+public class TrackingExecutor implements Executor, Dumpable
 {
     private final Executor _threadFactoryExecutor;
     private final Set<Thread> _threads = ConcurrentHashMap.newKeySet();
@@ -40,14 +40,15 @@ public void execute(Runnable task)
     {
         _threadFactoryExecutor.execute(() ->
         {
+            Thread thread = Thread.currentThread();
             try
             {
-                _threads.add(Thread.currentThread());
+                _threads.add(thread);
                 task.run();
             }
             finally
             {
-                _threads.remove(Thread.currentThread());
+                _threads.remove(thread);
             }
         });
     }

diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java
@@ -38,6 +38,7 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
     private String _name = null;
     private Executor _virtualExecutor;
     private Thread _main;
+    private boolean _externalExecutor;
     private boolean _tracking;
     private boolean _detailedDump;
 
@@ -98,7 +99,7 @@ public void setDetailedDump(boolean detailedDump)
     @Override
     protected void doStart() throws Exception
     {
-        _main = new Thread("virtual main")
+        _main = new Thread("keepalive")
         {
             @Override
             public void run()
@@ -118,10 +119,14 @@ public void run()
         };
         _main.start();
 
-        _virtualExecutor = Objects.requireNonNull(StringUtil.isBlank(_name)
-            ? VirtualThreads.getDefaultVirtualThreadsExecutor()
-            : VirtualThreads.getNamedVirtualThreadsExecutor(_name));
-        if (_tracking)
+        if (_virtualExecutor == null)
+        {
+            _externalExecutor = false;
+            _virtualExecutor = Objects.requireNonNull(StringUtil.isBlank(_name)
+                ? VirtualThreads.getDefaultVirtualThreadsExecutor()
+                : VirtualThreads.getNamedVirtualThreadsExecutor(_name));
+        }
+        if (_tracking && !(_virtualExecutor instanceof TrackingExecutor))
             _virtualExecutor = new TrackingExecutor(_virtualExecutor, _detailedDump);
         addBean(_virtualExecutor);
         super.doStart();
@@ -131,7 +136,9 @@ public void run()
     protected void doStop() throws Exception
     {
         super.doStop();
-        _virtualExecutor = null;
+        removeBean(_virtualExecutor);
+        if (!_externalExecutor)
+            _virtualExecutor = null;
         _main = null;
 
         try (AutoLock.WithCondition l = _joinLock.lock())
@@ -149,7 +156,10 @@ public Executor getVirtualThreadsExecutor()
     @Override
     public void setVirtualThreadsExecutor(Executor executor)
     {
-        throw new UnsupportedOperationException("cannot set VirtualThreadExecutor");
+        if (isRunning())
+            throw new IllegalStateException(getState());
+        _externalExecutor = executor != null;
+        _virtualExecutor = executor;
     }
 
     @Override

diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java
@@ -181,22 +181,15 @@ public void run()
             try
             {
                 _running.countDown();
-
                 while (_spin && getCount() > 0)
                     Thread.onSpinWait();
-
                 if (!await(10, TimeUnit.SECONDS))
                     throw new IllegalStateException();
-
             }
             catch (InterruptedException e)
             {
                 throw new RuntimeException(e);
             }
-            finally
-            {
-                System.err.println("RAN!" + Thread.currentThread());
-            }
         }
     }
 }