Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9da44db1 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Add __hist_entry__snprintf function 



Add __hist_entry__snprintf() to take a perf_hpp_list as an argument
instead of using he->hists->hpp_list.

This way we can display arbitrary list of entries regardless of the
hists setup, which will be useful in the upcoming c2c patch series.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1474558645-19956-2-git-send-email-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3becf452

tools/perf/ui/stdio/hist.c

+8 −2
Original line number Diff line number Diff line
@@ -373,7 +373,8 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he, 
	return 0;

}



static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)

static int __hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp,

				  struct perf_hpp_list *hpp_list)

{

	const char *sep = symbol_conf.field_sep;

	struct perf_hpp_fmt *fmt;
@@ -384,7 +385,7 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) 
	if (symbol_conf.exclude_other && !he->parent)

		return 0;



	hists__for_each_format(he->hists, fmt) {

	perf_hpp_list__for_each_format(hpp_list, fmt) {

		if (perf_hpp__should_skip(fmt, he->hists))

			continue;
@@ -410,6 +411,11 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp) 
	return hpp->buf - start;

}



static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)

{

	return __hist_entry__snprintf(he, hpp, he->hists->hpp_list);

}



static int hist_entry__hierarchy_fprintf(struct hist_entry *he,

					 struct perf_hpp *hpp,

					 struct hists *hists,