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

Commit 590cd344 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Get rid of report__inc_stat() 



The report__inc_stat() function collects the number of hist entries in
the session in order to calculate the max size of the progess bar.

It'd be better if it does it during the addition of hist entries so that
it can be used by other places too.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1419223455-4362-2-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-report.c

+3 −13
Original line number Original line Diff line number Diff line
@@ -86,17 +86,6 @@ static int report__config(const char *var, const char *value, void *cb) 
	return perf_default_config(var, value, cb);

	return perf_default_config(var, value, cb);

}

}





static void report__inc_stats(struct report *rep, struct hist_entry *he)

{

	/*

	 * The @he is either of a newly created one or an existing one

	 * merging current sample.  We only want to count a new one so

	 * checking ->nr_events being 1.

	 */

	if (he->stat.nr_events == 1)

		rep->nr_entries++;

}



static int hist_iter__report_callback(struct hist_entry_iter *iter,

static int hist_iter__report_callback(struct hist_entry_iter *iter,

				      struct addr_location *al, bool single,

				      struct addr_location *al, bool single,

				      void *arg)

				      void *arg)
@@ -108,8 +97,6 @@ static int hist_iter__report_callback(struct hist_entry_iter *iter, 
	struct mem_info *mi;

	struct mem_info *mi;

	struct branch_info *bi;

	struct branch_info *bi;





	report__inc_stats(rep, he);



	if (!ui__has_annotation())

	if (!ui__has_annotation())

		return 0;

		return 0;
@@ -499,6 +486,9 @@ static int __cmd_report(struct report *rep) 




	report__warn_kptr_restrict(rep);

	report__warn_kptr_restrict(rep);





	evlist__for_each(session->evlist, pos)

		rep->nr_entries += evsel__hists(pos)->nr_entries;



	if (use_browser == 0) {

	if (use_browser == 0) {

		if (verbose > 3)

		if (verbose > 3)

			perf_session__fprintf(session, stdout);

			perf_session__fprintf(session, stdout);

tools/perf/util/hist.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -429,6 +429,8 @@ static struct hist_entry *add_hist_entry(struct hists *hists, 
	if (!he)

	if (!he)

		return NULL;

		return NULL;





	hists->nr_entries++;



	rb_link_node(&he->rb_node_in, parent, p);

	rb_link_node(&he->rb_node_in, parent, p);

	rb_insert_color(&he->rb_node_in, hists->entries_in);

	rb_insert_color(&he->rb_node_in, hists->entries_in);

out:

out: