WIP: Move portable thread pool and timer implementation to shared partition

src/Native/System.Private.CoreLib.Native/pal_time.cpp

@@ -141,89 +141,3 @@ extern "C" uint64_t CoreLibNative_GetTickCount64()
 #endif
     return retval;
 }
-
-
-struct ProcessCpuInformation
-{
-    uint64_t lastRecordedCurrentTime;
-    uint64_t lastRecordedKernelTime;
-    uint64_t lastRecordedUserTime;
-};
-
-
-/*
-Function:
-CoreLibNative_GetCpuUtilization
-
-The main purpose of this function is to compute the overall CPU utilization
-for the CLR thread pool to regulate the number of worker threads.
-Since there is no consistent API on Unix to get the CPU utilization
-from a user process, getrusage and gettimeofday are used to
-compute the current process's CPU utilization instead.
-
-*/
-
-static long numProcessors = 0;
-extern "C" int32_t CoreLibNative_GetCpuUtilization(ProcessCpuInformation* previousCpuInfo)
-{
-    if (numProcessors <= 0)
-    {
-        numProcessors = sysconf(_SC_NPROCESSORS_CONF);
-        if (numProcessors <= 0)
-        {
-            return 0;
-        }
-    }
-
-    uint64_t kernelTime = 0;
-    uint64_t userTime = 0;
-
-    struct rusage resUsage;
-    if (getrusage(RUSAGE_SELF, &resUsage) == -1)
-    {
-        assert(false);
-        return 0;
-    }
-    else
-    {
-        kernelTime = TimeValToNanoseconds(resUsage.ru_stime);
-        userTime = TimeValToNanoseconds(resUsage.ru_utime);
-    }
-
-    uint64_t currentTime = CoreLibNative_GetHighPrecisionCount() * NanosecondsPerSecond / CoreLibNative_GetHighPrecisionCounterFrequency();
-
-    uint64_t lastRecordedCurrentTime = previousCpuInfo->lastRecordedCurrentTime;
-    uint64_t lastRecordedKernelTime = previousCpuInfo->lastRecordedKernelTime;
-    uint64_t lastRecordedUserTime = previousCpuInfo->lastRecordedUserTime;
-
-    uint64_t cpuTotalTime = 0;
-    if (currentTime > lastRecordedCurrentTime)
-    {
-        // cpuTotalTime is based on clock time. Since multiple threads can run in parallel,
-        // we need to scale cpuTotalTime cover the same amount of total CPU time.
-        // rusage time is already scaled across multiple processors.
-        cpuTotalTime = (currentTime - lastRecordedCurrentTime);
-        cpuTotalTime *= numProcessors;
-    }
-
-    uint64_t cpuBusyTime = 0;
-    if (userTime >= lastRecordedUserTime && kernelTime >= lastRecordedKernelTime)
-    {
-        cpuBusyTime = (userTime - lastRecordedUserTime) + (kernelTime - lastRecordedKernelTime);
-    }
-
-    int32_t cpuUtilization = 0;
-    if (cpuTotalTime > 0 && cpuBusyTime > 0)
-    {
-        cpuUtilization = static_cast<int32_t>(cpuBusyTime / cpuTotalTime);
-    }
-
-    assert(cpuUtilization >= 0 && cpuUtilization <= 100);
-
-    previousCpuInfo->lastRecordedCurrentTime = currentTime;
-    previousCpuInfo->lastRecordedUserTime = userTime;
-    previousCpuInfo->lastRecordedKernelTime = kernelTime;
-
-    return cpuUtilization;
-}
-

src/Common/src/Interop/Unix/System.Private.CoreLib.Native/Interop.GetCpuUtilization.cs → src/System.Private.CoreLib/shared/Interop/Unix/System.Native/Interop.GetCpuUtilization.cs

@@ -18,7 +18,7 @@ internal struct ProcessCpuInformation
             ulong lastRecordedUserTime;
         }
 
-        [DllImport(Libraries.CoreLibNative, EntryPoint = "CoreLibNative_GetCpuUtilization")]
+        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetCpuUtilization")]
         internal static extern unsafe int GetCpuUtilization(ref ProcessCpuInformation previousCpuInfo);
     }
 }

src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems

@@ -1110,6 +1110,24 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Security\SecureString.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneInfo.Unix.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(FeaturePortableThreadPool)' == 'true'">
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ThreadPool.Portable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPoolEventSource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.GateThread.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.HillClimbing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.HillClimbing.Complex.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.ThreadCounts.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.WaitThread.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.WorkerThread.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.CpuUtilizationReader.Unix.cs" Condition="'$(TargetsUnix)' == 'true'" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\ClrThreadPool.CpuUtilizationReader.Windows.cs" Condition="'$(TargetsWindows)'=='true'" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Native\Interop.GetCpuUtilization.cs" Condition="'$(TargetsUnix)'=='true'" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\Kernel32\Interop.GetSystemTimes.cs" Condition="'$(TargetsWindows)' == 'true'" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(FeaturePortableTimer)' == 'true'">
+    <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Timer.Portable.cs" />
+  </ItemGroup>
   <ItemGroup Condition="'$(FeatureHardwareIntrinsics)' == 'true' AND ('$(Platform)' == 'x64' OR ('$(Platform)' == 'x86' AND '$(TargetsUnix)' != 'true'))">
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Aes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\Intrinsics\X86\Avx.cs" />

src/System.Private.CoreLib/src/System/Threading/ClrThreadPool.GateThread.cs → src/System.Private.CoreLib/shared/System/Threading/ClrThreadPool.GateThread.cs

@@ -17,9 +17,7 @@ private static class GateThread
 
             private static int s_runningState;
 
-            private static AutoResetEvent s_runGateThreadEvent = new AutoResetEvent(true);
-
-            private static LowLevelLock s_createdLock = new LowLevelLock();
+            private static readonly AutoResetEvent s_runGateThreadEvent = new AutoResetEvent(true);
 
             private static readonly CpuUtilizationReader s_cpu = new CpuUtilizationReader();
             private const int MaxRuns = 2;

src/System.Private.CoreLib/src/System/Threading/ClrThreadPool.WaitThread.cs → src/System.Private.CoreLib/shared/System/Threading/ClrThreadPool.WaitThread.cs

@@ -16,16 +16,23 @@ internal partial class ClrThreadPool
         private WaitThreadNode _waitThreadsHead;
         private WaitThreadNode _waitThreadsTail;
 
-        private LowLevelLock _waitThreadLock = new LowLevelLock();
+#if CORERT
+        private readonly Lock _waitThreadLock = new Lock();
+#else
+        private object _waitThreadLock = new object();
+#endif
 
         /// <summary>
         /// Register a wait handle on a <see cref="WaitThread"/>.
         /// </summary>
         /// <param name="handle">A description of the requested registration.</param>
         internal void RegisterWaitHandle(RegisteredWaitHandle handle)
         {
-            _waitThreadLock.Acquire();
-            try
+#if CORERT
+            using (LockHolder.Hold(_waitThreadLock))
+#else
+            lock (_waitThreadLock)
+#endif
             {
                 if (_waitThreadsHead == null) // Lazily create the first wait thread.
                 {
@@ -56,10 +63,6 @@ internal void RegisterWaitHandle(RegisteredWaitHandle handle)
                 prev.Next.Thread.RegisterWaitHandle(handle);
                 return;
             }
-            finally
-            {
-                _waitThreadLock.Release();
-            }
         }
 
         /// <summary>
@@ -69,19 +72,18 @@ internal void RegisterWaitHandle(RegisteredWaitHandle handle)
         /// <returns><c>true</c> if the thread was successfully removed; otherwise, <c>false</c></returns>
         private bool TryRemoveWaitThread(WaitThread thread)
         {
-            _waitThreadLock.Acquire();
-            try
+#if CORERT
+            using (LockHolder.Hold(_waitThreadLock))
+#else
+            lock (_waitThreadLock)
+#endif
             {
                 if (thread.AnyUserWaits)
                 {
                     return false;
                 }
                 RemoveWaitThread(thread);
             }
-            finally
-            {
-                _waitThreadLock.Release();
-            }
             return true;
         }
 
@@ -267,8 +269,11 @@ private void WaitThreadStart()
             /// </summary>
             private void ProcessRemovals()
             {
-                ThreadPoolInstance._waitThreadLock.Acquire();
-                try
+#if CORERT
+                using (LockHolder.Hold(ThreadPoolInstance._waitThreadLock))
+#else
+                lock (ThreadPoolInstance._waitThreadLock)
+#endif
                 {
                     Debug.Assert(_numPendingRemoves >= 0);
                     Debug.Assert(_numPendingRemoves <= _pendingRemoves.Length);
@@ -307,10 +312,6 @@ private void ProcessRemovals()
                     Debug.Assert(originalNumUserWaits - originalNumPendingRemoves == _numUserWaits,
                         $"{originalNumUserWaits} - {originalNumPendingRemoves} == {_numUserWaits}");
                 }
-                finally
-                {
-                    ThreadPoolInstance._waitThreadLock.Release();
-                }
             }
 
             /// <summary>
@@ -350,7 +351,6 @@ private void CompleteWait(object state)
             /// <returns>If the handle was successfully registered on this wait thread.</returns>
             public bool RegisterWaitHandle(RegisteredWaitHandle handle)
             {
-                ThreadPoolInstance._waitThreadLock.VerifyIsLocked();
                 if (_numUserWaits == WaitHandle.MaxWaitHandles - 1)
                 {
                     return false;
@@ -389,8 +389,11 @@ private void UnregisterWait(RegisteredWaitHandle handle, bool blocking)
             {
                 bool pendingRemoval = false;
                 // TODO: Optimization: Try to unregister wait directly if it isn't being waited on.
-                ThreadPoolInstance._waitThreadLock.Acquire();
-                try
+#if CORERT
+                using (LockHolder.Hold(ThreadPoolInstance._waitThreadLock))
+#else
+                lock (ThreadPoolInstance._waitThreadLock)
+#endif
                 {
                     // If this handle is not already pending removal and hasn't already been removed
                     if (Array.IndexOf(_registeredWaits, handle) != -1 && Array.IndexOf(_pendingRemoves, handle) == -1)
@@ -400,10 +403,6 @@ private void UnregisterWait(RegisteredWaitHandle handle, bool blocking)
                         pendingRemoval = true;
                     }
                 }
-                finally
-                {
-                    ThreadPoolInstance._waitThreadLock.Release();
-                }
 
                 if (blocking)
                 {

src/System.Private.CoreLib/src/System/Threading/ClrThreadPool.WorkerThread.cs → src/System.Private.CoreLib/shared/System/Threading/ClrThreadPool.WorkerThread.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Globalization;
-using Internal.LowLevelLinq;
 using Internal.Runtime.Augments;
 
 namespace System.Threading
@@ -19,7 +18,7 @@ private static class WorkerThread
             /// Semaphore for controlling how many threads are currently working.
             /// </summary>
             private static LowLevelLifoSemaphore s_semaphore = new LowLevelLifoSemaphore(0, MaxPossibleThreadCount);
-            
+
             private static void WorkerThreadStart()
             {
                 ClrThreadPoolEventSource.Log.WorkerThreadStart(ThreadCounts.VolatileReadCounts(ref ThreadPoolInstance._separated.counts).numExistingThreads);

src/System.Private.CoreLib/src/System/Threading/ClrThreadPool.cs → src/System.Private.CoreLib/shared/System/Threading/ClrThreadPool.cs

@@ -34,7 +34,11 @@ internal sealed partial class ClrThreadPool
 
         private short _minThreads;
         private short _maxThreads;
-        private readonly LowLevelLock _maxMinThreadLock = new LowLevelLock();
+#if CORERT
+        private readonly Lock _maxMinThreadLock = new Lock();
+#else
+        private readonly object _maxMinThreadLock = new object();
+#endif
 
         [StructLayout(LayoutKind.Explicit, Size = CacheLineSize * 5)]
         private struct CacheLineSeparated
@@ -61,7 +65,11 @@ private struct CacheLineSeparated
         private int _completionCount = 0;
         private int _threadAdjustmentIntervalMs;
 
-        private LowLevelLock _hillClimbingThreadAdjustmentLock = new LowLevelLock();
+#if CORERT
+        private readonly Lock _hillClimbingThreadAdjustmentLock = new Lock();
+#else
+        private readonly object _hillClimbingThreadAdjustmentLock = new object();
+#endif
 
         private volatile int _numRequestedWorkers = 0;
 
@@ -90,8 +98,11 @@ private ClrThreadPool()
 
         public bool SetMinThreads(int minThreads)
         {
-            _maxMinThreadLock.Acquire();
-            try
+#if CORERT
+            using (LockHolder.Hold(_maxMinThreadLock))
+#else
+            lock (_maxMinThreadLock)
+#endif
             {
                 if (minThreads < 0 || minThreads > _maxThreads)
                 {
@@ -129,18 +140,17 @@ public bool SetMinThreads(int minThreads)
                     return true;
                 }
             }
-            finally
-            {
-                _maxMinThreadLock.Release();
-            }
         }
 
         public int GetMinThreads() => _minThreads;
 
         public bool SetMaxThreads(int maxThreads)
         {
-            _maxMinThreadLock.Acquire();
-            try
+#if CORERT
+            using (LockHolder.Hold(_maxMinThreadLock))
+#else
+            lock (_maxMinThreadLock)
+#endif
             {
                 if (maxThreads < _minThreads || maxThreads == 0)
                 {
@@ -173,10 +183,6 @@ public bool SetMaxThreads(int maxThreads)
                     return true;
                 }
             }
-            finally
-            {
-                _maxMinThreadLock.Release();
-            }
         }
 
         public int GetMaxThreads() => _maxThreads;
@@ -197,17 +203,34 @@ internal bool NotifyWorkItemComplete()
             // TODO: Check perf. Might need to make this thread-local.
             Interlocked.Increment(ref _completionCount);
             Volatile.Write(ref _separated.lastDequeueTime, Environment.TickCount);
-            
-            if (ShouldAdjustMaxWorkersActive() && _hillClimbingThreadAdjustmentLock.TryAcquire())
+
+            if (ShouldAdjustMaxWorkersActive())
             {
-                try
+#if CORERT
+                if (_hillClimbingThreadAdjustmentLock.TryAcquire(0))
                 {
-                    AdjustMaxWorkersActive();
+                    try
+                    {
+                        AdjustMaxWorkersActive();
+                    }
+                    finally
+                    {
+                        _hillClimbingThreadAdjustmentLock.Release();
+                    }
                 }
-                finally
+#else
+                if (Monitor.TryEnter(_hillClimbingThreadAdjustmentLock))
                 {
-                    _hillClimbingThreadAdjustmentLock.Release();
+                    try
+                    {
+                        AdjustMaxWorkersActive();
+                    }
+                    finally
+                    {
+                        Monitor.Exit(_hillClimbingThreadAdjustmentLock);
+                    }
                 }
+#endif
             }
 
             return !WorkerThread.ShouldStopProcessingWorkNow();
@@ -219,7 +242,6 @@ internal bool NotifyWorkItemComplete()
         //
         private void AdjustMaxWorkersActive()
         {
-            _hillClimbingThreadAdjustmentLock.VerifyIsLocked();
             int currentTicks = Environment.TickCount;
             int totalNumCompletions = Volatile.Read(ref _completionCount);
             int numCompletions = totalNumCompletions - _separated.priorCompletionCount;