diff options
| author | Koundinya Veluri <kouvel@microsoft.com> | 2015-12-08 19:57:47 -0800 |
|---|---|---|
| committer | Koundinya Veluri <kouvel@microsoft.com> | 2015-12-08 19:58:17 -0800 |
| commit | 99cde3194cdd23ae5b317b10fd1b4667f62741ae (patch) | |
| tree | ec6e23bf539cbef5264744bbe11a42c198e9bbc7 /src | |
| parent | c339949d5c69ff7b4e0d79514ae93b66c63769a2 (diff) | |
| download | coreclr-99cde3194cdd23ae5b317b10fd1b4667f62741ae.tar.gz coreclr-99cde3194cdd23ae5b317b10fd1b4667f62741ae.tar.bz2 coreclr-99cde3194cdd23ae5b317b10fd1b4667f62741ae.zip | |
Revert "Disable suspend on shutdown during shutdown finalization"
Reverting commit b18d2a7e30a0d7066d2c09711de07488a7dec475 (PR #2207) due to issue dotnet/corefx#4899, while investigating the issue, to unblock the CI.
Diffstat (limited to 'src')
| -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) { |