Em Tue, Jan 15, 2013 at 04:31:49PM +0900, Namhyung Kim escreveu:
> From: Namhyung Kim <namhyung....@lge.com>
>
> When event group is enabled, sorting hist entries on periods for output
> should consider groups members' period also. To do that, build period
> table using link/pair information and compare the table.
>
> Signed-off-by: Namhyung Kim <namhy...@kernel.org>
> Acked-by: Jiri Olsa <jo...@redhat.com>
> Cc: Ingo Molnar <mi...@kernel.org>
> Cc: Jiri Olsa <jo...@redhat.com>
> Cc: Paul Mackerras <pau...@samba.org>
> Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
> Cc: Stephane Eranian <eran...@google.com>
> Link:
> http://lkml.kernel.org/r/1355726345-29553-7-git-send-email-namhy...@kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
> ---
> tools/perf/util/evsel.h | 2 ++
> tools/perf/util/hist.c | 59
> ++++++++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 60 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index f5d22f12ccd8..24225d728ba4 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -78,6 +78,8 @@ struct perf_evsel {
> char *group_name;
> };
>
> +#define hists_to_evsel(h) container_of(h, struct perf_evsel, hists)
> +
> struct cpu_map;
> struct thread_map;
> struct perf_evlist;
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index 8170a3d11ffa..f855941bebea 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -4,6 +4,7 @@
> #include "hist.h"
> #include "session.h"
> #include "sort.h"
> +#include "evsel.h"
> #include <math.h>
>
> static bool hists__filter_entry_by_dso(struct hists *hists,
> @@ -540,6 +541,62 @@ void hists__collapse_resort_threaded(struct hists *hists)
> * reverse the map, sort on period.
> */
>
> +static int period_cmp(u64 period_a, u64 period_b)
> +{
> + if (period_a > period_b)
> + return 1;
> + if (period_a < period_b)
> + return -1;
> + return 0;
> +}
> +
> +static int hist_entry__sort_on_period(struct hist_entry *a,
> + struct hist_entry *b)
> +{
> + int ret;
> + int i, nr_members;
> + struct perf_evsel *evsel;
> + struct hist_entry *pair;
> + u64 *periods_a, *periods_b;
> +
> + ret = period_cmp(a->stat.period, b->stat.period);
> + if (ret || !symbol_conf.event_group)
Why do we need to call period_cmp() when symbol_conf.event_group is
false?
I see, confusing neverthless :-\
> + return ret;
I would expect two functions, one for sorting on period and another for
not sorting on period, i.e. don't call a function called
'sort_on_period' when _not_ sorting on period.
- Arnaldo
> +
> + evsel = hists_to_evsel(a->hists);
> + nr_members = evsel->nr_members;
> + if (nr_members <= 1)
> + return ret;
> +
> + periods_a = zalloc(sizeof(periods_a) * nr_members);
> + periods_b = zalloc(sizeof(periods_b) * nr_members);
> +
> + if (!periods_a || !periods_b)
> + goto out;
> +
> + list_for_each_entry(pair, &a->pairs.head, pairs.node) {
> + evsel = hists_to_evsel(pair->hists);
> + periods_a[perf_evsel__group_idx(evsel)] = pair->stat.period;
> + }
> +
> + list_for_each_entry(pair, &b->pairs.head, pairs.node) {
> + evsel = hists_to_evsel(pair->hists);
> + periods_b[perf_evsel__group_idx(evsel)] = pair->stat.period;
> + }
> +
> + for (i = 1; i < nr_members; i++) {
> + ret = period_cmp(periods_a[i], periods_b[i]);
> + if (ret)
> + break;
> + }
> +
> +out:
> + free(periods_a);
> + free(periods_b);
> +
> + return ret;
> +}
> +
> static void __hists__insert_output_entry(struct rb_root *entries,
> struct hist_entry *he,
> u64 min_callchain_hits)
> @@ -556,7 +613,7 @@ static void __hists__insert_output_entry(struct rb_root
> *entries,
> parent = *p;
> iter = rb_entry(parent, struct hist_entry, rb_node);
>
> - if (he->stat.period > iter->stat.period)
> + if (hist_entry__sort_on_period(he, iter) > 0)
> p = &(*p)->rb_left;
> else
> p = &(*p)->rb_right;
> --
> 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/
