From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753292AbbKZIVo (ORCPT ); Thu, 26 Nov 2015 03:21:44 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56077 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753013AbbKZIVl (ORCPT ); Thu, 26 Nov 2015 03:21:41 -0500 Date: Thu, 26 Nov 2015 00:21:07 -0800 From: tip-bot for Steven Rostedt Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, rostedt@goodmis.org, namhyung@kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org, acme@redhat.com, rostedt@goodmis.org, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <20151116172516.4b79b109@gandalf.local.home> References: <20151116172516.4b79b109@gandalf.local.home> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines Git-Commit-ID: 32abc2ede536aae52978d6c0a8944eb1df14f460 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 32abc2ede536aae52978d6c0a8944eb1df14f460 Gitweb: http://git.kernel.org/tip/32abc2ede536aae52978d6c0a8944eb1df14f460 Author: Steven Rostedt AuthorDate: Mon, 16 Nov 2015 17:25:16 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Nov 2015 19:17:23 -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 Acked-by: Namhyung Kim Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20151116172516.4b79b109@gandalf.local.home Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/event-parse.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 2a912df..68276f3 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4968,13 +4968,12 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event sizeof(long) != 8) { char *p; - ls = 2; /* make %l into %ll */ - p = strchr(format, 'l'); - if (p) + if (ls == 1 && (p = strchr(format, 'l'))) memmove(p+1, p, strlen(p)+1); else if (strcmp(format, "%p") == 0) strcpy(format, "0x%llx"); + ls = 2; } switch (ls) { case -2: