Fixed ThreadCount for WindowsThreadPool on Clr+Mono

dotnet · Jun 2, 2023 · 0651298 · 0651298
1 parent 3646176
commit 0651298
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPool.Windows.cs
@@ -58,10 +58,6 @@ internal static void InitializeForThreadPoolThread()
             {
                 WindowsThreadPool.InitializeForThreadPoolThread();
             }
-            else
-            {
-                InitializeForThreadPoolThreadPortableCore();
-            }
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -203,8 +199,6 @@ public static long CompletedWorkItemCount
             }
         }
 
-        private static void InitializeForThreadPoolThreadPortableCore() { }
-
         private static RegisteredWaitHandle RegisterWaitForSingleObject(
              WaitHandle waitObject,
              WaitOrTimerCallback callBack,

diff --git a/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPoolCallbackWrapper.cs b/src/libraries/System.Private.CoreLib/src/System/Threading/ThreadPoolCallbackWrapper.cs
@@ -13,6 +13,8 @@ public static ThreadPoolCallbackWrapper Enter()
             if (!currentThread.IsThreadPoolThread)
             {
                 currentThread.IsThreadPoolThread = true;
+                // when using the Windows Threadpool, this is needed to increment the ThreadCount
+                ThreadPool.InitializeForThreadPoolThread();
             }
             return new ThreadPoolCallbackWrapper
             {

diff --git a/src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs b/src/libraries/System.Threading.ThreadPool/tests/ThreadPoolTests.cs
@@ -540,7 +540,7 @@ public void MetricsTest()
                     Assert.True(totalWorkCountToQueue >= 1);
                     waitForWorkStart = true;
                     scheduleWork();
-                    int threadCountLowerBound = UsePortableThreadPool ? totalWorkCountToQueue : 0;
+                    int threadCountLowerBound = UsePortableThreadPool ? totalWorkCountToQueue : 1;
                     Assert.True(ThreadPool.ThreadCount >= threadCountLowerBound);
 
                     int runningWorkItemCount = queuedWorkCount;