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

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

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



It's stat specific. Updating python build objects with stat.c.

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/1434269985-521-12-git-send-email-jolsa@kernel.org


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

tools/perf/tests/openat-syscall-all-cpus.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "thread_map.h"

#include "cpumap.h"

#include "debug.h"

#include "stat.h"



int test__openat_syscall_event_on_all_cpus(void)

{

tools/perf/util/evsel.c

+1 −18
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "perf_regs.h"

#include "debug.h"

#include "trace-event.h"

#include "stat.h"



static struct {

	bool sample_id_all;
@@ -851,19 +852,6 @@ int perf_evsel__alloc_id(struct perf_evsel *evsel, int ncpus, int nthreads) 
	return 0;

}



void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus)

{

	memset(evsel->counts, 0, (sizeof(*evsel->counts) +

				 (ncpus * sizeof(struct perf_counts_values))));

}



int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus)

{

	evsel->counts = zalloc((sizeof(*evsel->counts) +

				(ncpus * sizeof(struct perf_counts_values))));

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

}



static void perf_evsel__free_fd(struct perf_evsel *evsel)

{

	xyarray__delete(evsel->fd);
@@ -891,11 +879,6 @@ void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads) 
		}

}



void perf_evsel__free_counts(struct perf_evsel *evsel)

{

	zfree(&evsel->counts);

}



void perf_evsel__exit(struct perf_evsel *evsel)

{

	assert(list_empty(&evsel->node));

tools/perf/util/evsel.h

+0 −3
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ const char *perf_evsel__group_name(struct perf_evsel *evsel); 
int perf_evsel__group_desc(struct perf_evsel *evsel, char *buf, size_t size);



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

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

void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus);

void perf_evsel__free_counts(struct perf_evsel *evsel);

void perf_evsel__close_fd(struct perf_evsel *evsel, int ncpus, int nthreads);



void __perf_evsel__set_sample_bit(struct perf_evsel *evsel,

tools/perf/util/python-ext-sources

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ util/util.c 
util/xyarray.c

util/cgroup.c

util/rblist.c

util/stat.c

util/strlist.c

util/trace-event.c

../../lib/rbtree.c

tools/perf/util/stat.c

+18 −0
Original line number Diff line number Diff line
@@ -94,3 +94,21 @@ void perf_stat_evsel_id_init(struct perf_evsel *evsel) 
		}

	}

}



void perf_evsel__reset_counts(struct perf_evsel *evsel, int ncpus)

{

	memset(evsel->counts, 0, (sizeof(*evsel->counts) +

				 (ncpus * sizeof(struct perf_counts_values))));

}



int perf_evsel__alloc_counts(struct perf_evsel *evsel, int ncpus)

{

	evsel->counts = zalloc((sizeof(*evsel->counts) +

				(ncpus * sizeof(struct perf_counts_values))));

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

}



void perf_evsel__free_counts(struct perf_evsel *evsel)

{

	zfree(&evsel->counts);

}