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

perf evsel: Rename perf_evsel__delete() to evsel__delete() 



Remame perf_evsel__delete() to evsel__delete(), so we don't have a name
clash when we add perf_evsel__delete() in libperf.

Also renaming perf_evsel__delete_priv() to evsel__delete_priv().

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-11-jolsa@kernel.org


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

tools/perf/builtin-inject.c

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static void strip_fini(struct perf_inject *inject) 
		    ok_to_remove(evlist, evsel)) {

			pr_debug("Deleting %s\n", perf_evsel__name(evsel));

			perf_evlist__remove(evlist, evsel);

			perf_evsel__delete(evsel);

			evsel__delete(evsel);

		}

	}

}
@@ -725,7 +725,7 @@ static int __cmd_inject(struct perf_inject *inject) 
				pr_debug("Deleting %s\n",

					 perf_evsel__name(evsel));

				perf_evlist__remove(session->evlist, evsel);

				perf_evsel__delete(evsel);

				evsel__delete(evsel);

			}

			if (inject->strip)

				strip_fini(inject);

tools/perf/builtin-trace.c

+6 −6
Original line number Diff line number Diff line
@@ -274,10 +274,10 @@ static int perf_evsel__init_tp_ptr_field(struct evsel *evsel, 
	({ struct syscall_tp *sc = evsel->priv;\

	   perf_evsel__init_tp_ptr_field(evsel, &sc->name, #name); })



static void perf_evsel__delete_priv(struct evsel *evsel)

static void evsel__delete_priv(struct evsel *evsel)

{

	zfree(&evsel->priv);

	perf_evsel__delete(evsel);

	evsel__delete(evsel);

}



static int perf_evsel__init_syscall_tp(struct evsel *evsel)
@@ -368,7 +368,7 @@ static struct evsel *perf_evsel__raw_syscall_newtp(const char *direction, void * 
	return evsel;



out_delete:

	perf_evsel__delete_priv(evsel);

	evsel__delete_priv(evsel);

	return NULL;

}
@@ -2638,7 +2638,7 @@ static bool perf_evlist__add_vfs_getname(struct evlist *evlist) 


		list_del_init(&evsel->node);

		evsel->evlist = NULL;

		perf_evsel__delete(evsel);

		evsel__delete(evsel);

	}



	return found;
@@ -2739,9 +2739,9 @@ out: 
	return ret;



out_delete_sys_exit:

	perf_evsel__delete_priv(sys_exit);

	evsel__delete_priv(sys_exit);

out_delete_sys_enter:

	perf_evsel__delete_priv(sys_enter);

	evsel__delete_priv(sys_enter);

	goto out;

}

tools/perf/tests/evsel-tp-sched.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtes 
	if (perf_evsel__test_field(evsel, "next_prio", 4, true))

		ret = -1;



	perf_evsel__delete(evsel);

	evsel__delete(evsel);



	evsel = perf_evsel__newtp("sched", "sched_wakeup");
@@ -85,6 +85,6 @@ int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtes 
	if (perf_evsel__test_field(evsel, "target_cpu", 4, true))

		ret = -1;



	perf_evsel__delete(evsel);

	evsel__delete(evsel);

	return ret;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int 
out_close_fd:

	perf_evsel__close_fd(evsel);

out_evsel_delete:

	perf_evsel__delete(evsel);

	evsel__delete(evsel);

out_cpu_map_delete:

	cpu_map__put(cpus);

out_thread_map_delete:

tools/perf/tests/openat-syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int test__openat_syscall_event(struct test *test __maybe_unused, int subtest __m 
out_close_fd:

	perf_evsel__close_fd(evsel);

out_evsel_delete:

	perf_evsel__delete(evsel);

	evsel__delete(evsel);

out_thread_map_delete:

	thread_map__put(threads);

	return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE