Commit 2bb72dbb authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evsel: Rename perf_evsel__group_idx() to evsel__group_idx() 



As it is a 'struct evsel' method, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ae430892

tools/perf/builtin-record.c

+1 −2
Original line number Diff line number Diff line
@@ -857,8 +857,7 @@ static int record__open(struct record *rec) 
				goto try_again;

			}

			rc = -errno;

			perf_evsel__open_strerror(pos, &opts->target,

						  errno, msg, sizeof(msg));

			evsel__open_strerror(pos, &opts->target, errno, msg, sizeof(msg));

			ui__error("%s\n", msg);

			goto out;

		}

tools/perf/builtin-stat.c

+1 −2
Original line number Diff line number Diff line
@@ -484,8 +484,7 @@ static enum counter_recovery stat_handle_error(struct evsel *counter) 
		}

	}



	perf_evsel__open_strerror(counter, &target,

				  errno, msg, sizeof(msg));

	evsel__open_strerror(counter, &target, errno, msg, sizeof(msg));

	ui__error("%s\n", msg);



	if (child_pid != -1)

tools/perf/builtin-top.c

+1 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,7 @@ static int perf_top__start_counters(struct perf_top *top) 
				goto try_again;

			}



			perf_evsel__open_strerror(counter, &opts->target,

						  errno, msg, sizeof(msg));

			evsel__open_strerror(counter, &opts->target, errno, msg, sizeof(msg));

			ui__error("%s\n", msg);

			goto out_err;

		}

tools/perf/tests/parse-events.c

+22 −22
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int test__group1(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* cycles:upp */
@@ -670,7 +670,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 == 2);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	return 0;
@@ -696,7 +696,7 @@ static int test__group2(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong precise_ip", !evsel->core.attr.precise_ip);

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* cache-references + :u modifier */
@@ -711,7 +711,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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* cycles:k */
@@ -754,7 +754,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong group name",

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* group1 cycles:kppp */
@@ -771,7 +771,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong precise_ip", evsel->core.attr.precise_ip == 3);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);

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

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* group2 cycles + G modifier */
@@ -789,7 +789,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong group name",

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* group2 1:3 + G modifier */
@@ -803,7 +803,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) 
	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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* instructions:u */
@@ -845,7 +845,7 @@ static int test__group4(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* instructions:kp + p */
@@ -861,7 +861,7 @@ static int test__group4(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host);

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

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	return 0;
@@ -888,7 +888,7 @@ static int test__group5(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* instructions + G */
@@ -903,7 +903,7 @@ static int test__group5(struct evlist *evlist __maybe_unused) 
	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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* cycles:G */
@@ -920,7 +920,7 @@ static int test__group5(struct evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);

	TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read);



	/* instructions:G */
@@ -935,7 +935,7 @@ static int test__group5(struct evlist *evlist __maybe_unused) 
	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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);



	/* cycles */

	evsel = evsel__next(evsel);
@@ -974,7 +974,7 @@ static int test__group_gh1(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);



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

	evsel = evsel__next(evsel);
@@ -988,7 +988,7 @@ static int test__group_gh1(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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);



	return 0;

}
@@ -1014,7 +1014,7 @@ static int test__group_gh2(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);



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

	evsel = evsel__next(evsel);
@@ -1028,7 +1028,7 @@ static int test__group_gh2(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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);



	return 0;

}
@@ -1054,7 +1054,7 @@ static int test__group_gh3(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);



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

	evsel = evsel__next(evsel);
@@ -1068,7 +1068,7 @@ static int test__group_gh3(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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);



	return 0;

}
@@ -1094,7 +1094,7 @@ static int test__group_gh4(struct evlist *evlist) 
	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);

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

	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 group_idx", evsel__group_idx(evsel) == 0);



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

	evsel = evsel__next(evsel);
@@ -1108,7 +1108,7 @@ static int test__group_gh4(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", evsel->leader == leader);

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

	TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) == 1);



	return 0;

}

tools/perf/ui/hist.c

+5 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
		struct hist_entry *pair;

		int nr_members = evsel->core.nr_members;



		prev_idx = perf_evsel__group_idx(evsel);

		prev_idx = evsel__group_idx(evsel);



		list_for_each_entry(pair, &he->pairs.head, pairs.node) {

			u64 period = get_field(pair);
@@ -58,7 +58,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
				continue;



			evsel = hists_to_evsel(pair->hists);

			idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;

			idx_delta = evsel__group_idx(evsel) - prev_idx - 1;



			while (idx_delta--) {

				/*
@@ -82,7 +82,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
							  len, period);

			}



			prev_idx = perf_evsel__group_idx(evsel);

			prev_idx = evsel__group_idx(evsel);

		}



		idx_delta = nr_members - prev_idx - 1;
@@ -164,12 +164,12 @@ static int hist_entry__new_pair(struct hist_entry *a, struct hist_entry *b, 


	list_for_each_entry(pair, &a->pairs.head, pairs.node) {

		struct evsel *evsel = hists_to_evsel(pair->hists);

		fa[perf_evsel__group_idx(evsel)] = get_field(pair);

		fa[evsel__group_idx(evsel)] = get_field(pair);

	}



	list_for_each_entry(pair, &b->pairs.head, pairs.node) {

		struct evsel *evsel = hists_to_evsel(pair->hists);

		fb[perf_evsel__group_idx(evsel)] = get_field(pair);

		fb[evsel__group_idx(evsel)] = get_field(pair);

	}



	*fields_a = fa;