Re: [PATCH] perf: event: Remove deadcode

[Namhyung Kim <namhyung@kernel.org>]

Hello,

On Sun, Nov 03, 2024 at 02:23:01PM +0000, linux@treblig.org wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
> 
> event_format__print() last use was removed by 2017's
> commit 894f3f1732cb ("perf script: Use event_format__fprintf()")
> 
> evlist__find_tracepoint_by_id() last use was removed by 2012's
> commit e60fc847cefa ("perf evlist: Remove some unused methods")
> 
> evlist__set_tp_filter_pid() last use was removed by 2017's
> commit dd1a50377c92 ("perf trace: Introduce filter_loop_pids()")
> 
> Remove them.
> 
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>

Unfortunately it doesn't apply to the current perf-tools-next cleanly.
Can you please rebase?

Thanks,
Namhyung

> ---
>  tools/perf/util/evlist.c            | 18 ------------------
>  tools/perf/util/evlist.h            |  2 --
>  tools/perf/util/trace-event-parse.c |  6 ------
>  tools/perf/util/trace-event.h       |  3 ---
>  4 files changed, 29 deletions(-)
> 
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index f14b7e6ff1dc..4b992a3f2985 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -362,19 +362,6 @@ __weak int arch_evlist__add_default_attrs(struct evlist *evlist,
>  	return __evlist__add_default_attrs(evlist, attrs, nr_attrs);
>  }
>  
> -struct evsel *evlist__find_tracepoint_by_id(struct evlist *evlist, int id)
> -{
> -	struct evsel *evsel;
> -
> -	evlist__for_each_entry(evlist, evsel) {
> -		if (evsel->core.attr.type   == PERF_TYPE_TRACEPOINT &&
> -		    (int)evsel->core.attr.config == id)
> -			return evsel;
> -	}
> -
> -	return NULL;
> -}
> -
>  struct evsel *evlist__find_tracepoint_by_name(struct evlist *evlist, const char *name)
>  {
>  	struct evsel *evsel;
> @@ -1199,11 +1186,6 @@ int evlist__set_tp_filter_pids(struct evlist *evlist, size_t npids, pid_t *pids)
>  	return ret;
>  }
>  
> -int evlist__set_tp_filter_pid(struct evlist *evlist, pid_t pid)
> -{
> -	return evlist__set_tp_filter_pids(evlist, 1, &pid);
> -}
> -
>  int evlist__append_tp_filter_pids(struct evlist *evlist, size_t npids, pid_t *pids)
>  {
>  	char *filter = asprintf__tp_filter_pids(npids, pids);
> diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
> index bcc1c6984bb5..ff73908e2178 100644
> --- a/tools/perf/util/evlist.h
> +++ b/tools/perf/util/evlist.h
> @@ -144,7 +144,6 @@ int __evlist__set_tracepoints_handlers(struct evlist *evlist,
>  	__evlist__set_tracepoints_handlers(evlist, array, ARRAY_SIZE(array))
>  
>  int evlist__set_tp_filter(struct evlist *evlist, const char *filter);
> -int evlist__set_tp_filter_pid(struct evlist *evlist, pid_t pid);
>  int evlist__set_tp_filter_pids(struct evlist *evlist, size_t npids, pid_t *pids);
>  
>  int evlist__append_tp_filter(struct evlist *evlist, const char *filter);
> @@ -152,7 +151,6 @@ int evlist__append_tp_filter(struct evlist *evlist, const char *filter);
>  int evlist__append_tp_filter_pid(struct evlist *evlist, pid_t pid);
>  int evlist__append_tp_filter_pids(struct evlist *evlist, size_t npids, pid_t *pids);
>  
> -struct evsel *evlist__find_tracepoint_by_id(struct evlist *evlist, int id);
>  struct evsel *evlist__find_tracepoint_by_name(struct evlist *evlist, const char *name);
>  
>  int evlist__add_pollfd(struct evlist *evlist, int fd);
> diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
> index f0332bd3a501..d97830cdbd7e 100644
> --- a/tools/perf/util/trace-event-parse.c
> +++ b/tools/perf/util/trace-event-parse.c
> @@ -116,12 +116,6 @@ void event_format__fprintf(struct tep_event *event,
>  	trace_seq_destroy(&s);
>  }
>  
> -void event_format__print(struct tep_event *event,
> -			 int cpu, void *data, int size)
> -{
> -	return event_format__fprintf(event, cpu, data, size, stdout);
> -}
> -
>  /*
>   * prev_state is of size long, which is 32 bits on 32 bit architectures.
>   * As it needs to have the same bits for both 32 bit and 64 bit architectures
> diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
> index bbf8b26bc8da..0e5133f1b910 100644
> --- a/tools/perf/util/trace-event.h
> +++ b/tools/perf/util/trace-event.h
> @@ -42,9 +42,6 @@ struct tep_event *trace_event__tp_format_id(int id);
>  void event_format__fprintf(struct tep_event *event,
>  			   int cpu, void *data, int size, FILE *fp);
>  
> -void event_format__print(struct tep_event *event,
> -			 int cpu, void *data, int size);
> -
>  int parse_ftrace_file(struct tep_handle *pevent, char *buf, unsigned long size);
>  int parse_event_file(struct tep_handle *pevent,
>  		     char *buf, unsigned long size, char *sys);
> -- 
> 2.47.0
>