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

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

libperf: Move nr_members from perf's evsel to libperf's perf_evsel 



Move the nr_members member from perf's evsel to libperf's perf_evsel.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-60-jolsa@kernel.org


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

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report 
	ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit);

	if (evname != NULL) {

		ret += fprintf(fp, " of event%s '%s'",

			       evsel->nr_members > 1 ? "s" : "", evname);

			       evsel->core.nr_members > 1 ? "s" : "", evname);

	}



	if (rep->time_str)

tools/perf/builtin-script.c

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static void perf_sample__fprint_metric(struct perf_script *script, 
				       sample->cpu,

				       &rt_stat);

	evsel_script(evsel)->val = val;

	if (evsel_script(evsel->leader)->gnum == evsel->leader->nr_members) {

	if (evsel_script(evsel->leader)->gnum == evsel->leader->core.nr_members) {

		for_each_group_member (ev2, evsel->leader) {

			perf_stat__print_shadow_stats(&stat_config, ev2,

						      evsel_script(ev2)->val,

tools/perf/builtin-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) 
				counter->supported = false;



				if ((counter->leader != counter) ||

				    !(counter->leader->nr_members > 1))

				    !(counter->leader->core.nr_members > 1))

					continue;

			} else if (perf_evsel__fallback(counter, errno, msg, sizeof(msg))) {

                                if (verbose > 0)

tools/perf/lib/include/internal/evsel.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ struct perf_evsel { 
	struct perf_cpu_map	*own_cpus;

	struct perf_thread_map	*threads;

	struct xyarray		*fd;



	/* parse modifier helper */

	int			 nr_members;

};



#endif /* __LIBPERF_INTERNAL_EVSEL_H */

tools/perf/tests/parse-events.c

+11 −11
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int test__group1(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -695,7 +695,7 @@ static int test__group2(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -753,7 +753,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong group name",

		!strcmp(leader->group_name, "group1"));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -788,7 +788,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong group name",

		!strcmp(leader->group_name, "group2"));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -844,7 +844,7 @@ static int test__group4(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 1);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -887,7 +887,7 @@ static int test__group5(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -919,7 +919,7 @@ static int test__group5(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);
@@ -973,7 +973,7 @@ static int test__group_gh1(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);



	/* cache-misses:G + :H group modifier */
@@ -1013,7 +1013,7 @@ static int test__group_gh2(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);



	/* cache-misses:H + :G group modifier */
@@ -1053,7 +1053,7 @@ static int test__group_gh3(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);



	/* cache-misses:H + :u group modifier */
@@ -1093,7 +1093,7 @@ static int test__group_gh4(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

	TEST_ASSERT_VAL("wrong leader", perf_evsel__is_group_leader(evsel));

	TEST_ASSERT_VAL("wrong nr_members", evsel->nr_members == 2);

	TEST_ASSERT_VAL("wrong core.nr_members", evsel->core.nr_members == 2);

	TEST_ASSERT_VAL("wrong group_idx", perf_evsel__group_idx(evsel) == 0);



	/* cache-misses:H + :uG group modifier */