tools lib traceevent: Fix trace_printk for long integers

On 32 bit systems, a conversion of the trace_printk format string
"%lu" -> "%llu" is intended (similar for %lx etc.) when a trace was
taken on a machine with 64 bit long integers. However, the current
code computes the bogus transformation "%lu" -> "%u".  Fix this.

Besides that, the transformation is only required on systems that don't
use 64 bits for long integers natively.

Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1332411501-8059-3-git-send-email-wolfgang.mauerer@siemens.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Wolfgang Mauerer 2012-03-22 11:18:21 +01:00 committed by Namhyung Kim
parent aaf05c725b
commit c5b35b7319

View File

@ -3895,14 +3895,15 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
break; break;
} }
} }
if (pevent->long_size == 8 && ls) { if (pevent->long_size == 8 && ls &&
sizeof(long) != 8) {
char *p; char *p;
ls = 2; ls = 2;
/* make %l into %ll */ /* make %l into %ll */
p = strchr(format, 'l'); p = strchr(format, 'l');
if (p) if (p)
memmove(p, p+1, strlen(p)+1); memmove(p+1, p, strlen(p)+1);
else if (strcmp(format, "%p") == 0) else if (strcmp(format, "%p") == 0)
strcpy(format, "0x%llx"); strcpy(format, "0x%llx");
} }