diff options
Diffstat (limited to 'src/debug/ee/debugger.cpp')
| -rw-r--r-- | src/debug/ee/debugger.cpp | 124 |
1 files changed, 8 insertions, 116 deletions
diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp index 1f2126b9f0..ae698e2234 100644 --- a/src/debug/ee/debugger.cpp +++ b/src/debug/ee/debugger.cpp @@ -18,9 +18,6 @@ #include "eeconfig.h" // This is here even for retail & free builds... #include "../../dlls/mscorrc/resource.h" -#ifdef FEATURE_REMOTING -#include "remoting.h" -#endif #include "context.h" #include "vars.hpp" @@ -43,9 +40,7 @@ #include "datatest.h" #endif // TEST_DATA_CONSISTENCY -#if defined(FEATURE_CORECLR) #include "dbgenginemetrics.h" -#endif // FEATURE_CORECLR #include "../../vm/rejit.h" @@ -281,20 +276,6 @@ bool IsGuardPageGone() return fGuardPageGone; } - -// This is called from AppDomainEnumerationIPCBlock::Lock and Unlock -void BeginThreadAffinityHelper() -{ - WRAPPER_NO_CONTRACT; - - Thread::BeginThreadAffinity(); -} -void EndThreadAffinityHelper() -{ - WRAPPER_NO_CONTRACT; - Thread::EndThreadAffinity(); -} - //----------------------------------------------------------------------------- // LSPTR_XYZ is a type-safe wrapper around an opaque reference type XYZ in the left-side. // But TypeHandles are value-types that can't be directly converted into a pointer. @@ -1896,7 +1877,7 @@ void Debugger::SendCreateProcess(DebuggerLockHolder * pDbgLockHolder) pDbgLockHolder->Acquire(); } -#if defined(FEATURE_CORECLR) && !defined(FEATURE_PAL) +#if !defined(FEATURE_PAL) HANDLE g_hContinueStartupEvent = INVALID_HANDLE_VALUE; @@ -1966,7 +1947,7 @@ void NotifyDebuggerOfTelestoStartup() g_hContinueStartupEvent = NULL; } -#endif // FEATURE_CORECLR && !FEATURE_PAL +#endif // !FEATURE_PAL //--------------------------------------------------------------------------------------- // @@ -1999,7 +1980,7 @@ HRESULT Debugger::Startup(void) _ASSERTE(g_pEEInterface != NULL); -#if defined(FEATURE_CORECLR) && !defined(FEATURE_PAL) +#if !defined(FEATURE_PAL) if (IsWatsonEnabled() || IsTelestoDebugPackInstalled()) { // Iff the debug pack is installed, then go through the telesto debugging pipeline. @@ -2018,7 +1999,7 @@ HRESULT Debugger::Startup(void) // The transport requires the debug pack to be present. Otherwise it'll raise a fatal error. return S_FALSE; } -#endif // FEATURE_CORECLR && !FEATURE_PAL +#endif // !FEATURE_PAL { DebuggerLockHolder dbgLockHolder(this); @@ -5200,39 +5181,6 @@ HRESULT Debugger::MapPatchToDJI( DebuggerControllerPatch *dcp,DebuggerJitInfo *d return S_OK; } -// -// Wrapper function for debugger to WaitForSingleObject. If CLR is hosted, -// notify host before we leave runtime. -// -DWORD Debugger::WaitForSingleObjectHelper(HANDLE handle, DWORD dwMilliseconds) -{ - CONTRACTL - { - SO_NOT_MAINLINE; - NOTHROW; - GC_NOTRIGGER; - } - CONTRACTL_END; - - DWORD dw = 0; - EX_TRY - { - - // make sure that we let host know that we are leaving runtime. - LeaveRuntimeHolder holder((size_t)(::WaitForSingleObject)); - dw = ::WaitForSingleObject(handle,dwMilliseconds); - } - EX_CATCH - { - // Only possibility to enter here is when Thread::LeaveRuntime - // throws exception. - dw = WAIT_ABANDONED; - } - EX_END_CATCH(SwallowAllExceptions); - return dw; - -} - /* ------------------------------------------------------------------------ * * EE Interface routines @@ -8139,8 +8087,7 @@ LONG Debugger::NotifyOfCHFFilter(EXCEPTION_POINTERS* pExceptionPointers, PVOID p pExState->GetFlags()->SetDebugCatchHandlerFound(); #ifdef DEBUGGING_SUPPORTED - - +#ifdef DEBUGGER_EXCEPTION_INTERCEPTION_SUPPORTED if ( (pThread != NULL) && (pThread->IsExceptionInProgress()) && (pThread->GetExceptionState()->GetFlags()->DebuggerInterceptInfo()) ) @@ -8151,6 +8098,7 @@ LONG Debugger::NotifyOfCHFFilter(EXCEPTION_POINTERS* pExceptionPointers, PVOID p // ClrDebuggerDoUnwindAndIntercept(X86_FIRST_ARG(EXCEPTION_CHAIN_END) pExceptionPointers->ExceptionRecord); } +#endif // DEBUGGER_EXCEPTION_INTERCEPTION_SUPPORTED #endif // DEBUGGING_SUPPORTED return EXCEPTION_CONTINUE_SEARCH; @@ -9589,23 +9537,6 @@ void Debugger::LoadModule(Module* pRuntimeModule, SENDIPCEVENT_BEGIN(this, pThread); -#ifdef FEATURE_FUSION - // Fix for issue Whidbey - 106398 - // Populate the pdb to fusion cache. - - // - if (pRuntimeModule->IsIStream() == FALSE) - { - SUPPRESS_ALLOCATION_ASSERTS_IN_THIS_SCOPE; - - HRESULT hrCopy = S_OK; - EX_TRY - { - pRuntimeModule->FusionCopyPDBs(pRuntimeModule->GetPath()); - } - EX_CATCH_HRESULT(hrCopy); // ignore failures - } -#endif // FEATURE_FUSION DebuggerIPCEvent* ipce = NULL; @@ -9804,7 +9735,6 @@ void Debugger::LoadModuleFinished(Module * pRuntimeModule, AppDomain * pAppDomai // Use code:Debugger.SendUpdateModuleSymsEventAndBlock for that. void Debugger::SendRawUpdateModuleSymsEvent(Module *pRuntimeModule, AppDomain *pAppDomain) { -// @telest - do we need an #ifdef FEATURE_FUSION here? CONTRACTL { NOTHROW; @@ -12740,27 +12670,13 @@ CorDebugUserState Debugger::GetFullUserState(Thread *pThread) /****************************************************************************** * * Helper for debugger to get an unique thread id - * If we are not in Fiber mode, we can safely use OSThreadId - * Otherwise, we will use our own unique ID. - * - * We will return our unique ID when our host is hosting Thread. - * * ******************************************************************************/ DWORD Debugger::GetThreadIdHelper(Thread *pThread) { WRAPPER_NO_CONTRACT; - if (!CLRTaskHosted()) - { - // use the plain old OS Thread ID - return pThread->GetOSThreadId(); - } - else - { - // use our unique thread ID - return pThread->GetThreadId(); - } + return pThread->GetOSThreadId(); } //----------------------------------------------------------------------------- @@ -14964,21 +14880,6 @@ HRESULT Debugger::CopyModulePdb(Module* pRuntimeModule) } HRESULT hr = S_OK; -#ifdef FEATURE_FUSION - // - // Populate the pdb to fusion cache. - // - if (pRuntimeModule->IsIStream() == FALSE) - { - SUPPRESS_ALLOCATION_ASSERTS_IN_THIS_SCOPE; - - EX_TRY - { - pRuntimeModule->FusionCopyPDBs(pRuntimeModule->GetPath()); - } - EX_CATCH_HRESULT(hr); // ignore failures - } -#endif // FEATURE_FUSION return hr; } @@ -15101,15 +15002,6 @@ HRESULT Debugger::InitAppDomainIPC(void) // uninited values. ZeroMemory(m_pAppDomainCB, sizeof(*m_pAppDomainCB)); - // Fix for issue: whidbey 143061 - // We are creating the mutex as hold, when we unlock, the EndThreadAffinity in - // hosting case will be unbalanced. - // Ideally, I would like to fix this by creating mutex not-held and call Lock method. - // This way, when we clean up the OOM, (as you can tell, we never release the mutex in - // some error cases), we can change it to holder class. - // - Thread::BeginThreadAffinity(); - // Create a mutex to allow the Left and Right Sides to properly // synchronize. The Right Side will spin until m_hMutex is valid, // then it will acquire it before accessing the data. @@ -16095,7 +15987,7 @@ BOOL Debugger::SendCtrlCToDebugger(DWORD dwCtrlType) // now wait for notification from the right side about whether or not // the out-of-proc debugger is handling ControlC events. - WaitForSingleObjectHelper(GetCtrlCMutex(), INFINITE); + ::WaitForSingleObject(GetCtrlCMutex(), INFINITE); return GetDebuggerHandlingCtrlC(); } |