From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 05/11] tracetool: also strip %l and %ll from systemtap format strings
Date: Mon, 1 Feb 2021 15:46:57 +0000 [thread overview]
Message-ID: <20210201154703.180022-6-stefanha@redhat.com> (raw)
In-Reply-To: <20210201154703.180022-1-stefanha@redhat.com>
From: Daniel P. Berrangé <berrange@redhat.com>
All variables are 64-bit and so %l / %ll are not required, and the
latter is actually invalid:
$ sudo stap -e 'probe begin{printf ("BEGIN")}' -I .
parse error: invalid or missing conversion specifier
saw: operator ',' at ./qemu-system-x86_64-log.stp:15118:101
source: printf("%d@%d vhost_vdpa_set_log_base dev: %p base: 0x%x size: %llu
refcnt: %d fd: %d log: %p\n", pid(), gettimeofday_ns(), dev, base, size, refcnt, fd, log)
^
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Message-id: 20210106130239.1004729-1-berrange@redhat.com
[Fixed "simiarly" typo found by Laurent Vivier <lvivier@redhat.com>
--Stefan]
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
scripts/tracetool/format/log_stap.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py
index 3e1186ae9c..0b6549d534 100644
--- a/scripts/tracetool/format/log_stap.py
+++ b/scripts/tracetool/format/log_stap.py
@@ -78,7 +78,12 @@ def c_fmt_to_stap(fmt):
elif state == STATE_LITERAL:
bits.append(literal)
- fmt = re.sub("%(\d*)z(x|u|d)", "%\\1\\2", "".join(bits))
+ # All variables in systemtap are 64-bit in size
+ # The "%l" integer size qualifier is thus redundant
+ # and "%ll" is not valid at all. Similarly the size_t
+ # based "%z" size qualifier is not valid. We just
+ # strip all size qualifiers for sanity.
+ fmt = re.sub("%(\d*)(l+|z)(x|u|d)", "%\\1\\3", "".join(bits))
return fmt
def generate(events, backend, group):
--
2.29.2
next prev parent reply other threads:[~2021-02-01 15:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 15:46 [PULL 00/11] Tracing patches Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 01/11] trace: fix simpletrace doc mismerge Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 02/11] tracing: convert documentation to rST Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 03/11] trace: recommend "log" backend for getting started with tracing Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 04/11] tracetool: fix "PRI" macro decoding Stefan Hajnoczi
2021-02-01 15:46 ` Stefan Hajnoczi [this message]
2021-02-01 15:46 ` [PULL 06/11] trace: add meson custom_target() depend_files for tracetool Stefan Hajnoczi
2021-02-01 15:46 ` [PULL 07/11] error: rename error_with_timestamp to message_with_timestamp Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 08/11] trace: make the 'log' backend timestamp configurable Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 09/11] simpletrace: build() missing 2 required positional arguments Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 10/11] trace: document how to specify multiple --trace patterns Stefan Hajnoczi
2021-02-01 16:05 ` BALATON Zoltan
2021-02-01 16:13 ` Kevin Wolf
2021-02-01 16:27 ` Philippe Mathieu-Daudé
2021-02-01 16:29 ` BALATON Zoltan
2021-02-01 16:54 ` Kevin Wolf
2021-02-01 17:25 ` Paolo Bonzini
2021-02-01 17:39 ` BALATON Zoltan
2021-02-02 12:41 ` Markus Armbruster
2021-02-02 13:03 ` BALATON Zoltan
2021-02-02 13:12 ` Paolo Bonzini
2021-02-01 17:46 ` Daniel P. Berrangé
2021-02-01 18:13 ` BALATON Zoltan
2021-02-02 16:47 ` Stefan Hajnoczi
2021-02-01 15:47 ` [PULL 11/11] trace: update docs with meson build information Stefan Hajnoczi
2021-02-02 11:24 ` [PULL 00/11] Tracing patches Peter Maydell
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=20210201154703.180022-6-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).