diff options
| -rw-r--r-- | src/vm/comthreadpool.cpp | 7 | ||||
| -rw-r--r-- | src/vm/win32threadpool.cpp | 4 | ||||
| -rw-r--r-- | src/vm/win32threadpool.h | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/vm/comthreadpool.cpp b/src/vm/comthreadpool.cpp index 8231214a20..7f629b508b 100644 --- a/src/vm/comthreadpool.cpp +++ b/src/vm/comthreadpool.cpp @@ -251,7 +251,6 @@ FCIMPL0(FC_BOOL_RET, ThreadPoolNative::NotifyRequestComplete) pThread->HasCriticalRegion() || pThread->HasThreadAffinity(); - // Read fenced call bool shouldAdjustWorkers = ThreadpoolMgr::ShouldAdjustMaxWorkersActive(); // @@ -267,15 +266,15 @@ FCIMPL0(FC_BOOL_RET, ThreadPoolNative::NotifyRequestComplete) { HELPER_METHOD_FRAME_BEGIN_RET_0(); - if (needReset) - pThread->InternalReset(FALSE, TRUE, TRUE, FALSE); - if (shouldAdjustWorkers) { ThreadpoolMgr::AdjustMaxWorkersActive(); tal.Release(); } + if (needReset) + pThread->InternalReset(FALSE, TRUE, TRUE, FALSE); + HELPER_METHOD_FRAME_END(); } diff --git a/src/vm/win32threadpool.cpp b/src/vm/win32threadpool.cpp index cc58cead31..2ec7deded4 100644 --- a/src/vm/win32threadpool.cpp +++ b/src/vm/win32threadpool.cpp @@ -1262,11 +1262,11 @@ void ThreadpoolMgr::AdjustMaxWorkersActive() } } - // Memory fences below writes - VolatileStore(&PriorCompletedWorkRequests, totalNumCompletions); + PriorCompletedWorkRequests = totalNumCompletions; PriorCompletedWorkRequestsTime = currentTicks; NextCompletedWorkRequestsTime = currentTicks + ThreadAdjustmentInterval; CurrentSampleStartTime = endTime; + MemoryBarrier(); } } diff --git a/src/vm/win32threadpool.h b/src/vm/win32threadpool.h index 0ca01f8b65..50eb708c39 100644 --- a/src/vm/win32threadpool.h +++ b/src/vm/win32threadpool.h @@ -1142,8 +1142,9 @@ public: if (CLRThreadpoolHosted()) return false; + MemoryBarrier(); DWORD priorTime = PriorCompletedWorkRequestsTime; - DWORD requiredInterval = VolatileLoad(&NextCompletedWorkRequestsTime) - priorTime; // fences above read + DWORD requiredInterval = NextCompletedWorkRequestsTime - priorTime; // fences above read DWORD elapsedInterval = GetTickCount() - priorTime; if (elapsedInterval >= requiredInterval) { |