perf callchain: Rename cumul_hits into callchain_cumul_hits

That makes the callchain API naming more consistent and
reduce potential naming clashes.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294977121-5700-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 53a49e0cfc6c64bf4b162ea89462265e143bc599..4c6360fc2d5bd1a9424d4a592e1359a072b9d5a3 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -38,14 +38,14 @@ rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
        struct rb_node **p = &root->rb_node;
        struct rb_node *parent = NULL;
        struct callchain_node *rnode;
-       u64 chain_cumul = cumul_hits(chain);
+       u64 chain_cumul = callchain_cumul_hits(chain);
 
        while (*p) {
                u64 rnode_cumul;
 
                parent = *p;
                rnode = rb_entry(parent, struct callchain_node, rb_node);
-               rnode_cumul = cumul_hits(rnode);
+               rnode_cumul = callchain_cumul_hits(rnode);
 
                switch (mode) {
                case CHAIN_FLAT:
@@ -104,7 +104,7 @@ static void __sort_chain_graph_abs(struct callchain_node *node,
 
        chain_for_each_child(child, node) {
                __sort_chain_graph_abs(child, min_hit);
-               if (cumul_hits(child) >= min_hit)
+               if (callchain_cumul_hits(child) >= min_hit)
                        rb_insert_callchain(&node->rb_root, child,
                                            CHAIN_GRAPH_ABS);
        }
@@ -129,7 +129,7 @@ static void __sort_chain_graph_rel(struct callchain_node *node,
 
        chain_for_each_child(child, node) {
                __sort_chain_graph_rel(child, min_percent);
-               if (cumul_hits(child) >= min_hit)
+               if (callchain_cumul_hits(child) >= min_hit)
                        rb_insert_callchain(&node->rb_root, child,
                                            CHAIN_GRAPH_REL);
        }
@@ -270,7 +270,7 @@ split_add_child(struct callchain_node *parent,
        /* split the hits */
        new->hit = parent->hit;
        new->children_hit = parent->children_hit;
-       parent->children_hit = cumul_hits(new);
+       parent->children_hit = callchain_cumul_hits(new);
        new->val_nr = parent->val_nr - idx_local;
        parent->val_nr = idx_local;
 

diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index d74a19af4a44583606df38477aadade005174633..07f71e3e0a715c758b59d566ce66b8e7ee7568c8 100644 (file)
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -82,7 +82,7 @@ static inline void callchain_init(struct callchain_root *root)
        root->max_depth = 0;
 }
 
-static inline u64 cumul_hits(struct callchain_node *node)
+static inline u64 callchain_cumul_hits(struct callchain_node *node)
 {
        return node->hit + node->children_hit;
 }

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index a438a0652d23e2cbaac13e83662e1aadbcd14f28..02ed318d73121eb95a70bde9c92c3bd278b071de 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -430,7 +430,7 @@ static size_t __callchain__fprintf_graph(FILE *fp, struct callchain_node *self,
                u64 cumul;
 
                child = rb_entry(node, struct callchain_node, rb_node);
-               cumul = cumul_hits(child);
+               cumul = callchain_cumul_hits(child);
                remaining -= cumul;
 
                /*

diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 60c463c16028946541560f5f71e37617cfd69c9b..86428239fa6574c4361d7c9beb8a3b51c9ba4e3e 100644 (file)
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -377,7 +377,7 @@ static int hist_browser__show_callchain_node_rb_tree(struct hist_browser *self,
        while (node) {
                struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node);
                struct rb_node *next = rb_next(node);
-               u64 cumul = cumul_hits(child);
+               u64 cumul = callchain_cumul_hits(child);
                struct callchain_list *chain;
                char folded_sign = ' ';
                int first = true;