diff options
Diffstat (limited to 'src/vm/profilinghelper.cpp')
| -rw-r--r-- | src/vm/profilinghelper.cpp | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/vm/profilinghelper.cpp b/src/vm/profilinghelper.cpp index 1dd60b47e1..b1fb228acb 100644 --- a/src/vm/profilinghelper.cpp +++ b/src/vm/profilinghelper.cpp @@ -138,9 +138,6 @@ #include "profilinghelper.inl" #include "eemessagebox.h" -#if defined(FEATURE_PROFAPI_EVENT_LOGGING) && !defined(FEATURE_CORECLR) -#include <eventmsg.h> -#endif // FEATURE_PROFAPI_EVENT_LOGGING) && !FEATURE_CORECLR #ifdef FEATURE_PROFAPI_ATTACH_DETACH #include "profattach.h" @@ -398,30 +395,8 @@ void ProfilingAPIUtility::LogProfEventVA( AppendSupplementaryInformation(iStringResourceID, &messageToLog); -#if defined(FEATURE_CORECLR) // CoreCLR on Windows ouputs debug strings for diagnostic messages. WszOutputDebugString(messageToLog); -#else - // Get the user SID for the current process, so it can be provided to the event - // logging API, which will then fill out the "User" field in the event log entry. If - // this fails, that's not fatal. We can just pass NULL for the PSID, and the "User" - // field will be left blank. - PSID psid = NULL; - HRESULT hr = GetCurrentProcessUserSid(&psid); - if (FAILED(hr)) - { - // No biggie. Just pass in a NULL psid, and the User field will be empty - _ASSERTE(psid == NULL); - } - - // On desktop CLR builds, the profiling API uses the event log for end-user-friendly - // diagnostic messages. - ReportEventCLR(wEventType, // wType - 0, // wCategory - COR_Profiler, // dwEventID - psid, // lpUserSid - &messageToLog); // uh duh -#endif // FEATURE_CORECLR #endif // FEATURE_PROFAPI_EVENT_LOGGING } @@ -732,11 +707,7 @@ HRESULT ProfilingAPIUtility::AttemptLoadProfilerForStartup() // Find out if profiling is enabled DWORD fProfEnabled = 0; -#ifdef FEATURE_CORECLR fProfEnabled = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_CORECLR_ENABLE_PROFILING); -#else //FEATURE_CORECLR - fProfEnabled = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_COR_ENABLE_PROFILING); -#endif //FEATURE_CORECLR // If profiling is not enabled, return. if (fProfEnabled == 0) @@ -751,7 +722,6 @@ HRESULT ProfilingAPIUtility::AttemptLoadProfilerForStartup() NewArrayHolder<WCHAR> wszClsid(NULL); NewArrayHolder<WCHAR> wszProfilerDLL(NULL); -#ifdef FEATURE_CORECLR IfFailRet(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_CORECLR_PROFILER, &wszClsid)); #if defined(_TARGET_X86_) @@ -763,19 +733,6 @@ HRESULT ProfilingAPIUtility::AttemptLoadProfilerForStartup() { IfFailRet(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_CORECLR_PROFILER_PATH, &wszProfilerDLL)); } -#else // FEATURE_CORECLR - IfFailRet(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_COR_PROFILER, &wszClsid)); - -#if defined(_TARGET_X86_) - IfFailRet(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_COR_PROFILER_PATH_32, &wszProfilerDLL)); -#elif defined(_TARGET_AMD64_) - IfFailRet(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_COR_PROFILER_PATH_64, &wszProfilerDLL)); -#endif - if(wszProfilerDLL == NULL) - { - IfFailRet(CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_COR_PROFILER_PATH, &wszProfilerDLL)); - } -#endif // FEATURE_CORECLR // If the environment variable doesn't exist, profiling is not enabled. if (wszClsid == NULL) |