Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 7a8e08c

Browse files
authored
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
1 parent a43e0c2 commit 7a8e08c

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/scripts/genLttngProvider.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,10 @@ def generateLttngFiles(etwmanifest,eventprovider_directory, dryRun):
546546
lttngimpl_file.write("#include \"" + lttngevntheadershortname + "\"\n\n")
547547

548548
lttngimpl_file.write("""#ifndef tracepoint_enabled
549-
#define tracepoint_enabled(provider, name) FALSE
549+
550+
extern "C" bool XplatEventLoggerIsEnabled();
551+
552+
#define tracepoint_enabled(provider, name) XplatEventLoggerIsEnabled()
550553
#define do_tracepoint tracepoint
551554
#endif
552555

src/vm/eventtrace.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -7543,3 +7543,11 @@ bool EventPipeHelper::IsEnabled(DOTNET_TRACE_CONTEXT Context, UCHAR Level, ULONG
75437543
return false;
75447544
}
75457545
#endif // FEATURE_PERFTRACING
7546+
7547+
#if defined(FEATURE_PAL) && defined(FEATURE_PERFTRACING)
7548+
// This is a wrapper method for LTTng. See https://github.com/dotnet/coreclr/pull/27273 for details.
7549+
extern "C" bool XplatEventLoggerIsEnabled()
7550+
{
7551+
return XplatEventLogger::IsEventLoggingEnabled();
7552+
}
7553+
#endif // FEATURE_PAL && FEATURE_PERFTRACING

0 commit comments

Comments
 (0)