diff options
| author | Sung Yoon Whang <suwhang@microsoft.com> | 2019-10-21 16:04:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 16:04:28 -0700 |
| commit | 7a8e08cac71924a301d96dbac6dcb283677e93b1 (patch) | |
| tree | 2296d1e722f23aece08130c6b5d13b97d7899522 /src | |
| parent | a43e0c2108d27cc88a22a9881ce5aaaa690a1d65 (diff) | |
| download | coreclr-7a8e08cac71924a301d96dbac6dcb283677e93b1.tar.gz coreclr-7a8e08cac71924a301d96dbac6dcb283677e93b1.tar.bz2 coreclr-7a8e08cac71924a301d96dbac6dcb283677e93b1.zip | |
Fix LTTng build for build environments with older liblttng-ust-dev (#27273) (#27294)
* Fix macro redefinition to use XplatEventLogger instead of simply writing FALSE
* Fix linker error
* undo newline changes
* Some changes to comment
* Move wrapper export from eventpipe.cpp to eventtrace.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/scripts/genLttngProvider.py | 5 | ||||
| -rw-r--r-- | src/vm/eventtrace.cpp | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/scripts/genLttngProvider.py b/src/scripts/genLttngProvider.py index 38fca2d09b..393ca3f4c0 100644 --- a/src/scripts/genLttngProvider.py +++ b/src/scripts/genLttngProvider.py @@ -546,7 +546,10 @@ def generateLttngFiles(etwmanifest,eventprovider_directory, dryRun): lttngimpl_file.write("#include \"" + lttngevntheadershortname + "\"\n\n") lttngimpl_file.write("""#ifndef tracepoint_enabled -#define tracepoint_enabled(provider, name) FALSE + +extern "C" bool XplatEventLoggerIsEnabled(); + +#define tracepoint_enabled(provider, name) XplatEventLoggerIsEnabled() #define do_tracepoint tracepoint #endif diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp index f5f6389d89..ec09400745 100644 --- a/src/vm/eventtrace.cpp +++ b/src/vm/eventtrace.cpp @@ -7543,3 +7543,11 @@ bool EventPipeHelper::IsEnabled(DOTNET_TRACE_CONTEXT Context, UCHAR Level, ULONG return false; } #endif // FEATURE_PERFTRACING + +#if defined(FEATURE_PAL) && defined(FEATURE_PERFTRACING) +// This is a wrapper method for LTTng. See https://github.com/dotnet/coreclr/pull/27273 for details. +extern "C" bool XplatEventLoggerIsEnabled() +{ + return XplatEventLogger::IsEventLoggingEnabled(); +} +#endif // FEATURE_PAL && FEATURE_PERFTRACING |