#2955: Ensure minimum thread pool size (v2)

xunit · Jun 22, 2024 · b6dabde · b6dabde
1 parent 5fe01ff
commit b6dabde
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestAssemblyRunner.cs b/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestAssemblyRunner.cs
@@ -318,18 +318,20 @@ private void SetupParallelSemaphore(int maxParallelThreads)
             var minThreads = (int)args[0];
             var minIOPorts = (int)args[1];
 
-            if (minThreads < maxParallelThreads)
+            var threadFloor = Math.Min(4, maxParallelThreads);
+            if (minThreads < threadFloor)
             {
                 var setMethod = type.GetRuntimeMethod("SetMinThreads", new[] { typeof(int), typeof(int) });
                 if (setMethod is null)
                     throw new InvalidOperationException("Cannot find method: System.Threading.ThreadPool.SetMinThreads");
 
-                setMethod.Invoke(null, new object[] { maxParallelThreads, minIOPorts });
+                setMethod.Invoke(null, new object[] { threadFloor, minIOPorts });
             }
 #else
             ThreadPool.GetMinThreads(out var minThreads, out var minIOPorts);
-            if (minThreads < maxParallelThreads)
-                ThreadPool.SetMinThreads(maxParallelThreads, minIOPorts);
+            var threadFloor = Math.Min(4, maxParallelThreads);
+            if (minThreads < threadFloor)
+                ThreadPool.SetMinThreads(threadFloor, minIOPorts);
 #endif
         }