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

Commit 9689edfa authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Move perf_evsel__(alloc|free|reset)_stat_priv into stat object 



Moving perf_evsel__(alloc|free|reset)_stat_priv into stat object, so it
could be used outside stat command in following patches.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1435310967-14570-10-git-send-email-jolsa@kernel.org


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

tools/perf/builtin-stat.c

+0 −25
Original line number Diff line number Diff line
@@ -141,31 +141,6 @@ static inline void diff_timespec(struct timespec *r, struct timespec *a, 
	}

}



static void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)

{

	int i;

	struct perf_stat *ps = evsel->priv;



	for (i = 0; i < 3; i++)

		init_stats(&ps->res_stats[i]);



	perf_stat_evsel_id_init(evsel);

}



static int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)

{

	evsel->priv = zalloc(sizeof(struct perf_stat));

	if (evsel->priv == NULL)

		return -ENOMEM;

	perf_evsel__reset_stat_priv(evsel);

	return 0;

}



static void perf_evsel__free_stat_priv(struct perf_evsel *evsel)

{

	zfree(&evsel->priv);

}



static int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel,

					     int ncpus, int nthreads)

{

tools/perf/util/stat.c

+25 −0
Original line number Diff line number Diff line
@@ -143,3 +143,28 @@ void perf_evsel__free_counts(struct perf_evsel *evsel) 
	perf_counts__delete(evsel->counts);

	evsel->counts = NULL;

}



void perf_evsel__reset_stat_priv(struct perf_evsel *evsel)

{

	int i;

	struct perf_stat *ps = evsel->priv;



	for (i = 0; i < 3; i++)

		init_stats(&ps->res_stats[i]);



	perf_stat_evsel_id_init(evsel);

}



int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel)

{

	evsel->priv = zalloc(sizeof(struct perf_stat));

	if (evsel->priv == NULL)

		return -ENOMEM;

	perf_evsel__reset_stat_priv(evsel);

	return 0;

}



void perf_evsel__free_stat_priv(struct perf_evsel *evsel)

{

	zfree(&evsel->priv);

}

tools/perf/util/stat.h

+4 −0
Original line number Diff line number Diff line
@@ -92,4 +92,8 @@ void perf_counts__delete(struct perf_counts *counts); 
void perf_evsel__reset_counts(struct perf_evsel *evsel);

int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus, int nthreads);

void perf_evsel__free_counts(struct perf_evsel *evsel);



void perf_evsel__reset_stat_priv(struct perf_evsel *evsel);

int perf_evsel__alloc_stat_priv(struct perf_evsel *evsel);

void perf_evsel__free_stat_priv(struct perf_evsel *evsel);

#endif