Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1278071

[tip:perf/core] tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines

Show all headers | View raw

Commit-ID:  32abc2ede536aae52978d6c0a8944eb1df14f460
Gitweb:     http://git.kernel.org/tip/32abc2ede536aae52978d6c0a8944eb1df14f460
Author:     Steven Rostedt <rostedt@goodmis.org>
AuthorDate: Mon, 16 Nov 2015 17:25:16 -0500
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 23 Nov 2015 19:17:23 -0300

tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines

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>
---
 tools/lib/traceevent/event-parse.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 2a912df..68276f3 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4968,13 +4968,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:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] tools lib traceevents: Fix output of %llu for 64 bit values  read on 32 bit machines Steven Rostedt <rostedt@goodmis.org> - 2015-11-16 21:40 +0100
  [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit  values read on 32 bit machines Steven Rostedt <rostedt@goodmis.org> - 2015-11-16 23:30 +0100
    Re: [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit  values read on 32 bit machines Namhyung Kim <namhyung@kernel.org> - 2015-11-17 01:30 +0100
      Re: [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit  values read on 32 bit machines Steven Rostedt <rostedt@goodmis.org> - 2015-11-17 03:50 +0100
    Re: [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit  values read on 32 bit machines Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-23 23:20 +0100
    [tip:perf/core] tools lib traceevent:   Fix output of %llu for 64 bit values read on 32 bit machines tip-bot for Steven Rostedt <tipbot@zytor.com> - 2015-11-26 09:30 +0100
  Re: [PATCH] tools lib traceevents: Fix output of %llu for 64 bit  values read on 32 bit machines Steven Rostedt <rostedt@goodmis.org> - 2015-11-16 23:30 +0100

csiph-web