lkml.org 
[lkml]   [2011]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/29] perf callchain: Rename cumul_hits into callchain_cumul_hits
    Date
    From: Frederic Weisbecker <fweisbec@gmail.com>

    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>
    ---
    tools/perf/util/callchain.c | 10 +++++-----
    tools/perf/util/callchain.h | 2 +-
    tools/perf/util/hist.c | 2 +-
    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 53a49e0..4c6360f 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,
    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 d74a19a..07f71e3 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)
    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 a438a06..02ed318 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,
    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 60c463c..8642823 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,
    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;
    --
    1.6.2.5


    \
     
     \ /
      Last update: 2011-01-25 18:29    [W:0.029 / U:1.484 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site