From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932545AbcBYHpJ (ORCPT ); Thu, 25 Feb 2016 02:45:09 -0500 Received: from torg.zytor.com ([198.137.202.12]:57674 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754753AbcBYHpG (ORCPT ); Thu, 25 Feb 2016 02:45:06 -0500 Date: Wed, 24 Feb 2016 23:43:25 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: penberg@kernel.org, hpa@zytor.com, peterz@infradead.org, jolsa@kernel.org, andi@firstfloor.org, wangnan0@huawei.com, acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, eranian@google.com, namhyung@kernel.org, dsahern@gmail.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, eranian@google.com, dsahern@gmail.com, namhyung@kernel.org, mingo@kernel.org, wangnan0@huawei.com, acme@redhat.com, andi@firstfloor.org, jolsa@kernel.org, hpa@zytor.com, peterz@infradead.org, penberg@kernel.org In-Reply-To: <1456326830-30456-10-git-send-email-namhyung@kernel.org> References: <1456326830-30456-10-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf ui/stdio: Implement hierarchy output mode Git-Commit-ID: ef86d68a088c324e4bd85f82387d1f9a571affd0 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: ef86d68a088c324e4bd85f82387d1f9a571affd0 Gitweb: http://git.kernel.org/tip/ef86d68a088c324e4bd85f82387d1f9a571affd0 Author: Namhyung Kim AuthorDate: Thu, 25 Feb 2016 00:13:41 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 24 Feb 2016 20:21:12 -0300 perf ui/stdio: Implement hierarchy output mode The hierarchy output mode is to group entries for each level so that user can see higher level picture more easily. It also helps to find out which component is most costly. The output will look like below: 15.11% swapper 14.97% [kernel.vmlinux] 0.09% [libahci] 0.05% [iwlwifi] 10.29% irq/33-iwlwifi 6.45% [kernel.vmlinux] 1.41% [mac80211] 1.15% [iwldvm] 1.14% [iwlwifi] 0.14% [cfg80211] 4.81% firefox 3.92% libxul.so 0.34% [kernel.vmlinux] Signed-off-by: Namhyung Kim Acked-by: Pekka Enberg Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1456326830-30456-10-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/stdio/hist.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- tools/perf/util/hist.h | 2 ++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index 87b022f..90b8677 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c @@ -410,6 +410,76 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) return hpp->buf - start; } +static int hist_entry__hierarchy_fprintf(struct hist_entry *he, + struct perf_hpp *hpp, + int nr_sort_key, struct hists *hists, + FILE *fp) +{ + const char *sep = symbol_conf.field_sep; + struct perf_hpp_fmt *fmt; + char *buf = hpp->buf; + int ret, printed = 0; + bool first = true; + + if (symbol_conf.exclude_other && !he->parent) + return 0; + + ret = scnprintf(hpp->buf, hpp->size, "%*s", he->depth * HIERARCHY_INDENT, ""); + advance_hpp(hpp, ret); + + hists__for_each_format(he->hists, fmt) { + if (perf_hpp__is_sort_entry(fmt) || perf_hpp__is_dynamic_entry(fmt)) + break; + + /* + * If there's no field_sep, we still need + * to display initial ' '. + */ + if (!sep || !first) { + ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: " "); + advance_hpp(hpp, ret); + } else + first = false; + + if (perf_hpp__use_color() && fmt->color) + ret = fmt->color(fmt, hpp, he); + else + ret = fmt->entry(fmt, hpp, he); + + ret = hist_entry__snprintf_alignment(he, hpp, fmt, ret); + advance_hpp(hpp, ret); + } + + if (sep) + ret = scnprintf(hpp->buf, hpp->size, "%s", sep); + else + ret = scnprintf(hpp->buf, hpp->size, "%*s", + (nr_sort_key - 1) * HIERARCHY_INDENT + 2, ""); + advance_hpp(hpp, ret); + + /* + * No need to call hist_entry__snprintf_alignment() since this + * fmt is always the last column in the hierarchy mode. + */ + fmt = he->fmt; + if (perf_hpp__use_color() && fmt->color) + fmt->color(fmt, hpp, he); + else + fmt->entry(fmt, hpp, he); + + printed += fprintf(fp, "%s\n", buf); + + if (symbol_conf.use_callchain && he->leaf) { + u64 total = hists__total_period(hists); + + printed += hist_entry_callchain__fprintf(he, total, 0, fp); + goto out; + } + +out: + return printed; +} + static int hist_entry__fprintf(struct hist_entry *he, size_t size, struct hists *hists, char *bf, size_t bfsz, FILE *fp) @@ -424,6 +494,13 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, if (size == 0 || size > bfsz) size = hpp.size = bfsz; + if (symbol_conf.report_hierarchy) { + int nr_sort = hists->hpp_list->nr_sort_keys; + + return hist_entry__hierarchy_fprintf(he, &hpp, nr_sort, + hists, fp); + } + hist_entry__snprintf(he, &hpp); ret = fprintf(fp, "%s\n", bf); @@ -522,7 +599,7 @@ print_entries: goto out; } - for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) { + for (nd = rb_first(&hists->entries); nd; nd = __rb_hierarchy_next(nd, HMD_FORCE_CHILD)) { struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); float percent; diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index d08e4f3..722aa44 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -437,4 +437,6 @@ static inline struct rb_node *rb_hierarchy_next(struct rb_node *node) return __rb_hierarchy_next(node, HMD_NORMAL); } +#define HIERARCHY_INDENT 3 + #endif /* __PERF_HIST_H */