From: Stephen Toub Date: Fri, 3 Feb 2017 14:24:44 +0000 (-0500) Subject: Reduce cost of LocalPop when local queue empty X-Git-Tag: submit/tizen/20210909.063632~11030^2~8228^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=731ea87afa26a50a3410abffe7a53f82bf90234d;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Reduce cost of LocalPop when local queue empty - Change LocalPop to be parameterless and return the IThreadPoolWorkItem rather than returning a bool and having the IThreadPoolWorkItem in an out arg. - Refactor LocalPop slightly to have an inlineable upfront check for whether the local queue is empty, and only call the non-inlineable method if there's something that could potentially be popped Commit migrated from https://github.com/dotnet/coreclr/commit/70aae70a9726cd3aa4435f1cc94aadce9470236d --- diff --git a/src/coreclr/src/mscorlib/src/System/Threading/ThreadPool.cs b/src/coreclr/src/mscorlib/src/System/Threading/ThreadPool.cs index 9a7965e..67701ec 100644 --- a/src/coreclr/src/mscorlib/src/System/Threading/ThreadPool.cs +++ b/src/coreclr/src/mscorlib/src/System/Threading/ThreadPool.cs @@ -212,13 +212,9 @@ namespace System.Threading // Fast path: check the tail. If equal, we can skip the lock. if (m_array[(m_tailIndex - 1) & m_mask] == obj) { - IThreadPoolWorkItem unused; - if (LocalPop(out unused)) - { - Debug.Assert(unused == obj); - return true; - } - return false; + IThreadPoolWorkItem unused = LocalPop(); + Debug.Assert(unused == null || unused == obj); + return unused != null; } // Else, do an O(N) search for the work item. The theory of work stealing and our @@ -267,19 +263,20 @@ namespace System.Threading return false; } + public IThreadPoolWorkItem LocalPop() => m_headIndex < m_tailIndex ? LocalPopCore() : null; + [SuppressMessage("Microsoft.Concurrency", "CA8001", Justification = "Reviewed for thread safety")] - public bool LocalPop(out IThreadPoolWorkItem obj) + private IThreadPoolWorkItem LocalPopCore() { while (true) { - // Decrement the tail using a fence to ensure subsequent read doesn't come before. int tail = m_tailIndex; if (m_headIndex >= tail) { - obj = null; - return false; + return null; } + // Decrement the tail using a fence to ensure subsequent read doesn't come before. tail -= 1; Interlocked.Exchange(ref m_tailIndex, tail); @@ -287,13 +284,13 @@ namespace System.Threading if (m_headIndex <= tail) { int idx = tail & m_mask; - obj = Volatile.Read(ref m_array[idx]); + IThreadPoolWorkItem obj = Volatile.Read(ref m_array[idx]); // Check for nulls in the array. if (obj == null) continue; m_array[idx] = null; - return true; + return obj; } else { @@ -307,20 +304,19 @@ namespace System.Threading { // Element still available. Take it. int idx = tail & m_mask; - obj = Volatile.Read(ref m_array[idx]); + IThreadPoolWorkItem obj = Volatile.Read(ref m_array[idx]); // Check for nulls in the array. if (obj == null) continue; m_array[idx] = null; - return true; + return obj; } else { // If we encountered a race condition and element was stolen, restore the tail. m_tailIndex = tail + 1; - obj = null; - return false; + return null; } } finally @@ -468,7 +464,7 @@ namespace System.Threading WorkStealingQueue localWsq = tl.workStealingQueue; IThreadPoolWorkItem callback; - if (!localWsq.LocalPop(out callback) && // first try the local queue + if ((callback = localWsq.LocalPop()) == null && // first try the local queue !workItems.TryDequeue(out callback)) // then try the global queue { // finally try to steal from another thread's local queue @@ -680,7 +676,7 @@ namespace System.Threading if (null != workQueue) { IThreadPoolWorkItem cb; - while (workStealingQueue.LocalPop(out cb)) + while ((cb = workStealingQueue.LocalPop()) != null) { Debug.Assert(null != cb); workQueue.Enqueue(cb, forceGlobal: true);