From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755682AbcBBOlv (ORCPT ); Tue, 2 Feb 2016 09:41:51 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35666 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755647AbcBBOlr (ORCPT ); Tue, 2 Feb 2016 09:41:47 -0500 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , David Ahern , Stephane Eranian , Andi Kleen , Wang Nan Subject: [PATCH 10/21] perf hists: Add helper functions for hierarchy mode Date: Tue, 2 Feb 2016 23:39:52 +0900 Message-Id: <1454424003-19031-11-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1454424003-19031-1-git-send-email-namhyung@kernel.org> References: <1454424003-19031-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rb_hierarchy_{next,prev,last} functions are to traverse all hist entries in a hierarchy. They will be used by various function which supports hierarchy output. Acked-by: Pekka Enberg Signed-off-by: Namhyung Kim --- tools/perf/util/hist.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/hist.h | 8 ++++++++ 2 files changed, 53 insertions(+) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index b0840f9bfe98..3d9709473b0c 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1416,6 +1416,51 @@ void hists__output_resort(struct hists *hists, struct ui_progress *prog) } } +struct rb_node *rb_hierarchy_last(struct rb_node *node) +{ + struct hist_entry *he = rb_entry(node, struct hist_entry, rb_node); + + while (he->unfolded && !he->leaf) { + node = rb_last(&he->hroot_out); + he = rb_entry(node, struct hist_entry, rb_node); + } + return node; +} + +struct rb_node *rb_hierarchy_next(struct rb_node *node) +{ + struct hist_entry *he = rb_entry(node, struct hist_entry, rb_node); + + if (!he->leaf && he->unfolded) + node = rb_first(&he->hroot_out); + else + node = rb_next(node); + + while (node == NULL) { + he = he->parent_he; + if (he == NULL) + break; + + node = rb_next(&he->rb_node); + } + return node; +} + +struct rb_node *rb_hierarchy_prev(struct rb_node *node) +{ + struct hist_entry *he = rb_entry(node, struct hist_entry, rb_node); + + node = rb_prev(node); + if (node) + return rb_hierarchy_last(node); + + he = he->parent_he; + if (he == NULL) + return NULL; + + return &he->rb_node; +} + static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h, enum hist_filter filter) { diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 9c72f8331d1c..487cb677d48e 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -381,4 +381,12 @@ int parse_filter_percentage(const struct option *opt __maybe_unused, const char *arg, int unset __maybe_unused); int perf_hist_config(const char *var, const char *value); +#define HIERARCHY_INDENT 3 + +int perf_hpp__count_sort_keys(void); + +struct rb_node *rb_hierarchy_last(struct rb_node *node); +struct rb_node *rb_hierarchy_next(struct rb_node *node); +struct rb_node *rb_hierarchy_prev(struct rb_node *node); + #endif /* __PERF_HIST_H */ -- 2.6.4