OSDN Git Service

tracetool: work around ust <sys/sdt.h> include conflict
authorStefan Hajnoczi <stefanha@redhat.com>
Thu, 25 Jun 2020 14:07:57 +0000 (15:07 +0100)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 7 Jul 2020 15:07:14 +0000 (16:07 +0100)
commit27e08bab94f7c6ebe0b75938c98c394c969e3fd8
treed65869d3ca7c88dfba52f71e6851d8f6cb996480
parent7623b5ba017f61de5d7c2bba12c6feb3d55091b1
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>
scripts/tracetool/backend/dtrace.py