Re: [PATCH] perf tools: Consolidate close_control_option()'s into one function

[Arnaldo Carvalho de Melo]

Em Thu, Sep 03, 2020 at 03:29:37PM +0300, Adrian Hunter escreveu:
> Consolidate control option fifo closing into one function.
> 
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---

Applied and added this:

Suggested-by: Alexey Budankov <alexey.budankov@xxxxxxxxxxxxxxx>

Thanks,

- Arnaldo
 
> 
> This patch is on top of patch:
> "perf tools: Add FIFO file names as alternative options to --control"
> 
> 
>  tools/perf/builtin-record.c | 12 +-----------
>  tools/perf/builtin-stat.c   | 12 +-----------
>  tools/perf/util/evlist.c    | 10 ++++++++++
>  tools/perf/util/evlist.h    |  1 +
>  4 files changed, 13 insertions(+), 22 deletions(-)
> 
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 476b34ff3152..9db3901e6561 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -2253,16 +2253,6 @@ static int parse_control_option(const struct option *opt,
>  	return evlist__parse_control(str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close);
>  }
>  
> -static void close_control_option(struct record_opts *opts)
> -{
> -	if (opts->ctl_fd_close) {
> -		opts->ctl_fd_close = false;
> -		close(opts->ctl_fd);
> -		if (opts->ctl_fd_ack >= 0)
> -			close(opts->ctl_fd_ack);
> -	}
> -}
> -
>  static void switch_output_size_warn(struct record *rec)
>  {
>  	u64 wakeup_size = evlist__mmap_size(rec->opts.mmap_pages);
> @@ -2849,7 +2839,7 @@ int cmd_record(int argc, const char **argv)
>  	symbol__exit();
>  	auxtrace_record__free(rec->itr);
>  out_opts:
> -	close_control_option(&rec->opts);
> +	evlist__close_control(rec->opts.ctl_fd, rec->opts.ctl_fd_ack, &rec->opts.ctl_fd_close);
>  	return err;
>  }
>  
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index 21424ed0734b..68d4bdf15635 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -1051,16 +1051,6 @@ static int parse_control_option(const struct option *opt,
>  	return evlist__parse_control(str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close);
>  }
>  
> -static void close_control_option(struct perf_stat_config *config)
> -{
> -	if (config->ctl_fd_close) {
> -		config->ctl_fd_close = false;
> -		close(config->ctl_fd);
> -		if (config->ctl_fd_ack >= 0)
> -			close(config->ctl_fd_ack);
> -	}
> -}
> -
>  static struct option stat_options[] = {
>  	OPT_BOOLEAN('T', "transaction", &transaction_run,
>  		    "hardware transaction statistics"),
> @@ -2408,7 +2398,7 @@ int cmd_stat(int argc, const char **argv)
>  
>  	metricgroup__rblist_exit(&stat_config.metric_events);
>  	runtime_stat_delete(&stat_config);
> -	close_control_option(&stat_config);
> +	evlist__close_control(stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_config.ctl_fd_close);
>  
>  	return status;
>  }
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index e72ff7e78dec..ee7b576d3b12 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -1802,6 +1802,16 @@ int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *c
>  	return 0;
>  }
>  
> +void evlist__close_control(int ctl_fd, int ctl_fd_ack, bool *ctl_fd_close)
> +{
> +	if (*ctl_fd_close) {
> +		*ctl_fd_close = false;
> +		close(ctl_fd);
> +		if (ctl_fd_ack >= 0)
> +			close(ctl_fd_ack);
> +	}
> +}
> +
>  int evlist__initialize_ctlfd(struct evlist *evlist, int fd, int ack)
>  {
>  	if (fd == -1) {
> diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
> index 91d1da6e1fe3..bc38a53f6a1a 100644
> --- a/tools/perf/util/evlist.h
> +++ b/tools/perf/util/evlist.h
> @@ -376,6 +376,7 @@ enum evlist_ctl_cmd {
>  };
>  
>  int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *ctl_fd_close);
> +void evlist__close_control(int ctl_fd, int ctl_fd_ack, bool *ctl_fd_close);
>  int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack);
>  int evlist__finalize_ctlfd(struct evlist *evlist);
>  bool evlist__ctlfd_initialized(struct evlist *evlist);
> -- 
> 2.17.1
> 

-- 

- Arnaldo