Skip to content

Commit

Permalink
perf hists: Make hpp setup function generic
Browse files Browse the repository at this point in the history
Now that we have the 'equal' method implemented for hpp format entries
we can ease up the logic in the following functions and make them
generic wrt comparing format entries:

  perf_hpp__setup_output_field
  perf_hpp__append_sort_keys

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-8-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Feb 3, 2016
1 parent c0020ef commit 3f931f2
Showing 1 changed file with 8 additions and 28 deletions.
36 changes: 8 additions & 28 deletions tools/perf/ui/hist.c
Original file line number Diff line number Diff line change
Expand Up @@ -551,21 +551,11 @@ void perf_hpp__setup_output_field(void)

/* append sort keys to output field */
perf_hpp__for_each_sort_list(fmt) {
if (!list_empty(&fmt->list))
continue;
struct perf_hpp_fmt *pos;

/*
* sort entry fields are dynamically created,
* so they can share a same sort key even though
* the list is empty.
*/
if (perf_hpp__is_sort_entry(fmt)) {
struct perf_hpp_fmt *pos;

perf_hpp__for_each_format(pos) {
if (fmt_equal(fmt, pos))
goto next;
}
perf_hpp__for_each_format(pos) {
if (fmt_equal(fmt, pos))
goto next;
}

perf_hpp__column_register(fmt);
Expand All @@ -580,21 +570,11 @@ void perf_hpp__append_sort_keys(void)

/* append output fields to sort keys */
perf_hpp__for_each_format(fmt) {
if (!list_empty(&fmt->sort_list))
continue;
struct perf_hpp_fmt *pos;

/*
* sort entry fields are dynamically created,
* so they can share a same sort key even though
* the list is empty.
*/
if (perf_hpp__is_sort_entry(fmt)) {
struct perf_hpp_fmt *pos;

perf_hpp__for_each_sort_list(pos) {
if (fmt_equal(fmt, pos))
goto next;
}
perf_hpp__for_each_sort_list(pos) {
if (fmt_equal(fmt, pos))
goto next;
}

perf_hpp__register_sort_field(fmt);
Expand Down

0 comments on commit 3f931f2

Please sign in to comment.