Re: [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit values read on 32 bit machines

[Namhyung Kim <namhyung@kernel.org>]

On Mon, Nov 16, 2015 at 05:25:16PM -0500, Steven Rostedt wrote:
> 
> 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.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Acked-by: Namhyung Kim <namhyung@kernel.org>


What about the opposite case?  Maybe we need something like this?

Thanks,
Namhyung


diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 4d885934b919..afc32fb17d1e 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4906,6 +4906,17 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 						memmove(p+1, p, strlen(p)+1);
 					else if (strcmp(format, "%p") == 0)
 						strcpy(format, "0x%llx");
+				} else if (pevent->long_size == 4 && ls == 1 &&
+					   sizeof(long) != 4) {
+					char *p;
+
+					ls = 0;
+					/* make %l into % */
+					p = strchr(format, 'l');
+					if (p)
+						memmove(p, p+1, strlen(p));
+					else if (strcmp(format, "%p") == 0)
+						strcpy(foramt, "0x%x");
 				}
 				switch (ls) {
 				case -2: