Em Tue, Jan 15, 2013 at 04:31:50PM +0900, Namhyung Kim escreveu:
> From: Namhyung Kim <namhyung....@lge.com>
>
> Show group members' overhead also when showing the leader's if event
> group is enabled. Use macro for defining hpp functions which looks
> almost identical.
>
> Thanks to Arnaldo for suggesting a better way to print group members
> without allocating temporary array.
Thanks! Its a pity the patch ended up mixing up things, I'll have to
apply it and look at the end result.
> Cc: Jiri Olsa <jo...@redhat.com>
> Cc: Stephane Eranian <eran...@google.com>
> Signed-off-by: Namhyung Kim <namhy...@kernel.org>
> ---
> tools/perf/ui/hist.c | 311
> +++++++++++++++++++++++----------------------
> tools/perf/ui/stdio/hist.c | 2 +
> 2 files changed, 164 insertions(+), 149 deletions(-)
>
> diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
> index 1889c12ca81f..ec14335a9713 100644
> --- a/tools/perf/ui/hist.c
> +++ b/tools/perf/ui/hist.c
> @@ -3,151 +3,190 @@
> #include "../util/hist.h"
> #include "../util/util.h"
> #include "../util/sort.h"
> -
> +#include "../util/evsel.h"
>
> /* hist period print (hpp) functions */
> -static int hpp__header_overhead(struct perf_hpp *hpp)
> -{
> - return scnprintf(hpp->buf, hpp->size, "Overhead");
> -}
>
> -static int hpp__width_overhead(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 8;
> -}
> +typedef int (*hpp_snprint_fn)(char *buf, size_t size, const char *fmt, ...);
>
> -static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he)
> +static int __hpp__percent_fmt(struct perf_hpp *hpp, struct hist_entry *he,
> + u64 (*get_field)(struct hist_entry *),
> + const char *fmt, hpp_snprint_fn print_fn)
> {
> + int ret;
> + double percent = 0.0;
> struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period / hists->stats.total_period;
>
> - return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
> -}
> + if (hists->stats.total_period)
> + percent = 100.0 * get_field(he) / hists->stats.total_period;
>
> -static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period / hists->stats.total_period;
> - const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
> + ret = print_fn(hpp->buf, hpp->size, fmt, percent);
>
> - return scnprintf(hpp->buf, hpp->size, fmt, percent);
> -}
> + if (symbol_conf.event_group) {
> + int prev_idx, idx_delta, i;
> + struct perf_evsel *evsel = hists_to_evsel(hists);
> + struct hist_entry *pair;
> + int nr_members = evsel->nr_members;
>
> -static int hpp__header_overhead_sys(struct perf_hpp *hpp)
> -{
> - const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
> + if (nr_members <= 1)
> + return ret;
>
> - return scnprintf(hpp->buf, hpp->size, fmt, "sys");
> -}
> + prev_idx = perf_evsel__group_idx(evsel);
>
> -static int hpp__width_overhead_sys(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 7;
> -}
> + list_for_each_entry(pair, &he->pairs.head, pairs.node) {
> + u64 period = get_field(pair);
> + u64 total = pair->hists->stats.total_period;
>
> -static int hpp__color_overhead_sys(struct perf_hpp *hpp, struct hist_entry
> *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_sys /
> hists->stats.total_period;
> + if (!total)
> + continue;
>
> - return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
> -}
> + evsel = hists_to_evsel(pair->hists);
> + idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
>
> -static int hpp__entry_overhead_sys(struct perf_hpp *hpp, struct hist_entry
> *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_sys /
> hists->stats.total_period;
> - const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
> + for (i = 0; i < idx_delta; i++) {
> + ret += print_fn(hpp->buf + ret, hpp->size - ret,
> + fmt, 0.0);
> + }
>
> - return scnprintf(hpp->buf, hpp->size, fmt, percent);
> -}
> + ret += print_fn(hpp->buf + ret, hpp->size - ret,
> + fmt, 100.0 * period / total);
>
> -static int hpp__header_overhead_us(struct perf_hpp *hpp)
> -{
> - const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
> + prev_idx += 1 + idx_delta;
> + }
>
> - return scnprintf(hpp->buf, hpp->size, fmt, "user");
> -}
> + idx_delta = nr_members - prev_idx - 1;
>
> -static int hpp__width_overhead_us(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 7;
> + for (i = 0; i < idx_delta; i++) {
> + ret += print_fn(hpp->buf + ret, hpp->size - ret,
> + fmt, 0.0);
> + }
> + }
> + return ret;
> }
>
> -static int hpp__color_overhead_us(struct perf_hpp *hpp, struct hist_entry
> *he)
> +static int __hpp__raw_fmt(struct perf_hpp *hpp, struct hist_entry *he,
> + u64 (*get_field)(struct hist_entry *),
> + const char *fmt, hpp_snprint_fn print_fn)
> {
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
> -
> - return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
> -}
> + int ret;
> + ret = print_fn(hpp->buf, hpp->size, fmt, get_field(he));
>
> -static int hpp__entry_overhead_us(struct perf_hpp *hpp, struct hist_entry
> *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
> - const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
> + if (symbol_conf.event_group) {
> + int prev_idx, idx_delta, i;
> + struct perf_evsel *evsel = hists_to_evsel(he->hists);
> + struct hist_entry *pair;
> + int nr_members = evsel->nr_members;
>
> - return scnprintf(hpp->buf, hpp->size, fmt, percent);
> -}
> + if (nr_members <= 1)
> + return ret;
>
> -static int hpp__header_overhead_guest_sys(struct perf_hpp *hpp)
> -{
> - return scnprintf(hpp->buf, hpp->size, "guest sys");
> -}
> + prev_idx = perf_evsel__group_idx(evsel);
>
> -static int hpp__width_overhead_guest_sys(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 9;
> -}
> + list_for_each_entry(pair, &he->pairs.head, pairs.node) {
> + evsel = hists_to_evsel(pair->hists);
> + idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
>
> -static int hpp__color_overhead_guest_sys(struct perf_hpp *hpp,
> - struct hist_entry *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_guest_sys /
> hists->stats.total_period;
> + for (i = 0; i < idx_delta; i++) {
> + ret += print_fn(hpp->buf + ret, hpp->size - ret,
> + fmt, 0.0);
> + }
>
> - return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ",
> percent);
> -}
> + ret += print_fn(hpp->buf + ret, hpp->size - ret,
> + fmt, get_field(pair));
>
> -static int hpp__entry_overhead_guest_sys(struct perf_hpp *hpp,
> - struct hist_entry *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_guest_sys /
> hists->stats.total_period;
> - const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
> -
> - return scnprintf(hpp->buf, hpp->size, fmt, percent);
> -}
> + prev_idx += 1 + idx_delta;
> + }
>
> -static int hpp__header_overhead_guest_us(struct perf_hpp *hpp)
> -{
> - return scnprintf(hpp->buf, hpp->size, "guest usr");
> -}
> + idx_delta = nr_members - prev_idx - 1;
>
> -static int hpp__width_overhead_guest_us(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 9;
> + for (i = 0; i < idx_delta; i++) {
> + ret += print_fn(hpp->buf + ret, hpp->size - ret,
> + fmt, 0.0);
> + }
> + }
> + return ret;
> }
>
> -static int hpp__color_overhead_guest_us(struct perf_hpp *hpp,
> - struct hist_entry *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_guest_us /
> hists->stats.total_period;
> -
> - return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ",
> percent);
> -}
>
> -static int hpp__entry_overhead_guest_us(struct perf_hpp *hpp,
> - struct hist_entry *he)
> -{
> - struct hists *hists = he->hists;
> - double percent = 100.0 * he->stat.period_guest_us /
> hists->stats.total_period;
> - const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
> +#define __HPP_HEADER_FN(_type, _str, _min_width, _unit_width)
> \
> +static int hpp__header_##_type(struct perf_hpp *hpp) \
> +{ \
> + int len = _min_width; \
> + \
> + if (symbol_conf.event_group) { \
> + struct perf_evsel *evsel = hpp->ptr; \
> + \
> + len = max(len, evsel->nr_members * _unit_width); \
> + } \
> + return scnprintf(hpp->buf, hpp->size, "%*s", len, _str); \
> +}
> +
> +#define __HPP_WIDTH_FN(_type, _min_width, _unit_width)
> \
> +static int hpp__width_##_type(struct perf_hpp *hpp) \
> +{ \
> + int len = _min_width; \
> + \
> + if (symbol_conf.event_group) { \
> + struct perf_evsel *evsel = hpp->ptr; \
> + \
> + len = max(len, evsel->nr_members * _unit_width); \
> + } \
> + return len; \
> +}
> +
> +#define __HPP_COLOR_PERCENT_FN(_type, _field)
> \
> +static u64 he_get_##_field(struct hist_entry *he)
> \
> +{
> \
> + return he->stat._field;
> \
> +}
> \
> +
> \
> +static int hpp__color_##_type(struct perf_hpp *hpp, struct hist_entry *he)
> \
> +{
> \
> + return __hpp__percent_fmt(hpp, he, he_get_##_field, " %6.2f%%",
> \
> + (hpp_snprint_fn)percent_color_snprintf);
> \
> +}
> +
> +#define __HPP_ENTRY_PERCENT_FN(_type, _field)
> \
> +static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he)
> \
> +{
> \
> + const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%";
> \
> + return __hpp__percent_fmt(hpp, he, he_get_##_field, fmt,
> \
> + scnprintf);
> \
> +}
> +
> +#define __HPP_ENTRY_RAW_FN(_type, _field)
> \
> +static u64 he_get_raw_##_field(struct hist_entry *he)
> \
> +{
> \
> + return he->stat._field;
> \
> +}
> \
> +
> \
> +static int hpp__entry_##_type(struct perf_hpp *hpp, struct hist_entry *he)
> \
> +{
> \
> + const char *fmt = symbol_conf.field_sep ? " %"PRIu64 : " %11"PRIu64;
> \
> + return __hpp__raw_fmt(hpp, he, he_get_raw_##_field, fmt, scnprintf);
> \
> +}
> +
> +#define HPP_PERCENT_FNS(_type, _str, _field, _min_width, _unit_width)
> \
> +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width)
> \
> +__HPP_WIDTH_FN(_type, _min_width, _unit_width)
> \
> +__HPP_COLOR_PERCENT_FN(_type, _field)
> \
> +__HPP_ENTRY_PERCENT_FN(_type, _field)
> +
> +#define HPP_RAW_FNS(_type, _str, _field, _min_width, _unit_width) \
> +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width)
> \
> +__HPP_WIDTH_FN(_type, _min_width, _unit_width)
> \
> +__HPP_ENTRY_RAW_FN(_type, _field)
> +
> +
> +HPP_PERCENT_FNS(overhead, "Overhead", period, 8, 8)
> +HPP_PERCENT_FNS(overhead_sys, "sys", period_sys, 8, 8)
> +HPP_PERCENT_FNS(overhead_us, "usr", period_us, 8, 8)
> +HPP_PERCENT_FNS(overhead_guest_sys, "guest sys", period_guest_sys, 9, 8)
> +HPP_PERCENT_FNS(overhead_guest_us, "guest usr", period_guest_us, 9, 8)
> +
> +HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12)
> +HPP_RAW_FNS(period, "Period", period, 12, 12)
>
> - return scnprintf(hpp->buf, hpp->size, fmt, percent);
> -}
>
> static int hpp__header_baseline(struct perf_hpp *hpp)
> {
> @@ -179,7 +218,7 @@ static int hpp__color_baseline(struct perf_hpp *hpp,
> struct hist_entry *he)
> {
> double percent = baseline_percent(he);
>
> - if (hist_entry__has_pairs(he))
> + if (hist_entry__has_pairs(he) || symbol_conf.field_sep)
> return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%",
> percent);
> else
> return scnprintf(hpp->buf, hpp->size, " ");
> @@ -196,44 +235,6 @@ static int hpp__entry_baseline(struct perf_hpp *hpp,
> struct hist_entry *he)
> return scnprintf(hpp->buf, hpp->size, " ");
> }
>
> -static int hpp__header_samples(struct perf_hpp *hpp)
> -{
> - const char *fmt = symbol_conf.field_sep ? "%s" : "%11s";
> -
> - return scnprintf(hpp->buf, hpp->size, fmt, "Samples");
> -}
> -
> -static int hpp__width_samples(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 11;
> -}
> -
> -static int hpp__entry_samples(struct perf_hpp *hpp, struct hist_entry *he)
> -{
> - const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%11" PRIu64;
> -
> - return scnprintf(hpp->buf, hpp->size, fmt, he->stat.nr_events);
> -}
> -
> -static int hpp__header_period(struct perf_hpp *hpp)
> -{
> - const char *fmt = symbol_conf.field_sep ? "%s" : "%12s";
> -
> - return scnprintf(hpp->buf, hpp->size, fmt, "Period");
> -}
> -
> -static int hpp__width_period(struct perf_hpp *hpp __maybe_unused)
> -{
> - return 12;
> -}
> -
> -static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he)
> -{
> - const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%12" PRIu64;
> -
> - return scnprintf(hpp->buf, hpp->size, fmt, he->stat.period);
> -}
> -
> static int hpp__header_period_baseline(struct perf_hpp *hpp)
> {
> const char *fmt = symbol_conf.field_sep ? "%s" : "%12s";
> @@ -254,6 +255,7 @@ static int hpp__entry_period_baseline(struct perf_hpp
> *hpp, struct hist_entry *h
>
> return scnprintf(hpp->buf, hpp->size, fmt, period);
> }
> +
> static int hpp__header_delta(struct perf_hpp *hpp)
> {
> const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
> @@ -408,9 +410,20 @@ struct perf_hpp_fmt perf_hpp__format[] = {
>
> LIST_HEAD(perf_hpp__list);
>
> +
> #undef HPP__COLOR_PRINT_FNS
> #undef HPP__PRINT_FNS
>
> +#undef HPP_PERCENT_FNS
> +#undef HPP_RAW_FNS
> +
> +#undef __HPP_HEADER_FN
> +#undef __HPP_WIDTH_FN
> +#undef __HPP_COLOR_PERCENT_FN
> +#undef __HPP_ENTRY_PERCENT_FN
> +#undef __HPP_ENTRY_RAW_FN
> +
> +
> void perf_hpp__init(void)
> {
> if (symbol_conf.show_cpu_utilization) {
> diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
> index f9798298e3e0..ff1f60cf442e 100644
> --- a/tools/perf/ui/stdio/hist.c
> +++ b/tools/perf/ui/stdio/hist.c
> @@ -3,6 +3,7 @@
> #include "../../util/util.h"
> #include "../../util/hist.h"
> #include "../../util/sort.h"
> +#include "../../util/evsel.h"
>
>
> static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
> @@ -347,6 +348,7 @@ size_t hists__fprintf(struct hists *hists, bool
> show_header, int max_rows,
> struct perf_hpp dummy_hpp = {
> .buf = bf,
> .size = sizeof(bf),
> + .ptr = hists_to_evsel(hists),
> };
> bool first = true;
>
> --
> 1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
