diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-04-19 21:58:26 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-04-19 21:58:26 -0700 |
| commit | 0eff733cd407e0d5fbabedbf0d7dc19d357595c5 (patch) | |
| tree | 02ceea33845d4687ac909edaccae96d89d37d8a5 | |
| parent | f1e5b8c80ff74ebd719140b7d73747a62238698a (diff) | |
| parent | 5c6abe0694a33c245680ec48d36e1fc031798250 (diff) | |
| download | coreclr-0eff733cd407e0d5fbabedbf0d7dc19d357595c5.tar.gz coreclr-0eff733cd407e0d5fbabedbf0d7dc19d357595c5.tar.bz2 coreclr-0eff733cd407e0d5fbabedbf0d7dc19d357595c5.zip | |
Merge pull request #3879 from manu-silicon/xplat
Enable XplatEventLogger on all non-Windows platforms
| -rw-r--r-- | clr.coreclr.props | 5 | ||||
| -rw-r--r-- | clrdefinitions.cmake | 8 | ||||
| -rw-r--r-- | src/vm/eventtracepriv.h | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index d42b9f442f..7e9099faec 100644 --- a/clr.coreclr.props +++ b/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/clrdefinitions.cmake b/clrdefinitions.cmake index e818e1f87e..ccea633c72 100644 --- a/clrdefinitions.cmake +++ b/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)
\ No newline at end of file +add_definitions(-D_UNICODE) diff --git a/src/vm/eventtracepriv.h b/src/vm/eventtracepriv.h index 6b2a266728..0689665851 100644 --- a/src/vm/eventtracepriv.h +++ b/src/vm/eventtracepriv.h @@ -412,9 +412,13 @@ private: 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) |