tracetool: also strip %l and %ll from systemtap format strings
PATCH v2 1/1 tracetool: also strip %l and %ll from systemtap format strings
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)^
--- scripts/tracetool/format/log_stap.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
In v2:
- Change existing logic that stripped %z to handle %l/%ll too
scripts/tracetool/format/log_stap.py +6 -1
@@ -77,7 +77,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. Simiarly 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):
Signature · 1 line
2.29.2
Quoted 29 lines · Daniel P. Berrangé
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é <[email protected]>--- scripts/tracetool/format/log_stap.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)In v2:
- Change existing logic that stripped %z to handle %l/%ll too
scripts/tracetool/format/log_stap.py +0
-0@@ -77,7 +77,12 @@ def c_fmt_to_stap(fmt): elif state == STATE_LITERAL: bits.append(literal)
scripts/tracetool/format/log_stap.py def c_fmt_to_stap(fmt): · line 88
Quoted 10 lines
scripts/tracetool/format/log_stap.py +6
-1- 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. Simiarly 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):
Quoted 25 lines · Daniel P. Berrangé
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é <[email protected]>--- scripts/tracetool/format/log_stap.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)In v2:
- Change existing logic that stripped %z to handle %l/%ll too
scripts/tracetool/format/log_stap.py +0
-0
scripts/tracetool/format/log_stap.py def c_fmt_to_stap(fmt): · line 82
Quoted 7 lines
scripts/tracetool/format/log_stap.py +3
-1@@ -77,7 +77,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. Simiarly the size_t
Didn't see the typo the first time:
s/Simiarly/Similarly/
Thanks,
Laurent
Philippe Mathieu-Daudé
Reviewed-byQuoted 29 lines · Laurent Vivier
Quoted 28 lines · Daniel P. Berrangé
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é <[email protected]>--- scripts/tracetool/format/log_stap.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)In v2:
- Change existing logic that stripped %z to handle %l/%ll too
scripts/tracetool/format/log_stap.py +0
-0@@ -77,7 +77,12 @@ def c_fmt_to_stap(fmt): elif state == STATE_LITERAL: bits.append(literal)
Quoted 8 lines
scripts/tracetool/format/log_stap.py def c_fmt_to_stap(fmt): · line 82
Quoted 4 lines
scripts/tracetool/format/log_stap.py +3
-1- 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. Simiarly the size_tDidn't see the typo the first time:
s/Simiarly/Similarly/
Stefan Hajnoczi
AppliedQuoted 11 lines · Daniel P. Berrangé
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)^
Quoted 8 lines
Signed-off-by Daniel P. Berrangé <[email protected]>--- scripts/tracetool/format/log_stap.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)In v2:
- Change existing logic that stripped %z to handle %l/%ll too
Thanks, applied to my tracing tree with Laurent's typo fix:
https://gitlab.com/stefanha/qemu/commits/tracing
Stefan