Commit 32abc2ed authored Nov 16, 2015 by Steven Rostedt Committed by Arnaldo Carvalho de Melo Nov 23, 2015

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>

parent 646a6e84

tools/lib/traceevent/event-parse.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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: