From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758435AbcIWF3B (ORCPT ); Fri, 23 Sep 2016 01:29:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48984 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755197AbcIWF27 (ORCPT ); Fri, 23 Sep 2016 01:28:59 -0400 Date: Thu, 22 Sep 2016 22:28:35 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: acme@redhat.com, dsahern@gmail.com, a.p.zijlstra@chello.nl, dzickus@redhat.com, mingo@kernel.org, namhyung@kernel.org, jmario@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org, andi@firstfloor.org, hpa@zytor.com Reply-To: tglx@linutronix.de, jolsa@kernel.org, andi@firstfloor.org, hpa@zytor.com, dsahern@gmail.com, acme@redhat.com, dzickus@redhat.com, a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, jmario@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <1474558645-19956-2-git-send-email-jolsa@kernel.org> References: <1474558645-19956-2-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists: Add __hist_entry__snprintf function Git-Commit-ID: 9da44db1493a9d384ddc1bcd1553a1803ff985b6 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: 9da44db1493a9d384ddc1bcd1553a1803ff985b6 Gitweb: http://git.kernel.org/tip/9da44db1493a9d384ddc1bcd1553a1803ff985b6 Author: Jiri Olsa AuthorDate: Thu, 22 Sep 2016 17:36:29 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 22 Sep 2016 13:08:56 -0300 perf hists: Add __hist_entry__snprintf function Add __hist_entry__snprintf() to take a perf_hpp_list as an argument instead of using he->hists->hpp_list. This way we can display arbitrary list of entries regardless of the hists setup, which will be useful in the upcoming c2c patch series. Signed-off-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Don Zickus Cc: Joe Mario Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1474558645-19956-2-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/stdio/hist.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index c8dca34..189665c 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c @@ -373,7 +373,8 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he, return 0; } -static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) +static int __hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp, + struct perf_hpp_list *hpp_list) { const char *sep = symbol_conf.field_sep; struct perf_hpp_fmt *fmt; @@ -384,7 +385,7 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) if (symbol_conf.exclude_other && !he->parent) return 0; - hists__for_each_format(he->hists, fmt) { + perf_hpp_list__for_each_format(hpp_list, fmt) { if (perf_hpp__should_skip(fmt, he->hists)) continue; @@ -410,6 +411,11 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) return hpp->buf - start; } +static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) +{ + return __hist_entry__snprintf(he, hpp, he->hists->hpp_list); +} + static int hist_entry__hierarchy_fprintf(struct hist_entry *he, struct perf_hpp *hpp, struct hists *hists,