Skip to content

Commit

Permalink
perf callchain: Don't give arbitrary gender to callchain tree nodes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Frederic Weisbecker authored and Arnaldo Carvalho de Melo committed Jan 22, 2011
1 parent 16537f1 commit 529363b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tools/perf/util/callchain.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event)
}

#define chain_for_each_child(child, parent) \
list_for_each_entry(child, &parent->children, brothers)
list_for_each_entry(child, &parent->children, siblings)

#define chain_for_each_child_safe(child, next, parent) \
list_for_each_entry_safe(child, next, &parent->children, brothers)
list_for_each_entry_safe(child, next, &parent->children, siblings)

static void
rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
Expand Down Expand Up @@ -189,7 +189,7 @@ create_child(struct callchain_node *parent, bool inherit_children)
chain_for_each_child(next, new)
next->parent = new;
}
list_add_tail(&new->brothers, &parent->children);
list_add_tail(&new->siblings, &parent->children);

return new;
}
Expand Down Expand Up @@ -419,7 +419,7 @@ merge_chain_branch(struct callchain_cursor *cursor,
if (err)
break;

list_del(&child->brothers);
list_del(&child->siblings);
free(child);
}

Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/callchain.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum chain_mode {

struct callchain_node {
struct callchain_node *parent;
struct list_head brothers;
struct list_head siblings;
struct list_head children;
struct list_head val;
struct rb_node rb_node; /* to sort nodes in an rbtree */
Expand Down Expand Up @@ -72,7 +72,7 @@ struct callchain_cursor {

static inline void callchain_init(struct callchain_root *root)
{
INIT_LIST_HEAD(&root->node.brothers);
INIT_LIST_HEAD(&root->node.siblings);
INIT_LIST_HEAD(&root->node.children);
INIT_LIST_HEAD(&root->node.val);

Expand Down

0 comments on commit 529363b

Please sign in to comment.