Commit 85c60a01 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Arnaldo Carvalho de Melo
Browse files

perf: Remove unused del_perf_probe_events() 



del_perf_probe_events() last use was removed by commit 3d6dfae8
("perf parse-events: Remove BPF event support")

Remove it.

It was the last user of probe_file__del_events(), so remove it as well.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20241022002940.302946-1-linux@treblig.org


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

tools/perf/util/probe-event.c

+0 −35
Original line number Diff line number Diff line
@@ -3754,41 +3754,6 @@ void cleanup_perf_probe_events(struct perf_probe_event *pevs, int npevs) 
	}

}



int del_perf_probe_events(struct strfilter *filter)

{

	int ret, ret2, ufd = -1, kfd = -1;

	char *str = strfilter__string(filter);



	if (!str)

		return -EINVAL;



	/* Get current event names */

	ret = probe_file__open_both(&kfd, &ufd, PF_FL_RW);

	if (ret < 0)

		goto out;



	ret = probe_file__del_events(kfd, filter);

	if (ret < 0 && ret != -ENOENT)

		goto error;



	ret2 = probe_file__del_events(ufd, filter);

	if (ret2 < 0 && ret2 != -ENOENT) {

		ret = ret2;

		goto error;

	}

	ret = 0;



error:

	if (kfd >= 0)

		close(kfd);

	if (ufd >= 0)

		close(ufd);

out:

	free(str);



	return ret;

}



int show_available_funcs(const char *target, struct nsinfo *nsi,

			 struct strfilter *_filter, bool user)

{

tools/perf/util/probe-event.h

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ void cleanup_perf_probe_events(struct perf_probe_event *pevs, int npevs); 


struct strfilter;



int del_perf_probe_events(struct strfilter *filter);



int show_perf_probe_event(const char *group, const char *event,

			  struct perf_probe_event *pev,

			  const char *module, bool use_stdout);

tools/perf/util/probe-file.c

+0 −19
Original line number Diff line number Diff line
@@ -366,25 +366,6 @@ int probe_file__del_strlist(int fd, struct strlist *namelist) 
	return ret;

}



int probe_file__del_events(int fd, struct strfilter *filter)

{

	struct strlist *namelist;

	int ret;



	namelist = strlist__new(NULL, NULL);

	if (!namelist)

		return -ENOMEM;



	ret = probe_file__get_events(fd, filter, namelist);

	if (ret < 0)

		goto out;



	ret = probe_file__del_strlist(fd, namelist);

out:

	strlist__delete(namelist);

	return ret;

}



/* Caller must ensure to remove this entry from list */

static void probe_cache_entry__delete(struct probe_cache_entry *entry)

{

tools/perf/util/probe-file.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct strlist *probe_file__get_namelist(int fd); 
struct strlist *probe_file__get_rawlist(int fd);

int probe_file__add_event(int fd, struct probe_trace_event *tev);



int probe_file__del_events(int fd, struct strfilter *filter);

int probe_file__get_events(int fd, struct strfilter *filter,

				  struct strlist *plist);

int probe_file__del_strlist(int fd, struct strlist *namelist);