Skip to content

Commit 85c60a0

Browse files
Dr. David Alan Gilbertacmel
authored andcommitted
perf: Remove unused del_perf_probe_events()
del_perf_probe_events() last use was removed by commit 3d6dfae ("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: Dr. 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: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 8f99786 commit 85c60a0

File tree

4 files changed

+0
-57
lines changed

4 files changed

+0
-57
lines changed

tools/perf/util/probe-event.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3754,41 +3754,6 @@ void cleanup_perf_probe_events(struct perf_probe_event *pevs, int npevs)
37543754
}
37553755
}
37563756

3757-
int del_perf_probe_events(struct strfilter *filter)
3758-
{
3759-
int ret, ret2, ufd = -1, kfd = -1;
3760-
char *str = strfilter__string(filter);
3761-
3762-
if (!str)
3763-
return -EINVAL;
3764-
3765-
/* Get current event names */
3766-
ret = probe_file__open_both(&kfd, &ufd, PF_FL_RW);
3767-
if (ret < 0)
3768-
goto out;
3769-
3770-
ret = probe_file__del_events(kfd, filter);
3771-
if (ret < 0 && ret != -ENOENT)
3772-
goto error;
3773-
3774-
ret2 = probe_file__del_events(ufd, filter);
3775-
if (ret2 < 0 && ret2 != -ENOENT) {
3776-
ret = ret2;
3777-
goto error;
3778-
}
3779-
ret = 0;
3780-
3781-
error:
3782-
if (kfd >= 0)
3783-
close(kfd);
3784-
if (ufd >= 0)
3785-
close(ufd);
3786-
out:
3787-
free(str);
3788-
3789-
return ret;
3790-
}
3791-
37923757
int show_available_funcs(const char *target, struct nsinfo *nsi,
37933758
struct strfilter *_filter, bool user)
37943759
{

tools/perf/util/probe-event.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ void cleanup_perf_probe_events(struct perf_probe_event *pevs, int npevs);
167167

168168
struct strfilter;
169169

170-
int del_perf_probe_events(struct strfilter *filter);
171-
172170
int show_perf_probe_event(const char *group, const char *event,
173171
struct perf_probe_event *pev,
174172
const char *module, bool use_stdout);

tools/perf/util/probe-file.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -366,25 +366,6 @@ int probe_file__del_strlist(int fd, struct strlist *namelist)
366366
return ret;
367367
}
368368

369-
int probe_file__del_events(int fd, struct strfilter *filter)
370-
{
371-
struct strlist *namelist;
372-
int ret;
373-
374-
namelist = strlist__new(NULL, NULL);
375-
if (!namelist)
376-
return -ENOMEM;
377-
378-
ret = probe_file__get_events(fd, filter, namelist);
379-
if (ret < 0)
380-
goto out;
381-
382-
ret = probe_file__del_strlist(fd, namelist);
383-
out:
384-
strlist__delete(namelist);
385-
return ret;
386-
}
387-
388369
/* Caller must ensure to remove this entry from list */
389370
static void probe_cache_entry__delete(struct probe_cache_entry *entry)
390371
{

tools/perf/util/probe-file.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ struct strlist *probe_file__get_namelist(int fd);
4444
struct strlist *probe_file__get_rawlist(int fd);
4545
int probe_file__add_event(int fd, struct probe_trace_event *tev);
4646

47-
int probe_file__del_events(int fd, struct strfilter *filter);
4847
int probe_file__get_events(int fd, struct strfilter *filter,
4948
struct strlist *plist);
5049
int probe_file__del_strlist(int fd, struct strlist *namelist);

0 commit comments

Comments
 (0)