From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Sagar Karandikar" <sagark@eecs.berkeley.edu>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Li Zhijian" <lizhijian@cn.fujitsu.com>,
qemu-block@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Cameron Esfahani" <dirty@apple.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Kevin Wolf" <kwolf@redhat.com>,
qemu-riscv@nongnu.org,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
"Max Reitz" <mreitz@redhat.com>,
"Zhang Chen" <chen.zhang@intel.com>,
qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Stefan Berger" <stefanb@linux.ibm.com>
Subject: [PULL 1/9] scripts/tracetool: Fix dtrace generation for macOS
Date: Thu, 13 Aug 2020 06:22:49 +0100 [thread overview]
Message-ID: <20200813052257.226142-2-stefanha@redhat.com> (raw)
In-Reply-To: <20200813052257.226142-1-stefanha@redhat.com>
From: Roman Bolshakov <r.bolshakov@yadro.com>
dtrace USDT is fully supported since OS X 10.6. There are a few
peculiarities compared to other dtrace flavors.
1. It doesn't accept empty files.
2. It doesn't recognize bool type but accepts C99 _Bool.
3. It converts int8_t * in probe points to char * in
header files and introduces [-Wpointer-sign] warning.
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200717093517.73397-2-r.bolshakov@yadro.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
scripts/tracetool/format/d.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py
index 0afb5f3f47..353722f89c 100644
--- a/scripts/tracetool/format/d.py
+++ b/scripts/tracetool/format/d.py
@@ -13,6 +13,7 @@ __email__ = "stefanha@redhat.com"
from tracetool import out
+from sys import platform
# Reserved keywords from
@@ -34,7 +35,8 @@ def generate(events, backend, group):
# SystemTap's dtrace(1) warns about empty "provider qemu {}" but is happy
# with an empty file. Avoid the warning.
- if not events:
+ # But dtrace on macOS can't deal with empty files.
+ if not events and platform != "darwin":
return
out('/* This file is autogenerated by tracetool, do not edit. */'
@@ -44,6 +46,17 @@ def generate(events, backend, group):
for e in events:
args = []
for type_, name in e.args:
+ if platform == "darwin":
+ # macOS dtrace accepts only C99 _Bool
+ if type_ == 'bool':
+ type_ = '_Bool'
+ if type_ == 'bool *':
+ type_ = '_Bool *'
+ # It converts int8_t * in probe points to char * in header
+ # files and introduces [-Wpointer-sign] warning.
+ # Avoid it by changing probe type to signed char * beforehand.
+ if type_ == 'int8_t *':
+ type_ = 'signed char *'
if name in RESERVED_WORDS:
name += '_'
args.append(type_ + ' ' + name)
--
2.26.2
next prev parent reply other threads:[~2020-08-13 7:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 5:22 [PULL 0/9] Tracing patches Stefan Hajnoczi
2020-08-13 5:22 ` Stefan Hajnoczi [this message]
2020-08-13 5:22 ` [PULL 2/9] scripts/tracetool: Use void pointer for vcpu Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 3/9] build: Don't make object files for dtrace on macOS Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 4/9] net/colo: Match is-enabled probe to tracepoint Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 5/9] softmmu: Add missing trace-events file Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 6/9] scripts/cleanup-trace-events: Fix for vcpu property Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 7/9] scripts/cleanup-trace-events: Emit files in alphabetical order Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 8/9] trace-events: Delete unused trace points Stefan Hajnoczi
2020-08-13 5:22 ` [PULL 9/9] trace-events: Fix attribution of trace points to source Stefan Hajnoczi
2020-08-13 10:31 ` [PULL 0/9] Tracing patches no-reply
2020-08-13 10:47 ` no-reply
2020-08-13 12:17 ` Stefan Hajnoczi
2020-08-21 16:25 ` Peter Maydell
2020-09-09 10:20 ` Stefan Hajnoczi
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=20200813052257.226142-2-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.williamson@redhat.com \
--cc=aurelien@aurel32.net \
--cc=chen.zhang@intel.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dirty@apple.com \
--cc=jasowang@redhat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=quintela@redhat.com \
--cc=r.bolshakov@yadro.com \
--cc=sagark@eecs.berkeley.edu \
--cc=stefanb@linux.ibm.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).