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

Commit 139c0815 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Add more helpers for hist entry stat 



Add and use he_stat__add_{period,stat} for calculating hist entry's
stat.  It will be used for accumulated stats later as well.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Arun Sharma <asharma@fb.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1349354994-17853-10-git-send-email-namhyung@kernel.org


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

tools/perf/util/hist.c

+18 −8
Original line number Diff line number Diff line
@@ -151,6 +151,22 @@ static void hist_entry__add_cpumode_period(struct hist_entry *he, 
	}

}



static void he_stat__add_period(struct he_stat *he_stat, u64 period)

{

	he_stat->period		+= period;

	he_stat->nr_events	+= 1;

}



static void he_stat__add_stat(struct he_stat *dest, struct he_stat *src)

{

	dest->period		+= src->period;

	dest->period_sys	+= src->period_sys;

	dest->period_us		+= src->period_us;

	dest->period_guest_sys	+= src->period_guest_sys;

	dest->period_guest_us	+= src->period_guest_us;

	dest->nr_events		+= src->nr_events;

}



static void hist_entry__decay(struct hist_entry *he)

{

	he->stat.period = (he->stat.period * 7) / 8;
@@ -270,8 +286,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists, 
		cmp = hist_entry__cmp(entry, he);



		if (!cmp) {

			he->stat.period += period;

			++he->stat.nr_events;

			he_stat__add_period(&he->stat, period);



			/* If the map of an existing hist_entry has

			 * become out-of-date due to an exec() or
@@ -418,12 +433,7 @@ static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, 
		cmp = hist_entry__collapse(iter, he);



		if (!cmp) {

			iter->stat.period		+= he->stat.period;

			iter->stat.period_sys		+= he->stat.period_sys;

			iter->stat.period_us		+= he->stat.period_us;

			iter->stat.period_guest_sys	+= he->stat.period_guest_sys;

			iter->stat.period_guest_us	+= he->stat.period_guest_us;

			iter->stat.nr_events		+= he->stat.nr_events;

			he_stat__add_stat(&iter->stat, &he->stat);



			if (symbol_conf.use_callchain) {

				callchain_cursor_reset(&callchain_cursor);