From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Stefan Hajnoczi <stefanha@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [PATCH for-5.1] tracetool: carefully define SDT_USE_VARIADIC
Date: Thu, 30 Jul 2020 18:16:48 +0200 [thread overview]
Message-ID: <fe193d2f-1569-e402-7f30-0deee5729f09@redhat.com> (raw)
In-Reply-To: <20200729153926.127083-1-stefanha@redhat.com>
On 7/29/20 5:39 PM, Stefan Hajnoczi wrote:
> The dtrace backend defines SDT_USE_VARIADIC as a workaround for a
> conflict with a LTTng UST header file, which requires SDT_USE_VARIADIC
> to be defined.
>
> LTTng UST <lttng/tracepoint.h> breaks if included after generated dtrace
> headers because SDT_USE_VARIADIC will already be defined:
>
> #ifdef LTTNG_UST_HAVE_SDT_INTEGRATION
> #define SDT_USE_VARIADIC <-- error, it's already defined
> #include <sys/sdt.h>
>
> Be more careful when defining SDT_USE_VARIADIC. This fixes the build
> when both the dtrace and ust tracers are enabled at the same time.
>
> Fixes: 27e08bab94f7c6ebe0b75938c98c394c969e3fd8 ("tracetool: work around ust <sys/sdt.h> include conflict")
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> scripts/tracetool/backend/dtrace.py | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
> index b7fe4c1b50..fc0c8fc52f 100644
> --- a/scripts/tracetool/backend/dtrace.py
> +++ b/scripts/tracetool/backend/dtrace.py
> @@ -44,11 +44,15 @@ def generate_h_begin(events, group):
> # 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('#ifndef SDT_USE_VARIADIC')
> out('#define SDT_USE_VARIADIC 1')
> + out('#endif')
>
> out('#include "%s"' % header,
> '')
>
> + out('#undef SDT_USE_VARIADIC')
> +
> # SystemTap defines <provider>_<name>_ENABLED() but other DTrace
> # implementations might not.
> for e in events:
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
prev parent reply other threads:[~2020-07-30 16:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 15:39 [PATCH for-5.1] tracetool: carefully define SDT_USE_VARIADIC Stefan Hajnoczi
2020-07-30 15:02 ` Stefan Hajnoczi
2020-07-30 16:16 ` Philippe Mathieu-Daudé [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fe193d2f-1569-e402-7f30-0deee5729f09@redhat.com \
--to=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).