From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754454AbeAQQcA (ORCPT ); Wed, 17 Jan 2018 11:32:00 -0500 Received: from terminus.zytor.com ([65.50.211.136]:50149 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754433AbeAQQb6 (ORCPT ); Wed, 17 Jan 2018 11:31:58 -0500 Date: Wed, 17 Jan 2018 08:29:23 -0800 From: "tip-bot for Steven Rostedt (VMware)" Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, rostedt@goodmis.org, acme@redhat.com, akpm@linux-foundation.org, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, rostedt@goodmis.org, mingo@kernel.org, akpm@linux-foundation.org, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org In-Reply-To: <20180112004822.260262257@goodmis.org> References: <20180112004822.260262257@goodmis.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Simplify pointer print logic and fix %pF Git-Commit-ID: 38d70b7ca1769f26c0b79f3c08ff2cc949712b59 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: 38d70b7ca1769f26c0b79f3c08ff2cc949712b59 Gitweb: https://git.kernel.org/tip/38d70b7ca1769f26c0b79f3c08ff2cc949712b59 Author: Steven Rostedt (VMware) AuthorDate: Thu, 11 Jan 2018 19:47:45 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 17 Jan 2018 10:22:03 -0300 tools lib traceevent: Simplify pointer print logic and fix %pF When processing %pX in pretty_print(), simplify the logic slightly by incrementing the ptr to the format string if isalnum(ptr[1]) is true. This follows the logic a bit more closely to what is in the kernel. Also, this fixes a small bug where %pF was not giving the offset of the function. Signed-off-by: Steven Rostedt Acked-by: Namhyung Kim Cc: Andrew Morton Link: http://lkml.kernel.org/r/20180112004822.260262257@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/event-parse.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 87757ea..8757dd6 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4956,21 +4956,22 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event else ls = 2; - if (*(ptr+1) == 'F' || *(ptr+1) == 'f' || - *(ptr+1) == 'S' || *(ptr+1) == 's') { + if (isalnum(ptr[1])) ptr++; + + if (*ptr == 'F' || *ptr == 'f' || + *ptr == 'S' || *ptr == 's') { show_func = *ptr; - } else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') { - print_mac_arg(s, *(ptr+1), data, size, event, arg); - ptr++; + } else if (*ptr == 'M' || *ptr == 'm') { + print_mac_arg(s, *ptr, data, size, event, arg); arg = arg->next; break; - } else if (*(ptr+1) == 'I' || *(ptr+1) == 'i') { + } else if (*ptr == 'I' || *ptr == 'i') { int n; - n = print_ip_arg(s, ptr+1, data, size, event, arg); + n = print_ip_arg(s, ptr, data, size, event, arg); if (n > 0) { - ptr += n; + ptr += n - 1; arg = arg->next; break; }