diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2011-01-13 22:52:01 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-01-22 16:56:31 -0500 |
commit | 529363b76929beb85b81439c61063130af046a21 (patch) | |
tree | 628e32e412975a8b65645b6fb20791f91ae5eafc | |
parent | 16537f1355017a285b904bfb6bf767464293e69c (diff) |
perf callchain: Don't give arbitrary gender to callchain tree nodes
Some little callchain tree nodes shyly asked me if they can have
sisters.
How cute!
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294977121-5700-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/util/callchain.c | 8 | ||||
-rw-r--r-- | tools/perf/util/callchain.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 5b3f09dd137d..f8c66d1435e0 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c | |||
@@ -26,10 +26,10 @@ bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event) | |||
26 | } | 26 | } |
27 | 27 | ||
28 | #define chain_for_each_child(child, parent) \ | 28 | #define chain_for_each_child(child, parent) \ |
29 | list_for_each_entry(child, &parent->children, brothers) | 29 | list_for_each_entry(child, &parent->children, siblings) |
30 | 30 | ||
31 | #define chain_for_each_child_safe(child, next, parent) \ | 31 | #define chain_for_each_child_safe(child, next, parent) \ |
32 | list_for_each_entry_safe(child, next, &parent->children, brothers) | 32 | list_for_each_entry_safe(child, next, &parent->children, siblings) |
33 | 33 | ||
34 | static void | 34 | static void |
35 | rb_insert_callchain(struct rb_root *root, struct callchain_node *chain, | 35 | rb_insert_callchain(struct rb_root *root, struct callchain_node *chain, |
@@ -189,7 +189,7 @@ create_child(struct callchain_node *parent, bool inherit_children) | |||
189 | chain_for_each_child(next, new) | 189 | chain_for_each_child(next, new) |
190 | next->parent = new; | 190 | next->parent = new; |
191 | } | 191 | } |
192 | list_add_tail(&new->brothers, &parent->children); | 192 | list_add_tail(&new->siblings, &parent->children); |
193 | 193 | ||
194 | return new; | 194 | return new; |
195 | } | 195 | } |
@@ -419,7 +419,7 @@ merge_chain_branch(struct callchain_cursor *cursor, | |||
419 | if (err) | 419 | if (err) |
420 | break; | 420 | break; |
421 | 421 | ||
422 | list_del(&child->brothers); | 422 | list_del(&child->siblings); |
423 | free(child); | 423 | free(child); |
424 | } | 424 | } |
425 | 425 | ||
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index 2bb5403010d2..67137256a1cd 100644 --- a/tools/perf/util/callchain.h +++ b/tools/perf/util/callchain.h | |||
@@ -16,7 +16,7 @@ enum chain_mode { | |||
16 | 16 | ||
17 | struct callchain_node { | 17 | struct callchain_node { |
18 | struct callchain_node *parent; | 18 | struct callchain_node *parent; |
19 | struct list_head brothers; | 19 | struct list_head siblings; |
20 | struct list_head children; | 20 | struct list_head children; |
21 | struct list_head val; | 21 | struct list_head val; |
22 | struct rb_node rb_node; /* to sort nodes in an rbtree */ | 22 | struct rb_node rb_node; /* to sort nodes in an rbtree */ |
@@ -72,7 +72,7 @@ struct callchain_cursor { | |||
72 | 72 | ||
73 | static inline void callchain_init(struct callchain_root *root) | 73 | static inline void callchain_init(struct callchain_root *root) |
74 | { | 74 | { |
75 | INIT_LIST_HEAD(&root->node.brothers); | 75 | INIT_LIST_HEAD(&root->node.siblings); |
76 | INIT_LIST_HEAD(&root->node.children); | 76 | INIT_LIST_HEAD(&root->node.children); |
77 | INIT_LIST_HEAD(&root->node.val); | 77 | INIT_LIST_HEAD(&root->node.val); |
78 | 78 | ||