diff options
| author | Stephen Toub <stoub@microsoft.com> | 2015-12-09 06:40:13 -0500 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2015-12-09 06:40:13 -0500 |
| commit | 5863e3477d600701c1419ab439360edd661e9640 (patch) | |
| tree | dfcef7578bc95c6ca455cbdab35ee286dc943e86 /src/vm | |
| parent | e43afec236172b5aa93cd7442125f235a162b4ad (diff) | |
| parent | 99cde3194cdd23ae5b317b10fd1b4667f62741ae (diff) | |
| download | coreclr-5863e3477d600701c1419ab439360edd661e9640.tar.gz coreclr-5863e3477d600701c1419ab439360edd661e9640.tar.bz2 coreclr-5863e3477d600701c1419ab439360edd661e9640.zip | |
Merge pull request #2277 from kouvel/FinalizerDeadlockUndo
Revert "Disable suspend on shutdown during shutdown finalization"
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/finalizerthread.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/vm/finalizerthread.cpp b/src/vm/finalizerthread.cpp index b9895742a0..aca97e3ff2 100644 --- a/src/vm/finalizerthread.cpp +++ b/src/vm/finalizerthread.cpp @@ -1207,11 +1207,6 @@ BOOL FinalizerThread::FinalizerThreadWatchDog() #endif //BACKGROUND_GC _ASSERTE ((g_fEEShutDown & ShutDown_Finalize1) || g_fFastExitProcess); - - // FinalizerThreadWatchDogHelper does not time out waiting for the finalizer thread in CoreCLR. If another thread blocks - // during GC for shutdown, a finalizer that allocates (or even jitting a finalizer, which does allocation) may block the - // finalizer thread indefinitely, which may in turn lead to a deadlock. -#ifndef FEATURE_CORECLR ThreadSuspend::SuspendEE(ThreadSuspend::SUSPEND_FOR_SHUTDOWN); g_fSuspendOnShutdown = TRUE; @@ -1222,7 +1217,6 @@ BOOL FinalizerThread::FinalizerThreadWatchDog() ThreadStore::TrapReturningThreads(TRUE); ThreadSuspend::RestartEE(FALSE, TRUE); -#endif if (g_fFastExitProcess) { |