Fixing up FEATURE_EVENTSOURCE_XPLAT

ramarag · Apr 19, 2016 · 84a8d4d · 84a8d4d
1 parent 83e52fa
commit 84a8d4d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -693,6 +693,10 @@ if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64)
   set(FEATURE_EVENT_TRACE 1)
 endif()
 
+if(CLR_CMAKE_PLATFORM_UNIX)
+    add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
+endif(CLR_CMAKE_PLATFORM_UNIX)
+
 if(CLR_CMAKE_PLATFORM_UNIX)
   add_subdirectory(src/ToolBox/SOS/lldbplugin)
   add_subdirectory(src/pal)
@@ -825,9 +829,6 @@ if(CLR_CMAKE_PLATFORM_UNIX)
 endif(CLR_CMAKE_PLATFORM_UNIX)
 if(FEATURE_EVENT_TRACE)
     add_definitions(-DFEATURE_EVENT_TRACE=1)
-    if(CLR_CMAKE_PLATFORM_UNIX)
-        add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
-    endif(CLR_CMAKE_PLATFORM_UNIX)
 endif(FEATURE_EVENT_TRACE)
 add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO)
 # NetBSD doesn't implement this feature

diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt
@@ -267,6 +267,7 @@ set(VM_SOURCES_WKS
     typeparse.cpp
     verifier.cpp
     weakreferencenative.cpp
+    nativeeventsource.cpp
 )
 
 if(FEATURE_EVENT_TRACE)

diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp
@@ -7389,31 +7389,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/nativeeventsource.cpp b/src/vm/nativeeventsource.cpp
@@ -0,0 +1,40 @@
+// 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
+//
+
+//
+
+//
+// ============================================================================
+
+#if defined(FEATURE_EVENTSOURCE_XPLAT)
+#include "common.h"
+#include "eventtracepriv.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)