From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
Subject: [PATCH 05/16] tools lib traceevent: Fix trace_printk for long integers
Date: Wed, 4 Jul 2012 14:35:19 +0900 [thread overview]
Message-ID: <1341380130-23863-5-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1341380130-23863-1-git-send-email-namhyung@kernel.org>
From: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
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>
---
tools/lib/traceevent/event-parse.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index da06c33dcf41..ddee5a8cf135 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -3895,14 +3895,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");
}
--
1.7.10.4
next prev parent reply other threads:[~2012-07-04 5:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-04 5:34 [GIT PULL 00/16] tools lib traceevent: Pending backports of libparseevent Namhyung Kim
2012-07-04 5:35 ` [PATCH 01/16] tools lib traceevent: Let filtering numbers by string use function names Namhyung Kim
2012-07-04 5:35 ` [PATCH 02/16] tools lib traceevent: Add support for "%.*s" in bprintk events Namhyung Kim
2012-07-04 5:35 ` [PATCH 03/16] tools lib traceevent: Add support to show migrate disable counter Namhyung Kim
2012-07-04 5:35 ` [PATCH 04/16] tools lib traceevent: Fix %pM print format arg handling Namhyung Kim
2012-07-04 5:35 ` Namhyung Kim [this message]
2012-07-04 5:35 ` [PATCH 06/16] tools lib traceevent: Fix printk_cmp() Namhyung Kim
2012-07-04 5:35 ` [PATCH 07/16] tools lib traceevent: Introduce extend_token() Namhyung Kim
2012-07-04 5:35 ` [PATCH 08/16] tools lib traceevent: Handle strdup failure cases Namhyung Kim
2012-07-04 5:35 ` [PATCH 09/16] tools lib traceevent: Handle realloc() failure path Namhyung Kim
2012-07-04 5:35 ` [PATCH 10/16] tools lib traceevent: Pass string type argument to args Namhyung Kim
2012-07-04 5:35 ` [PATCH 11/16] tools lib traceevent: Do not call add_event() again if allocation failed Namhyung Kim
2012-07-04 5:35 ` [PATCH 12/16] tools lib traceevent: Fix some comments Namhyung Kim
2012-07-04 5:35 ` [PATCH 13/16] tools lib traceevent: Check result of malloc() during reading token Namhyung Kim
2012-07-04 5:35 ` [PATCH 14/16] tools lib traceevent: Check return value of arg_to_str() Namhyung Kim
2012-07-04 5:35 ` [PATCH 15/16] tools lib traceevent: Add missing break in make_bprint_args Namhyung Kim
2012-07-04 5:35 ` [PATCH 16/16] tools lib traceevent: Cleanup realloc use Namhyung Kim
2012-07-05 15:27 ` [GIT PULL 00/16] tools lib traceevent: Pending backports of libparseevent Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341380130-23863-5-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=wolfgang.mauerer@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®