diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2020-06-25 15:07:57 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2020-07-07 16:07:14 +0100 |
| commit | 27e08bab94f7c6ebe0b75938c98c394c969e3fd8 (patch) | |
| tree | d65869d3ca7c88dfba52f71e6851d8f6cb996480 /scripts/tracetool | |
| parent | 7623b5ba017f61de5d7c2bba12c6feb3d55091b1 (diff) | |
tracetool: work around ust <sys/sdt.h> include conflict
Both the dtrace and ust backends may include <sys/sdt.h> but LTTng
Userspace Tracer 2.11 and later requires SDT_USE_VARIADIC to be defined
before including the header file.
This is a classic problem with C header files included from different
parts of a program. If the same header is included twice within the same
compilation unit then the first inclusion determines the macro
environment.
Work around this by defining SDT_USE_VARIADIC in the dtrace backend too.
It doesn't hurt and fixes a missing STAP_PROBEV() compiler error when
the ust backend is enabled together with the dtrace backend.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200625140757.237012-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'scripts/tracetool')
| -rw-r--r-- | scripts/tracetool/backend/dtrace.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py index 5711892ba0..b7fe4c1b50 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -40,6 +40,12 @@ def generate_h_begin(events, group): else: header = "trace-dtrace.h" + # Workaround for ust backend, which also includes <sys/sdt.h> and may + # require SDT_USE_VARIADIC to be defined. If dtrace includes <sys/sdt.h> + # first without defining SDT_USE_VARIADIC then ust breaks because the + # STAP_PROBEV() macro is not defined. + out('#define SDT_USE_VARIADIC 1') + out('#include "%s"' % header, '') |