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

Commit 24e34f68 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Move perf_evlist__(alloc|free|reset)_stats into stat object 



Moving perf_evlist__(alloc|free|reset)_stats into stat object,
so it could be used 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-12-git-send-email-jolsa@kernel.org


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

tools/perf/builtin-stat.c

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

}



static void perf_evlist__free_stats(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	evlist__for_each(evlist, evsel) {

		perf_evsel__free_stat_priv(evsel);

		perf_evsel__free_counts(evsel);

		perf_evsel__free_prev_raw_counts(evsel);

	}

}



static int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw)

{

	struct perf_evsel *evsel;

	int nthreads = thread_map__nr(evsel_list->threads);



	evlist__for_each(evlist, evsel) {

		int ncpus = perf_evsel__nr_cpus(evsel);



		if (perf_evsel__alloc_stat_priv(evsel) < 0 ||

		    perf_evsel__alloc_counts(evsel, ncpus, nthreads) < 0 ||

		    (alloc_raw && perf_evsel__alloc_prev_raw_counts(evsel, ncpus, nthreads) < 0))

			goto out_free;

	}



	return 0;



out_free:

	perf_evlist__free_stats(evlist);

	return -1;

}



static void perf_evlist__reset_stats(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	evlist__for_each(evlist, evsel) {

		perf_evsel__reset_stat_priv(evsel);

		perf_evsel__reset_counts(evsel);

	}

}



static void perf_stat__reset_stats(void)

{

	perf_evlist__reset_stats(evsel_list);

tools/perf/util/evlist.h

+0 −1
Original line number Diff line number Diff line
@@ -289,5 +289,4 @@ void perf_evlist__to_front(struct perf_evlist *evlist, 


void perf_evlist__set_tracking_event(struct perf_evlist *evlist,

				     struct perf_evsel *tracking_evsel);



#endif /* __PERF_EVLIST_H */

tools/perf/util/stat.c

+44 −0
Original line number Diff line number Diff line 
#include <math.h>

#include "stat.h"

#include "evlist.h"

#include "evsel.h"

#include "thread_map.h"



void update_stats(struct stats *stats, u64 val)

{
@@ -186,3 +188,45 @@ void perf_evsel__free_prev_raw_counts(struct perf_evsel *evsel) 
	perf_counts__delete(evsel->prev_raw_counts);

	evsel->prev_raw_counts = NULL;

}



int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw)

{

	struct perf_evsel *evsel;

	int nthreads = thread_map__nr(evlist->threads);



	evlist__for_each(evlist, evsel) {

		int ncpus = perf_evsel__nr_cpus(evsel);



		if (perf_evsel__alloc_stat_priv(evsel) < 0 ||

		    perf_evsel__alloc_counts(evsel, ncpus, nthreads) < 0 ||

		    (alloc_raw && perf_evsel__alloc_prev_raw_counts(evsel, ncpus, nthreads) < 0))

			goto out_free;

	}



	return 0;



out_free:

	perf_evlist__free_stats(evlist);

	return -1;

}



void perf_evlist__free_stats(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	evlist__for_each(evlist, evsel) {

		perf_evsel__free_stat_priv(evsel);

		perf_evsel__free_counts(evsel);

		perf_evsel__free_prev_raw_counts(evsel);

	}

}



void perf_evlist__reset_stats(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	evlist__for_each(evlist, evsel) {

		perf_evsel__reset_stat_priv(evsel);

		perf_evsel__reset_counts(evsel);

	}

}

tools/perf/util/stat.h

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ static inline void init_stats(struct stats *stats) 
}



struct perf_evsel;

struct perf_evlist;



bool __perf_evsel_stat__is(struct perf_evsel *evsel,

			   enum perf_stat_evsel_id id);
@@ -100,4 +102,8 @@ void perf_evsel__free_stat_priv(struct perf_evsel *evsel); 
int perf_evsel__alloc_prev_raw_counts(struct perf_evsel *evsel,

				      int ncpus, int nthreads);

void perf_evsel__free_prev_raw_counts(struct perf_evsel *evsel);



int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw);

void perf_evlist__free_stats(struct perf_evlist *evlist);

void perf_evlist__reset_stats(struct perf_evlist *evlist);

#endif