From: Kan Liang <[email protected]> Caculate freq/CPU%/CORE_BUSY% in add_entry_cb, and update the value in he_stat.
Signed-off-by: Kan Liang <[email protected]> Acked-by: Jiri Olsa <[email protected]> --- tools/perf/builtin-report.c | 20 ++++++++++++++++++++ tools/perf/util/sort.h | 3 +++ 2 files changed, 23 insertions(+) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index e4e3f14..e2a2fdd 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -90,6 +90,21 @@ static int report__config(const char *var, const char *value, void *cb) return perf_default_config(var, value, cb); } +static void set_he_perf_freq(struct perf_session *session, + struct hist_entry_iter *iter) +{ + struct hist_entry *he = iter->he; + struct perf_sample *sample = iter->sample; + u64 cpu_max_freq = session->header.env.cpuattr.max_freq; + + if (perf_freq__has_freq(sample->freq)) + he->stat.freq = perf_freq__get_freq(sample->freq, cpu_max_freq/1000); + if (perf_freq__has_cpu_util(sample->freq)) + he->stat.cpu_util = perf_freq__get_cpu_util(sample->freq); + if (perf_freq__has_core_busy(sample->freq)) + he->stat.core_busy = perf_freq__get_core_busy(sample->freq); +} + static int hist_iter__report_callback(struct hist_entry_iter *iter, struct addr_location *al, bool single, void *arg) @@ -101,6 +116,11 @@ static int hist_iter__report_callback(struct hist_entry_iter *iter, struct mem_info *mi; struct branch_info *bi; + if (dump_trace && + (iter->ops == &hist_iter_normal) && + perf_evsel__is_group_leader(evsel)) + set_he_perf_freq(rep->session, iter); + if (!ui__has_annotation()) return 0; diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index c06b757..0ff2bdd 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -55,6 +55,9 @@ struct he_stat { u64 period_guest_us; u64 weight; u32 nr_events; + u64 freq; + u64 cpu_util; + u64 core_busy; }; struct hist_entry_diff { -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

