diff options
| author | Steve MacLean <stmaclea@microsoft.com> | 2019-03-05 06:29:18 -0500 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-03-05 03:29:18 -0800 |
| commit | dc11162e1c36624d3cabb6e0bf6583a94ab2e30c (patch) | |
| tree | eb44fd174038cecc76e18a482bd1478d2434c3af /src/vm/finalizerthread.cpp | |
| parent | b54752c8869f55c82cc24b49fbb1b48a87090943 (diff) | |
| download | coreclr-dc11162e1c36624d3cabb6e0bf6583a94ab2e30c.tar.gz coreclr-dc11162e1c36624d3cabb6e0bf6583a94ab2e30c.tar.bz2 coreclr-dc11162e1c36624d3cabb6e0bf6583a94ab2e30c.zip | |
Remove dead AppDomain unload code (#23026)
Diffstat (limited to 'src/vm/finalizerthread.cpp')
| -rw-r--r-- | src/vm/finalizerthread.cpp | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/src/vm/finalizerthread.cpp b/src/vm/finalizerthread.cpp index 2a44b455ca..4c152e8ec6 100644 --- a/src/vm/finalizerthread.cpp +++ b/src/vm/finalizerthread.cpp @@ -886,7 +886,6 @@ void FinalizerThread::FinalizerThreadWait(DWORD timeout) GCX_PREEMP(); Thread *pThread = GetThread(); - BOOL fADUnloadHelper = (pThread && pThread->HasThreadStateNC(Thread::TSNC_ADUnloadHelper)); ULONGLONG startTime = CLRGetTickCount64(); ULONGLONG endTime; @@ -907,55 +906,23 @@ void FinalizerThread::FinalizerThreadWait(DWORD timeout) //---------------------------------------------------- // Do appropriate wait and pump messages if necessary //---------------------------------------------------- - //WaitForSingleObject(hEventFinalizerDone, INFINITE); - - if (fADUnloadHelper) - { - timeout = GetEEPolicy()->GetTimeout(OPR_FinalizerRun); - } DWORD status = hEventFinalizerDone->Wait(timeout,TRUE); if (status != WAIT_TIMEOUT && !(g_FinalizerWaiterStatus & FWS_WaitInterrupt)) { return; } - if (!fADUnloadHelper) - { - // recalculate timeout - if (timeout != INFINITE) - { - ULONGLONG curTime = CLRGetTickCount64(); - if (curTime >= endTime) - { - return; - } - else - { - timeout = (DWORD)(endTime - curTime); - } - } - } - else + // recalculate timeout + if (timeout != INFINITE) { - if (status == WAIT_TIMEOUT) + ULONGLONG curTime = CLRGetTickCount64(); + if (curTime >= endTime) { - ULONGLONG finalizeStartTime = GetObjFinalizeStartTime(); - if (finalizeStartTime) - { - if (CLRGetTickCount64() >= finalizeStartTime+timeout) - { - GCX_COOP(); - FinalizerThreadAbortOnTimeout(); - } - } + return; } - if (endTime != MAXULONGLONG) + else { - ULONGLONG curTime = CLRGetTickCount64(); - if (curTime >= endTime) - { - return; - } + timeout = (DWORD)(endTime - curTime); } } } |