diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2011-01-13 22:51:59 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-22 16:56:31 -0500 |
commit | f08c3154ac439c4b5762a40107d84e839e08fbc5 (patch) | |
tree | c13a91f91309a3a0df7a406fa70ede7868e1306b /tools | |
parent | 1b3a0e9592ebf174af934b3908a2bf6a6fa86169 (diff) |
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>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/callchain.c | 10 | ||||
-rw-r--r-- | tools/perf/util/callchain.h | 2 | ||||
-rw-r--r-- | tools/perf/util/hist.c | 2 | ||||
-rw-r--r-- | tools/perf/util/ui/browsers/hists.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 53a49e0cfc6c..4c6360fc2d5b 100644 --- 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, | |||
38 | struct rb_node **p = &root->rb_node; | 38 | struct rb_node **p = &root->rb_node; |
39 | struct rb_node *parent = NULL; | 39 | struct rb_node *parent = NULL; |
40 | struct callchain_node *rnode; | 40 | struct callchain_node *rnode; |
41 | u64 chain_cumul = cumul_hits(chain); | 41 | u64 chain_cumul = callchain_cumul_hits(chain); |
42 | 42 | ||
43 | while (*p) { | 43 | while (*p) { |
44 | u64 rnode_cumul; | 44 | u64 rnode_cumul; |
45 | 45 | ||
46 | parent = *p; | 46 | parent = *p; |
47 | rnode = rb_entry(parent, struct callchain_node, rb_node); | 47 | rnode = rb_entry(parent, struct callchain_node, rb_node); |
48 | rnode_cumul = cumul_hits(rnode); | 48 | rnode_cumul = callchain_cumul_hits(rnode); |
49 | 49 | ||
50 | switch (mode) { | 50 | switch (mode) { |
51 | case CHAIN_FLAT: | 51 | case CHAIN_FLAT: |
@@ -104,7 +104,7 @@ static void __sort_chain_graph_abs(struct callchain_node *node, | |||
104 | 104 | ||
105 | chain_for_each_child(child, node) { | 105 | chain_for_each_child(child, node) { |
106 | __sort_chain_graph_abs(child, min_hit); | 106 | __sort_chain_graph_abs(child, min_hit); |
107 | if (cumul_hits(child) >= min_hit) | 107 | if (callchain_cumul_hits(child) >= min_hit) |
108 | rb_insert_callchain(&node->rb_root, child, | 108 | rb_insert_callchain(&node->rb_root, child, |
109 | CHAIN_GRAPH_ABS); | 109 | CHAIN_GRAPH_ABS); |
110 | } | 110 | } |
@@ -129,7 +129,7 @@ static void __sort_chain_graph_rel(struct callchain_node *node, | |||
129 | 129 | ||
130 | chain_for_each_child(child, node) { | 130 | chain_for_each_child(child, node) { |
131 | __sort_chain_graph_rel(child, min_percent); | 131 | __sort_chain_graph_rel(child, min_percent); |
132 | if (cumul_hits(child) >= min_hit) | 132 | if (callchain_cumul_hits(child) >= min_hit) |
133 | rb_insert_callchain(&node->rb_root, child, | 133 | rb_insert_callchain(&node->rb_root, child, |
134 | CHAIN_GRAPH_REL); | 134 | CHAIN_GRAPH_REL); |
135 | } | 135 | } |
@@ -270,7 +270,7 @@ split_add_child(struct callchain_node *parent, | |||
270 | /* split the hits */ | 270 | /* split the hits */ |
271 | new->hit = parent->hit; | 271 | new->hit = parent->hit; |
272 | new->children_hit = parent->children_hit; | 272 | new->children_hit = parent->children_hit; |
273 | parent->children_hit = cumul_hits(new); | 273 | parent->children_hit = callchain_cumul_hits(new); |
274 | new->val_nr = parent->val_nr - idx_local; | 274 | new->val_nr = parent->val_nr - idx_local; |
275 | parent->val_nr = idx_local; | 275 | parent->val_nr = idx_local; |
276 | 276 | ||
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index d74a19af4a44..07f71e3e0a71 100644 --- 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) | |||
82 | root->max_depth = 0; | 82 | root->max_depth = 0; |
83 | } | 83 | } |
84 | 84 | ||
85 | static inline u64 cumul_hits(struct callchain_node *node) | 85 | static inline u64 callchain_cumul_hits(struct callchain_node *node) |
86 | { | 86 | { |
87 | return node->hit + node->children_hit; | 87 | return node->hit + node->children_hit; |
88 | } | 88 | } |
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index a438a0652d23..02ed318d7312 100644 --- 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, | |||
430 | u64 cumul; | 430 | u64 cumul; |
431 | 431 | ||
432 | child = rb_entry(node, struct callchain_node, rb_node); | 432 | child = rb_entry(node, struct callchain_node, rb_node); |
433 | cumul = cumul_hits(child); | 433 | cumul = callchain_cumul_hits(child); |
434 | remaining -= cumul; | 434 | remaining -= cumul; |
435 | 435 | ||
436 | /* | 436 | /* |
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c index 60c463c16028..86428239fa65 100644 --- 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, | |||
377 | while (node) { | 377 | while (node) { |
378 | struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node); | 378 | struct callchain_node *child = rb_entry(node, struct callchain_node, rb_node); |
379 | struct rb_node *next = rb_next(node); | 379 | struct rb_node *next = rb_next(node); |
380 | u64 cumul = cumul_hits(child); | 380 | u64 cumul = callchain_cumul_hits(child); |
381 | struct callchain_list *chain; | 381 | struct callchain_list *chain; |
382 | char folded_sign = ' '; | 382 | char folded_sign = ' '; |
383 | int first = true; | 383 | int first = true; |