Merge pull request dotnet/coreclr#3879 from manu-silicon/xplat

Enable XplatEventLogger on all non-Windows platforms Commit migrated from dotnet/coreclr@0eff733
picenka21 · Apr 20, 2016 · acf40bf · acf40bf
2 parents daf71ea + 06625a1
commit acf40bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/coreclr/clr.coreclr.props b/src/coreclr/clr.coreclr.props
@@ -84,12 +84,9 @@
     <FeatureSvrGc Condition="'$(TargetArch)' != 'arm'">true</FeatureSvrGc>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetsLinux)' == 'true'">
-    <FeatureXplatEventSource>true</FeatureXplatEventSource>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
     <FeaturePal>true</FeaturePal>
+    <FeatureXplatEventSource>true</FeatureXplatEventSource>
 
     <FeatureStubsAsIL>true</FeatureStubsAsIL>
 

diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake
@@ -108,10 +108,10 @@ 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)
+if(CLR_CMAKE_PLATFORM_UNIX)
+    add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1)
+endif(CLR_CMAKE_PLATFORM_UNIX)
 add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO)
 # NetBSD doesn't implement this feature
 if(NOT CLR_CMAKE_PLATFORM_UNIX_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
@@ -178,4 +178,4 @@ add_definitions(-DFEATURE_WINDOWSPHONE)
 add_definitions(-DFEATURE_WINMD_RESILIENT)
 add_definitions(-D_SECURE_SCL=0)
 add_definitions(-DUNICODE)
-add_definitions(-D_UNICODE)
+add_definitions(-D_UNICODE)
diff --git a/src/coreclr/src/vm/eventtracepriv.h b/src/coreclr/src/vm/eventtracepriv.h
@@ -412,9 +412,13 @@ class BulkStaticsLogger
 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)