diff options
-rw-r--r-- | src/vm/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/vm/eventtrace.cpp | 27 | ||||
-rw-r--r-- | src/vm/eventtracepriv.h | 14 | ||||
-rw-r--r-- | src/vm/mscorlib.cpp | 5 | ||||
-rw-r--r-- | src/vm/nativeeventsource.cpp | 38 | ||||
-rw-r--r-- | src/vm/nativeeventsource.h | 26 |
6 files changed, 66 insertions, 45 deletions
diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt index 5704624ee5..93a487a5d9 100644 --- a/src/vm/CMakeLists.txt +++ b/src/vm/CMakeLists.txt @@ -199,6 +199,7 @@ set(VM_SOURCES_WKS mscorlib.cpp # <DisablePrecompiledHeaders>true</DisablePrecompiledHeaders> multicorejit.cpp # Condition="'$(FeatureMulticoreJIT)' == 'true' multicorejitplayer.cpp # Condition="'$(FeatureMulticoreJIT)' == 'true' + nativeeventsource.cpp nativeoverlapped.cpp objectlist.cpp olevariant.cpp diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp index b9d12a76ed..3353e66fcd 100644 --- a/src/vm/eventtrace.cpp +++ b/src/vm/eventtrace.cpp @@ -7412,31 +7412,4 @@ VOID ETW::EnumerationLog::EnumerationHelper(Module *moduleFilter, BaseDomain *do } } -#if defined(FEATURE_EVENTSOURCE_XPLAT) - -void QCALLTYPE XplatEventSourceLogger::LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload) -{ - QCALL_CONTRACT; - - BEGIN_QCALL; - FireEtwEventSource(eventID, eventName, eventSourceName, payload); - END_QCALL; -} - -BOOL QCALLTYPE XplatEventSourceLogger::IsEventSourceLoggingEnabled() -{ - QCALL_CONTRACT; - - BOOL retVal = FALSE; - - BEGIN_QCALL; - retVal = XplatEventLogger::IsEventLoggingEnabled(); - END_QCALL; - - return retVal; - -} - -#endif //defined(FEATURE_EVENTSOURCE_XPLAT) - #endif // !FEATURE_REDHAWK diff --git a/src/vm/eventtracepriv.h b/src/vm/eventtracepriv.h index 0689665851..50886e4e07 100644 --- a/src/vm/eventtracepriv.h +++ b/src/vm/eventtracepriv.h @@ -408,17 +408,3 @@ private: #endif // __EVENTTRACEPRIV_H__ -#if defined(FEATURE_EVENTSOURCE_XPLAT) -class XplatEventSourceLogger -{ -public: -#ifdef FEATURE_EVENT_TRACE - static void QCALLTYPE LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload); - static BOOL QCALLTYPE IsEventSourceLoggingEnabled(); -#else - static void QCALLTYPE LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload) {} - static BOOL QCALLTYPE IsEventSourceLoggingEnabled() { return false; } -#endif -}; - -#endif //defined(FEATURE_EVENTSOURCE_XPLAT) diff --git a/src/vm/mscorlib.cpp b/src/vm/mscorlib.cpp index 8b7f6ebcba..91e2a10978 100644 --- a/src/vm/mscorlib.cpp +++ b/src/vm/mscorlib.cpp @@ -131,10 +131,7 @@ #endif #if defined(FEATURE_EVENTSOURCE_XPLAT) - -#define __EVENTTRACEPRIV_H__ -#include "eventtracepriv.h" -#undef __EVENTTRACEPRIV_H__ +#include "nativeeventsource.h" #endif //defined(FEATURE_EVENTSOURCE_XPLAT) #endif // CROSSGEN_MSCORLIB diff --git a/src/vm/nativeeventsource.cpp b/src/vm/nativeeventsource.cpp new file mode 100644 index 0000000000..4c895e0c99 --- /dev/null +++ b/src/vm/nativeeventsource.cpp @@ -0,0 +1,38 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. +// +// File: nativeeventsource.cpp +// Abstract: This module implements native part of Event Source support in VM +// +// +// +// ============================================================================ + +#include "common.h" +#if defined(FEATURE_EVENTSOURCE_XPLAT) +#include "nativeeventsource.h" + +void QCALLTYPE XplatEventSourceLogger::LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload) +{ + QCALL_CONTRACT; + BEGIN_QCALL; + FireEtwEventSource(eventID, eventName, eventSourceName, payload); + END_QCALL; +} + +BOOL QCALLTYPE XplatEventSourceLogger::IsEventSourceLoggingEnabled() +{ + QCALL_CONTRACT; + + BOOL retVal = FALSE; + + BEGIN_QCALL; + retVal = XplatEventLogger::IsEventLoggingEnabled(); + END_QCALL; + + return retVal; + +} + +#endif //defined(FEATURE_EVENTSOURCE_XPLAT) diff --git a/src/vm/nativeeventsource.h b/src/vm/nativeeventsource.h new file mode 100644 index 0000000000..fdd46df680 --- /dev/null +++ b/src/vm/nativeeventsource.h @@ -0,0 +1,26 @@ + +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. +// +// File: nativeeventsource.h +// Abstract: This module implements native part of Event Source support in VM +// + +// + +// +// ============================================================================ +#ifndef _NATIVEEVENTSOURCE_H_ +#define _NATIVEEVENTSOURCE_H_ + +#if defined(FEATURE_EVENTSOURCE_XPLAT) +class XplatEventSourceLogger +{ +public: + static void QCALLTYPE LogEventSource(__in_z int eventID, __in_z LPCWSTR eventName, __in_z LPCWSTR eventSourceName, __in_z LPCWSTR payload); + static BOOL QCALLTYPE IsEventSourceLoggingEnabled(); +}; + +#endif //defined(FEATURE_EVENTSOURCE_XPLAT) +#endif //_NATIVEEVENTSOURCE_H_ |