From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756793AbcBCKXJ (ORCPT ); Wed, 3 Feb 2016 05:23:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54911 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756594AbcBCKXD (ORCPT ); Wed, 3 Feb 2016 05:23:03 -0500 Date: Wed, 3 Feb 2016 02:22:21 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: fweisbec@gmail.com, dsahern@gmail.com, andi@firstfloor.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, jolsa@kernel.org, peterz@infradead.org, wangnan0@huawei.com, mingo@kernel.org Reply-To: acme@redhat.com, hpa@zytor.com, mingo@kernel.org, wangnan0@huawei.com, jolsa@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, andi@firstfloor.org, fweisbec@gmail.com, dsahern@gmail.com, tglx@linutronix.de In-Reply-To: <1453909257-26015-5-git-send-email-namhyung@kernel.org> References: <1453909257-26015-5-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Get rid of hist_entry__callchain_fprintf() Git-Commit-ID: 7e597d327eca3d92a759542ff707cba61af3a718 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: 7e597d327eca3d92a759542ff707cba61af3a718 Gitweb: http://git.kernel.org/tip/7e597d327eca3d92a759542ff707cba61af3a718 Author: Namhyung Kim AuthorDate: Thu, 28 Jan 2016 00:40:51 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 1 Feb 2016 17:20:31 -0300 perf report: Get rid of hist_entry__callchain_fprintf() It's just a wrapper function to align the start position ofcallchains to 'comm' of each thread if it's a first sort key. But it doesn't not work with tracepoint events and also with upcoming hierarchy view. Signed-off-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1453909257-26015-5-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/stdio/hist.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index 387110d..8e25f7d 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c @@ -349,30 +349,6 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he, return 0; } -static size_t hist_entry__callchain_fprintf(struct hist_entry *he, - struct hists *hists, - FILE *fp) -{ - int left_margin = 0; - u64 total_period = hists->stats.total_period; - - if (field_order == NULL && (sort_order == NULL || - !prefixcmp(sort_order, "comm"))) { - struct perf_hpp_fmt *fmt; - - perf_hpp__for_each_format(fmt) { - if (!perf_hpp__is_sort_entry(fmt)) - continue; - - /* must be 'comm' sort entry */ - left_margin = fmt->width(fmt, NULL, hists_to_evsel(hists)); - left_margin -= thread__comm_len(he->thread); - break; - } - } - return hist_entry_callchain__fprintf(he, total_period, left_margin, fp); -} - static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) { const char *sep = symbol_conf.field_sep; @@ -418,6 +394,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, .buf = bf, .size = size, }; + u64 total_period = hists->stats.total_period; if (size == 0 || size > bfsz) size = hpp.size = bfsz; @@ -427,7 +404,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, ret = fprintf(fp, "%s\n", bf); if (symbol_conf.use_callchain) - ret += hist_entry__callchain_fprintf(he, hists, fp); + ret += hist_entry_callchain__fprintf(he, total_period, 0, fp); return ret; }