Commit 5090c6ae authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Do not disable members of group event 

When event group is enabled for forked task (i.e. no target task/cpu
was specified) all events were disabled and marked ->enable_on_exec.
However they wouldn't be counted at all since only group leader will
be enabled on exec actually.

In contrast to perf stat, perf record doesn't have a real problem
as it enables all the event before proceeding. But it needs to be
fixed anyway IMHO.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1331887340-32448-2-git-send-email-namhyung.kim@lge.com


Signed-off-by: default avatarNamhyung Kim <namhyung.kim@lge.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4c19ea45

tools/perf/util/evlist.c

+4 −2
Original line number Diff line number Diff line
@@ -51,13 +51,15 @@ struct perf_evlist *perf_evlist__new(struct cpu_map *cpus, 
void perf_evlist__config_attrs(struct perf_evlist *evlist,

			       struct perf_record_opts *opts)

{

	struct perf_evsel *evsel;

	struct perf_evsel *evsel, *first;



	if (evlist->cpus->map[0] < 0)

		opts->no_inherit = true;



	first = list_entry(evlist->entries.next, struct perf_evsel, node);



	list_for_each_entry(evsel, &evlist->entries, node) {

		perf_evsel__config(evsel, opts);

		perf_evsel__config(evsel, opts, first);



		if (evlist->nr_entries > 1)

			evsel->attr.sample_type |= PERF_SAMPLE_ID;

tools/perf/util/evsel.c

+4 −2
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx) 
	return evsel;

}



void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts)

void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts,

			struct perf_evsel *first)

{

	struct perf_event_attr *attr = &evsel->attr;

	int track = !evsel->idx; /* only the first counter needs these */
@@ -134,7 +135,8 @@ void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts) 
	attr->mmap = track;

	attr->comm = track;



	if (!opts->target_pid && !opts->target_tid && !opts->system_wide) {

	if (!opts->target_pid && !opts->target_tid && !opts->system_wide &&

	    (!opts->group || evsel == first)) {

		attr->disabled = 1;

		attr->enable_on_exec = 1;

	}

tools/perf/util/evsel.h

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ void perf_evsel__exit(struct perf_evsel *evsel); 
void perf_evsel__delete(struct perf_evsel *evsel);



void perf_evsel__config(struct perf_evsel *evsel,

			struct perf_record_opts *opts);

			struct perf_record_opts *opts,

			struct perf_evsel *first);



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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE