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

perf evlist: Use the right prefix for 'struct evlist' 'find' methods 



perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.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 2a6599cd

tools/perf/builtin-kmem.c

+2 −5
Original line number Diff line number Diff line
@@ -1960,18 +1960,15 @@ int cmd_kmem(int argc, const char **argv) 
	ret = -1;



	if (kmem_slab) {

		if (!perf_evlist__find_tracepoint_by_name(session->evlist,

							  "kmem:kmalloc")) {

		if (!evlist__find_tracepoint_by_name(session->evlist, "kmem:kmalloc")) {

			pr_err(errmsg, "slab", "slab");

			goto out_delete;

		}

	}



	if (kmem_page) {

		struct evsel *evsel;

		struct evsel *evsel = evlist__find_tracepoint_by_name(session->evlist, "kmem:mm_page_alloc");



		evsel = perf_evlist__find_tracepoint_by_name(session->evlist,

							     "kmem:mm_page_alloc");

		if (evsel == NULL) {

			pr_err(errmsg, "page", "page");

			goto out_delete;

tools/perf/builtin-sched.c

+2 −4
Original line number Diff line number Diff line
@@ -3036,8 +3036,7 @@ static int perf_sched__timehist(struct perf_sched *sched) 
	setup_pager();



	/* prefer sched_waking if it is captured */

	if (perf_evlist__find_tracepoint_by_name(session->evlist,

						  "sched:sched_waking"))

	if (evlist__find_tracepoint_by_name(session->evlist, "sched:sched_waking"))

		handlers[1].handler = timehist_sched_wakeup_ignore;



	/* setup per-evsel handlers */
@@ -3045,8 +3044,7 @@ static int perf_sched__timehist(struct perf_sched *sched) 
		goto out;



	/* sched_switch event at a minimum needs to exist */

	if (!perf_evlist__find_tracepoint_by_name(session->evlist,

						  "sched:sched_switch")) {

	if (!evlist__find_tracepoint_by_name(session->evlist, "sched:sched_switch")) {

		pr_err("No sched_switch events found. Have you run 'perf sched record'?\n");

		goto out;

	}

tools/perf/builtin-trace.c

+5 −9
Original line number Diff line number Diff line
@@ -4227,12 +4227,10 @@ static int trace__replay(struct trace *trace) 
	if (err)

		goto out;



	evsel = perf_evlist__find_tracepoint_by_name(session->evlist,

						     "raw_syscalls:sys_enter");

	evsel = evlist__find_tracepoint_by_name(session->evlist, "raw_syscalls:sys_enter");

	/* older kernels have syscalls tp versus raw_syscalls */

	if (evsel == NULL)

		evsel = perf_evlist__find_tracepoint_by_name(session->evlist,

							     "syscalls:sys_enter");

		evsel = evlist__find_tracepoint_by_name(session->evlist, "syscalls:sys_enter");



	if (evsel &&

	    (evsel__init_raw_syscall_tp(evsel, trace__sys_enter) < 0 ||
@@ -4241,11 +4239,9 @@ static int trace__replay(struct trace *trace) 
		goto out;

	}



	evsel = perf_evlist__find_tracepoint_by_name(session->evlist,

						     "raw_syscalls:sys_exit");

	evsel = evlist__find_tracepoint_by_name(session->evlist, "raw_syscalls:sys_exit");

	if (evsel == NULL)

		evsel = perf_evlist__find_tracepoint_by_name(session->evlist,

							     "syscalls:sys_exit");

		evsel = evlist__find_tracepoint_by_name(session->evlist, "syscalls:sys_exit");

	if (evsel &&

	    (evsel__init_raw_syscall_tp(evsel, trace__sys_exit) < 0 ||

	    perf_evsel__init_sc_tp_uint_field(evsel, ret))) {
@@ -4905,7 +4901,7 @@ int cmd_trace(int argc, const char **argv) 
	if (evsel) {

		trace.syscalls.events.augmented = evsel;



		evsel = perf_evlist__find_tracepoint_by_name(trace.evlist, "raw_syscalls:sys_enter");

		evsel = evlist__find_tracepoint_by_name(trace.evlist, "raw_syscalls:sys_enter");

		if (evsel == NULL) {

			pr_err("ERROR: raw_syscalls:sys_enter not found in the augmented BPF object\n");

			goto out;

tools/perf/util/bpf-loader.c

+1 −2
Original line number Diff line number Diff line
@@ -1058,12 +1058,11 @@ __bpf_map__config_event(struct bpf_map *map, 
			struct parse_events_term *term,

			struct evlist *evlist)

{

	struct evsel *evsel;

	const struct bpf_map_def *def;

	struct bpf_map_op *op;

	const char *map_name = bpf_map__name(map);

	struct evsel *evsel = evlist__find_evsel_by_str(evlist, term->val.str);



	evsel = perf_evlist__find_evsel_by_str(evlist, term->val.str);

	if (!evsel) {

		pr_debug("Event (for '%s') '%s' doesn't exist\n",

			 map_name, term->val.str);

tools/perf/util/evlist.c

+4 −10
Original line number Diff line number Diff line
@@ -191,13 +191,12 @@ void perf_evlist__splice_list_tail(struct evlist *evlist, 
int __evlist__set_tracepoints_handlers(struct evlist *evlist,

				       const struct evsel_str_handler *assocs, size_t nr_assocs)

{

	struct evsel *evsel;

	size_t i;

	int err;



	for (i = 0; i < nr_assocs; i++) {

		// Adding a handler for an event not in this evlist, just ignore it.

		evsel = perf_evlist__find_tracepoint_by_name(evlist, assocs[i].name);

		struct evsel *evsel = evlist__find_tracepoint_by_name(evlist, assocs[i].name);

		if (evsel == NULL)

			continue;
@@ -294,8 +293,7 @@ int __evlist__add_default_attrs(struct evlist *evlist, struct perf_event_attr *a 
	return evlist__add_attrs(evlist, attrs, nr_attrs);

}



struct evsel *

perf_evlist__find_tracepoint_by_id(struct evlist *evlist, int id)

struct evsel *evlist__find_tracepoint_by_id(struct evlist *evlist, int id)

{

	struct evsel *evsel;
@@ -308,9 +306,7 @@ perf_evlist__find_tracepoint_by_id(struct evlist *evlist, int id) 
	return NULL;

}



struct evsel *

perf_evlist__find_tracepoint_by_name(struct evlist *evlist,

				     const char *name)

struct evsel *evlist__find_tracepoint_by_name(struct evlist *evlist, const char *name)

{

	struct evsel *evsel;
@@ -1594,9 +1590,7 @@ void perf_evlist__set_tracking_event(struct evlist *evlist, 
	tracking_evsel->tracking = true;

}



struct evsel *

perf_evlist__find_evsel_by_str(struct evlist *evlist,

			       const char *str)

struct evsel *evlist__find_evsel_by_str(struct evlist *evlist, const char *str)

{

	struct evsel *evsel;