linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot for Steven Rostedt (Red Hat)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rostedt@goodmis.org, akpm@linux-foundation.org,
	tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org,
	mingo@kernel.org, acme@redhat.com
Subject: [tip:perf/core] tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines
Date: Sat, 5 Mar 2016 00:19:54 -0800	[thread overview]
Message-ID: <tip-a66673a07e260807f570db8f08a9c1207932c665@git.kernel.org> (raw)
In-Reply-To: <20160209204237.337024613@goodmis.org>

Commit-ID:  a66673a07e260807f570db8f08a9c1207932c665
Gitweb:     http://git.kernel.org/tip/a66673a07e260807f570db8f08a9c1207932c665
Author:     Steven Rostedt (Red Hat) <rostedt@goodmis.org>
AuthorDate: Tue, 9 Feb 2016 15:40:17 -0500
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 3 Mar 2016 11:10:38 -0300

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>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20160209204237.337024613@goodmis.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index fb790aa..865dea5 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4978,7 +4978,7 @@ 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 == 1 &&
 				    sizeof(long) != 8) {
 					char *p;
 

  reply	other threads:[~2016-03-05  8:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-09 20:40 [PATCH 0/4] tools lib traceevent: Updates from trace-cmd Steven Rostedt
2016-02-09 20:40 ` [PATCH 1/4] tools lib traceevent: Fix time stamp rounding issue Steven Rostedt
2016-03-05  8:19   ` [tip:perf/core] " tip-bot for Chaos.Chen
2016-02-09 20:40 ` [PATCH 2/4] tools lib traceevent: Use USECS_PER_SEC instead of hardcoded number Steven Rostedt
2016-03-02 12:20   ` Arnaldo Carvalho de Melo
2016-08-05 18:19     ` Steven Rostedt
2016-08-05 18:36       ` Arnaldo Carvalho de Melo
2016-08-05 19:15         ` Steven Rostedt
2016-08-05 23:02           ` Arnaldo Carvalho de Melo
2016-02-09 20:40 ` [PATCH 3/4] tools lib traceevent: Set int_array fields to NULL if freeing from error Steven Rostedt
2016-03-05  8:19   ` [tip:perf/core] " tip-bot for Steven Rostedt (Red Hat)
2016-02-09 20:40 ` [PATCH 4/4] tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines Steven Rostedt
2016-03-05  8:19   ` tip-bot for Steven Rostedt (Red Hat) [this message]
2016-03-01 21:47 ` [PATCH 0/4] tools lib traceevent: Updates from trace-cmd Steven Rostedt
  -- strict thread matches above, loose matches on Subject: below --
2015-11-16 22:25 [PATCH v2] tools lib traceevents: Fix output of %llu for 64 bit values read on 32 bit machines Steven Rostedt
2015-11-26  8:21 ` [tip:perf/core] tools lib traceevent: " tip-bot for Steven Rostedt

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=tip-a66673a07e260807f570db8f08a9c1207932c665@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).