diff options
| author | Wolfgang Mauerer <wolfgang.mauerer@siemens.com> | 2012-03-22 11:18:21 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-02 08:31:36 -0400 |
| commit | b53e28d3b3683a36266f76383090b56349ab3024 (patch) | |
| tree | d7c814313e899cb4df50cc1af19b4831f7d0355e | |
| parent | b76ed2aab56e2a38bfdb69eefd5e83ac1c848739 (diff) | |
| download | trace-cmd-b53e28d3b3683a36266f76383090b56349ab3024.tar.gz | |
parse-events: 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.
Link: http://lkml.kernel.org/r/1332411501-8059-3-git-send-email-wolfgang.mauerer@siemens.com
Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | parse-events.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/parse-events.c b/parse-events.c index f8ba6a5d..5214771e 100644 --- a/parse-events.c +++ b/parse-events.c @@ -3789,14 +3789,15 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event break; } } - if (pevent->long_size == 8 && ls) { + if (pevent->long_size == 8 && ls && + sizeof(long) != 8) { char *p; ls = 2; /* make %l into %ll */ p = strchr(format, 'l'); if (p) - memmove(p, p+1, strlen(p)+1); + memmove(p+1, p, strlen(p)+1); else if (strcmp(format, "%p") == 0) strcpy(format, "0x%llx"); } |