diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2015-11-16 17:25:16 -0500 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-01 11:34:03 -0500 |
| commit | f0193949e113c8bf87ed8d6143bcf5823dd78db0 (patch) | |
| tree | 286856f8cf97480eac162961c3b9a45e0a9d6272 /tools | |
| parent | 6649b1104932f3213f7e5aca7aefbdff7fbfae6b (diff) | |
| download | lwn-f0193949e113c8bf87ed8d6143bcf5823dd78db0.tar.gz lwn-f0193949e113c8bf87ed8d6143bcf5823dd78db0.zip | |
tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines
[ Upstream commit 32abc2ede536aae52978d6c0a8944eb1df14f460 ]
When a long value is read on 32 bit machines for 64 bit output, the
parsing needs to change "%lu" into "%llu", as the value is read
natively.
Unfortunately, if "%llu" is already there, the code will add another "l"
to it and fail to parse it properly.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20151116172516.4b79b109@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/traceevent/event-parse.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index ed5461f065bd..f64a2d54d467 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4841,13 +4841,12 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event sizeof(long) != 8) { char *p; - ls = 2; /* make %l into %ll */ - p = strchr(format, 'l'); - if (p) + if (ls == 1 && (p = strchr(format, 'l'))) memmove(p+1, p, strlen(p)+1); else if (strcmp(format, "%p") == 0) strcpy(format, "0x%llx"); + ls = 2; } switch (ls) { case -2: |