lkml.org 
[lkml]   [2014]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/24] perf hists: Add support for accumulated stat of hist entry
    Date
    Maintain accumulated stat information in hist_entry->stat_acc if
    symbol_conf.cumulate_callchain is set. Fields in ->stat_acc have same
    vaules initially, and will be updated as callchain is processed later.

    Cc: Arun Sharma <asharma@fb.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/util/hist.c | 28 ++++++++++++++++++++++++++--
    tools/perf/util/sort.h | 1 +
    tools/perf/util/symbol.h | 1 +
    3 files changed, 28 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
    index d60ea8da342c..45a962f40cea 100644
    --- a/tools/perf/util/hist.c
    +++ b/tools/perf/util/hist.c
    @@ -231,6 +231,8 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
    return true;

    he_stat__decay(&he->stat);
    + if (symbol_conf.cumulate_callchain)
    + he_stat__decay(he->stat_acc);

    if (!he->filtered)
    hists->stats.total_period -= prev_period - he->stat.period;
    @@ -272,12 +274,26 @@ void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel)

    static struct hist_entry *hist_entry__new(struct hist_entry *template)
    {
    - size_t callchain_size = symbol_conf.use_callchain ? sizeof(struct callchain_root) : 0;
    - struct hist_entry *he = zalloc(sizeof(*he) + callchain_size);
    + size_t callchain_size = 0;
    + struct hist_entry *he;
    +
    + if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain)
    + callchain_size = sizeof(struct callchain_root);
    +
    + he = zalloc(sizeof(*he) + callchain_size);

    if (he != NULL) {
    *he = *template;

    + if (symbol_conf.cumulate_callchain) {
    + he->stat_acc = malloc(sizeof(he->stat));
    + if (he->stat_acc == NULL) {
    + free(he);
    + return NULL;
    + }
    + memcpy(he->stat_acc, &he->stat, sizeof(he->stat));
    + }
    +
    if (he->ms.map)
    he->ms.map->referenced = true;

    @@ -289,6 +305,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
    */
    he->branch_info = malloc(sizeof(*he->branch_info));
    if (he->branch_info == NULL) {
    + free(he->stat_acc);
    free(he);
    return NULL;
    }
    @@ -362,6 +379,8 @@ static struct hist_entry *add_hist_entry(struct hists *hists,

    if (!cmp) {
    he_stat__add_period(&he->stat, period, weight);
    + if (symbol_conf.cumulate_callchain)
    + he_stat__add_period(he->stat_acc, period, weight);

    /*
    * This mem info was allocated from machine__resolve_mem
    @@ -398,6 +417,8 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
    rb_insert_color(&he->rb_node_in, hists->entries_in);
    out:
    he_stat__add_cpumode_period(&he->stat, al->cpumode, period);
    + if (symbol_conf.cumulate_callchain)
    + he_stat__add_cpumode_period(he->stat_acc, al->cpumode, period);
    return he;
    }

    @@ -775,6 +796,7 @@ void hist_entry__free(struct hist_entry *he)
    {
    zfree(&he->branch_info);
    zfree(&he->mem_info);
    + zfree(&he->stat_acc);
    free_srcline(he->srcline);
    free(he);
    }
    @@ -800,6 +822,8 @@ static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,

    if (!cmp) {
    he_stat__add_stat(&iter->stat, &he->stat);
    + if (symbol_conf.cumulate_callchain)
    + he_stat__add_stat(iter->stat_acc, he->stat_acc);

    if (symbol_conf.use_callchain) {
    callchain_cursor_reset(&callchain_cursor);
    diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
    index 43e5ff42a609..309f2838a1b4 100644
    --- a/tools/perf/util/sort.h
    +++ b/tools/perf/util/sort.h
    @@ -81,6 +81,7 @@ struct hist_entry {
    struct list_head head;
    } pairs;
    struct he_stat stat;
    + struct he_stat *stat_acc;
    struct map_symbol ms;
    struct thread *thread;
    struct comm *comm;
    diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
    index 4ccc5c4b3a65..c9221c2390af 100644
    --- a/tools/perf/util/symbol.h
    +++ b/tools/perf/util/symbol.h
    @@ -92,6 +92,7 @@ struct symbol_conf {
    show_nr_samples,
    show_total_period,
    use_callchain,
    + cumulate_callchain,
    exclude_other,
    show_cpu_utilization,
    initialized,
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2014-01-14 08:41    [W:3.571 / U:1.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site