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

perf stat: Move perf_counts struct and functions into separate object 



Moving 'struct perf_counts' and associated functions into separate
object, so we could remove stat.c object dependency from python build.

It makes the python code to build properly, because it fails to load due
to missing stat-shadow.c object dependency if some patches from Kan
Liang are applied.

So apply this one, then Kan's.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20150807105103.GB8624@krava.brq.redhat.com


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

tools/perf/builtin-stat.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "util/cpumap.h"

#include "util/thread.h"

#include "util/thread_map.h"

#include "util/counts.h"



#include <stdlib.h>

#include <sys/prctl.h>

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ libperf-y += target.o 
libperf-y += rblist.o

libperf-y += intlist.o

libperf-y += vdso.o

libperf-y += counts.o

libperf-y += stat.o

libperf-y += stat-shadow.o

libperf-y += record.o

tools/perf/util/counts.c

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#include <stdlib.h>

#include "evsel.h"

#include "counts.h"



struct perf_counts *perf_counts__new(int ncpus, int nthreads)

{

	struct perf_counts *counts = zalloc(sizeof(*counts));



	if (counts) {

		struct xyarray *values;



		values = xyarray__new(ncpus, nthreads, sizeof(struct perf_counts_values));

		if (!values) {

			free(counts);

			return NULL;

		}



		counts->values = values;

	}



	return counts;

}



void perf_counts__delete(struct perf_counts *counts)

{

	if (counts) {

		xyarray__delete(counts->values);

		free(counts);

	}

}



static void perf_counts__reset(struct perf_counts *counts)

{

	xyarray__reset(counts->values);

}



void perf_evsel__reset_counts(struct perf_evsel *evsel)

{

	perf_counts__reset(evsel->counts);

}



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

{

	evsel->counts = perf_counts__new(ncpus, nthreads);

	return evsel->counts != NULL ? 0 : -ENOMEM;

}



void perf_evsel__free_counts(struct perf_evsel *evsel)

{

	perf_counts__delete(evsel->counts);

	evsel->counts = NULL;

}

tools/perf/util/counts.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#ifndef __PERF_COUNTS_H

#define __PERF_COUNTS_H



#include "xyarray.h"



struct perf_counts_values {

	union {

		struct {

			u64 val;

			u64 ena;

			u64 run;

		};

		u64 values[3];

	};

};



struct perf_counts {

	s8			  scaled;

	struct perf_counts_values aggr;

	struct xyarray		  *values;

};





static inline struct perf_counts_values*

perf_counts(struct perf_counts *counts, int cpu, int thread)

{

	return xyarray__entry(counts->values, cpu, thread);

}



struct perf_counts *perf_counts__new(int ncpus, int nthreads);

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);



#endif /* __PERF_COUNTS_H */

tools/perf/util/evsel.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "xyarray.h"

#include "symbol.h"

#include "cpumap.h"

#include "stat.h"

#include "counts.h"



struct perf_evsel;

CRA Git | Maintained and supported by SUSTech CRA and CCSE