diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-03-21 09:06:54 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-03-24 07:28:13 -0700 |
commit | e416f57c553a9b9e11a3a22b2ac9b68cef1cd4ce (patch) | |
tree | a82e688a3d296fbd64a4e6ac929f4ae549f393f6 /src/debug | |
parent | 41dad10286dd73ffce954d80ff2acbb82785bf48 (diff) | |
download | coreclr-e416f57c553a9b9e11a3a22b2ac9b68cef1cd4ce.tar.gz coreclr-e416f57c553a9b9e11a3a22b2ac9b68cef1cd4ce.tar.bz2 coreclr-e416f57c553a9b9e11a3a22b2ac9b68cef1cd4ce.zip |
Delete legacy netcf compat support (final part)
Diffstat (limited to 'src/debug')
-rw-r--r-- | src/debug/di/process.cpp | 47 | ||||
-rw-r--r-- | src/debug/di/rspriv.h | 17 | ||||
-rw-r--r-- | src/debug/ee/debugger.cpp | 86 | ||||
-rw-r--r-- | src/debug/ee/debugger.h | 5 | ||||
-rw-r--r-- | src/debug/inc/dbgipceventtypes.h | 8 |
5 files changed, 3 insertions, 160 deletions
diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp index a2bf15d849..572eef6a75 100644 --- a/src/debug/di/process.cpp +++ b/src/debug/di/process.cpp @@ -2142,12 +2142,6 @@ HRESULT CordbProcess::QueryInterface(REFIID id, void **pInterface) { *pInterface = static_cast<ICorDebugProcess8*>(this); } -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - else if (id == IID_ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly) - { - *pInterface = static_cast<ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly*>(this); - } -#endif else if (id == IID_IUnknown) { *pInterface = static_cast<IUnknown*>(static_cast<ICorDebugProcess*>(this)); @@ -2501,47 +2495,6 @@ COM_METHOD CordbProcess::EnableExceptionCallbacksOutsideOfMyCode(BOOL enableExce return hr; } -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - -COM_METHOD CordbProcess::InvokePauseCallback() -{ - HRESULT hr = S_OK; - PUBLIC_API_ENTRY(this); - ATT_REQUIRE_STOPPED_MAY_FAIL(this); - - EX_TRY - { - DebuggerIPCEvent * pIPCEvent = (DebuggerIPCEvent *) _alloca(CorDBIPC_BUFFER_SIZE); - InitIPCEvent(pIPCEvent, DB_IPCE_NETCF_HOST_CONTROL_PAUSE, true, VMPTR_AppDomain::NullPtr()); - - hr = m_cordb->SendIPCEvent(this, pIPCEvent, CorDBIPC_BUFFER_SIZE); - hr = WORST_HR(hr, pIPCEvent->hr); - } - EX_CATCH_HRESULT(hr); - - return hr; -} - -COM_METHOD CordbProcess::InvokeResumeCallback() -{ - HRESULT hr = S_OK; - PUBLIC_API_ENTRY(this); - ATT_REQUIRE_STOPPED_MAY_FAIL(this); - - EX_TRY - { - DebuggerIPCEvent * pIPCEvent = (DebuggerIPCEvent *) _alloca(CorDBIPC_BUFFER_SIZE); - InitIPCEvent(pIPCEvent, DB_IPCE_NETCF_HOST_CONTROL_RESUME, true, VMPTR_AppDomain::NullPtr()); - - hr = m_cordb->SendIPCEvent(this, pIPCEvent, CorDBIPC_BUFFER_SIZE); - hr = WORST_HR(hr, pIPCEvent->hr); - } - EX_CATCH_HRESULT(hr); - return hr; -} - -#endif - HRESULT CordbProcess::GetTypeForObject(CORDB_ADDRESS addr, CordbType **ppType, CordbAppDomain **pAppDomain) { VMPTR_AppDomain appDomain; diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h index 3d17f20576..2bee31471f 100644 --- a/src/debug/di/rspriv.h +++ b/src/debug/di/rspriv.h @@ -2924,9 +2924,6 @@ class CordbProcess : public IDacDbiInterface::IAllocator, public IDacDbiInterface::IMetaDataLookup, public IProcessShimHooks -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - , public ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly -#endif { // Ctor is private. Use OpenVirtualProcess instead. CordbProcess(ULONG64 clrInstanceId, IUnknown * pDataTarget, HMODULE hDacModule, Cordb * pCordb, DWORD dwProcessID, ShimProcess * pShim); @@ -3132,16 +3129,6 @@ public: //----------------------------------------------------------- COM_METHOD EnableExceptionCallbacksOutsideOfMyCode(BOOL enableExceptionsOutsideOfJMC); -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - // --------------------------------------------------------------- - // ICorDebugLegacyNetCFHostCallbackInvoker_PrivateWindowsPhoneOnly - // --------------------------------------------------------------- - - COM_METHOD InvokePauseCallback(); - COM_METHOD InvokeResumeCallback(); - -#endif - //----------------------------------------------------------- // Methods not exposed via a COM interface. //----------------------------------------------------------- @@ -3427,9 +3414,7 @@ public: type == DB_IPCE_INTERCEPT_EXCEPTION || type == DB_IPCE_GET_NGEN_COMPILER_FLAGS || type == DB_IPCE_SET_NGEN_COMPILER_FLAGS || - type == DB_IPCE_SET_VALUE_CLASS || - type == DB_IPCE_NETCF_HOST_CONTROL_PAUSE || - type == DB_IPCE_NETCF_HOST_CONTROL_RESUME); + type == DB_IPCE_SET_VALUE_CLASS); ipce->type = type; ipce->hr = S_OK; diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp index c063eb829f..87ddb79678 100644 --- a/src/debug/ee/debugger.cpp +++ b/src/debug/ee/debugger.cpp @@ -10585,64 +10585,6 @@ BYTE* Debugger::SerializeModuleMetaData(Module * pModule, DWORD * countBytes) return metadataBuffer; } -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL -//--------------------------------------------------------------------------------------- -// -// Called on the helper thread to send a pause notification to the host -// -// -// This is called on the helper-thread, or a thread pretending to be the helper-thread. -// The debuggee should be synchronized. This callback to the host is only supported -// on Windows Phone as a replacement for some legacy NetCF behavior. In general I don't -// like being the transport between the VS debugger and the host, so don't use -// this as precedent that we should start making more callbacks for them. In the future -// the debugger and host should make alternative arrangements such as window messages, -// out of proc event signaling, or any other IPC mechanism. -// -// This should be deprecated as soon as mixed-mode debugging is available. The -// end goal on phone is to pause the UI thread while VS is in the break state. That -// will be accomplished by a mixed-mode debugger suspending all native threads when -// it breaks rather than having us send a special message. -// -//--------------------------------------------------------------------------------------- -VOID Debugger::InvokeLegacyNetCFHostPauseCallback() -{ - IHostNetCFDebugControlManager* pHostCallback = CorHost2::GetHostNetCFDebugControlManager(); - if(pHostCallback != NULL) - { - pHostCallback->NotifyPause(0); - } -} - -//--------------------------------------------------------------------------------------- -// -// Called on the helper thread to send a resume notification to the host -// -// -// This is called on the helper-thread, or a thread pretending to be the helper-thread. -// The debuggee should be synchronized. This callback to the host is only supported -// on Windows Phone as a replacement for some legacy NetCF behavior. In general I don't -// like being the transport between the VS debugger and the host, so don't use -// this as precedent that we should start making more callbacks for them. In the future -// the debugger and host should make alternative arrangements such as window messages, -// out of proc event signaling, or any other IPC mechanism. -// -// This should be deprecated as soon as mixed-mode debugging is available. The -// end goal on phone is to pause the UI thread while VS is in the break state. That -// will be accomplished by a mixed-mode debugger suspending all native threads when -// it breaks rather than having us send a special message. -// -//--------------------------------------------------------------------------------------- -VOID Debugger::InvokeLegacyNetCFHostResumeCallback() -{ - IHostNetCFDebugControlManager* pHostCallback = CorHost2::GetHostNetCFDebugControlManager(); - if(pHostCallback != NULL) - { - pHostCallback->NotifyResume(0); - } -} -#endif //FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - //--------------------------------------------------------------------------------------- // // Handle an IPC event from the Debugger. @@ -11716,34 +11658,6 @@ bool Debugger::HandleIPCEvent(DebuggerIPCEvent * pEvent) break; -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - case DB_IPCE_NETCF_HOST_CONTROL_PAUSE: - { - LOG((LF_CORDB, LL_INFO10000, "D::HIPCE Handling DB_IPCE_NETCF_HOST_CONTROL_PAUSE\n")); - InvokeLegacyNetCFHostPauseCallback(); - - DebuggerIPCEvent * pResult = m_pRCThread->GetIPCEventReceiveBuffer(); - InitIPCEvent(pResult, DB_IPCE_NETCF_HOST_CONTROL_PAUSE_RESULT, NULL, NULL); - pResult->hr = S_OK; - m_pRCThread->SendIPCReply(); - } - - break; - - case DB_IPCE_NETCF_HOST_CONTROL_RESUME: - { - LOG((LF_CORDB, LL_INFO10000, "D::HIPCE Handling DB_IPCE_NETCF_HOST_CONTROL_RESUME\n")); - InvokeLegacyNetCFHostResumeCallback(); - - DebuggerIPCEvent * pResult = m_pRCThread->GetIPCEventReceiveBuffer(); - InitIPCEvent(pResult, DB_IPCE_NETCF_HOST_CONTROL_RESUME_RESULT, NULL, NULL); - pResult->hr = S_OK; - m_pRCThread->SendIPCReply(); - } - - break; -#endif // FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - default: // We should never get an event that we don't know about. CONSISTENCY_CHECK_MSGF(false, ("Unknown Debug-Event on LS:id=0x%08x.", pEvent->type)); diff --git a/src/debug/ee/debugger.h b/src/debug/ee/debugger.h index 4904139665..4558468182 100644 --- a/src/debug/ee/debugger.h +++ b/src/debug/ee/debugger.h @@ -2061,11 +2061,6 @@ public: void Terminate(); void Continue(); -#ifdef FEATURE_LEGACYNETCF_DBG_HOST_CONTROL - VOID InvokeLegacyNetCFHostPauseCallback(); - VOID InvokeLegacyNetCFHostResumeCallback(); -#endif - bool HandleIPCEvent(DebuggerIPCEvent* event); DebuggerModule * LookupOrCreateModule(VMPTR_DomainFile vmDomainFile); diff --git a/src/debug/inc/dbgipceventtypes.h b/src/debug/inc/dbgipceventtypes.h index 6d72149531..b538360e68 100644 --- a/src/debug/inc/dbgipceventtypes.h +++ b/src/debug/inc/dbgipceventtypes.h @@ -90,9 +90,7 @@ IPC_EVENT_TYPE1(DB_IPCE_LEFTSIDE_STARTUP ,0x015C) IPC_EVENT_TYPE1(DB_IPCE_METADATA_UPDATE ,0x015D) IPC_EVENT_TYPE1(DB_IPCE_RESOLVE_UPDATE_METADATA_1_RESULT,0x015E) IPC_EVENT_TYPE1(DB_IPCE_RESOLVE_UPDATE_METADATA_2_RESULT,0x015F) -IPC_EVENT_TYPE1(DB_IPCE_NETCF_HOST_CONTROL_PAUSE_RESULT,0x0160) -IPC_EVENT_TYPE1(DB_IPCE_NETCF_HOST_CONTROL_RESUME_RESULT,0x0161) -IPC_EVENT_TYPE0(DB_IPCE_RUNTIME_LAST ,0x0162) // The last event from runtime +IPC_EVENT_TYPE0(DB_IPCE_RUNTIME_LAST ,0x0160) // The last event from runtime @@ -141,7 +139,5 @@ IPC_EVENT_TYPE2(DB_IPCE_DEBUGGER_INVALID ,0x0249) // An invalid ev IPC_EVENT_TYPE2(DB_IPCE_GET_GCHANDLE_INFO ,0x0251) IPC_EVENT_TYPE2(DB_IPCE_RESOLVE_UPDATE_METADATA_1 ,0x0256) IPC_EVENT_TYPE2(DB_IPCE_RESOLVE_UPDATE_METADATA_2 ,0x0257) -IPC_EVENT_TYPE2(DB_IPCE_NETCF_HOST_CONTROL_PAUSE ,0x0258) -IPC_EVENT_TYPE2(DB_IPCE_NETCF_HOST_CONTROL_RESUME ,0x0259) -IPC_EVENT_TYPE0(DB_IPCE_DEBUGGER_LAST ,0x025a) // The last event from the debugger +IPC_EVENT_TYPE0(DB_IPCE_DEBUGGER_LAST ,0x0258) // The last event from the debugger |