p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf hists: Introduce hists__for_each_sort_list macro 

With the hist object having the perf_hpp_list we can now iterate sort
format entries based in the hists object. Adding
hists__for_each_sort_list macro to do that.

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-27-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2016-01-18 10:24:24 +01:00 committed by Arnaldo Carvalho de Melo
parent f0786af536
commit aa6f50af82
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/util/hist.c
View File

@ -958,10 +958,11 @@ int hist_entry_iter__add(struct hist_entry_iter *iter, struct addr_location *al,
int64_t int64_t
hist_entry__cmp(struct hist_entry *left, struct hist_entry *right) hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
{ {
struct hists *hists = left->hists;
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
int64_t cmp = 0; int64_t cmp = 0;
perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) { hists__for_each_sort_list(hists, fmt) {
cmp = fmt->cmp(fmt, left, right); cmp = fmt->cmp(fmt, left, right);
if (cmp) if (cmp)
break; break;
@ -973,10 +974,11 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
int64_t int64_t
hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
{ {
struct hists *hists = left->hists;
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
int64_t cmp = 0; int64_t cmp = 0;
perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) { hists__for_each_sort_list(hists, fmt) {
cmp = fmt->collapse(fmt, left, right); cmp = fmt->collapse(fmt, left, right);
if (cmp) if (cmp)
break; break;
@ -1117,10 +1119,11 @@ void hists__collapse_resort(struct hists *hists, struct ui_progress *prog)
static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b) static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b)
{ {
struct hists *hists = a->hists;
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
int64_t cmp = 0; int64_t cmp = 0;
perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) { hists__for_each_sort_list(hists, fmt) {
if (perf_hpp__should_skip(fmt, a->hists)) if (perf_hpp__should_skip(fmt, a->hists))
continue; continue;

3
tools/perf/util/hist.h
View File

@ -264,6 +264,9 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format)
#define hists__for_each_format(hists, format) \ #define hists__for_each_format(hists, format) \
perf_hpp_list__for_each_format((hists)->hpp_list, fmt) perf_hpp_list__for_each_format((hists)->hpp_list, fmt)
#define hists__for_each_sort_list(hists, format) \
perf_hpp_list__for_each_sort_list((hists)->hpp_list, fmt)
extern struct perf_hpp_fmt perf_hpp__format[]; extern struct perf_hpp_fmt perf_hpp__format[];
enum { enum {