Re: [PATCH v3 3/7] perf config: Modify perf_config_set__delete() using global variable 'config_set'

[Arnaldo Carvalho de Melo]

Em Tue, May 31, 2016 at 01:44:07AM +0900, Taeung Song escreveu:
> This function deleted allocated config set but
> the global variable 'config_set' is used all around
> so this directly remove 'config_set' instead of using local variable 'set'.

Keep it like it is, i.e. foo__delete() acts on something returned by
foo__new(), for consistency.

We may want to, for instance, have two instances returned by foo__new()
and then call the destructor for each.

- Arnaldo
 
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> Signed-off-by: Taeung Song <treeze.taeung@xxxxxxxxx>
> ---
>  tools/perf/builtin-config.c | 2 +-
>  tools/perf/util/config.c    | 8 ++++----
>  tools/perf/util/config.h    | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
> index b3bc01a..255015e 100644
> --- a/tools/perf/builtin-config.c
> +++ b/tools/perf/builtin-config.c
> @@ -105,7 +105,7 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
>  		usage_with_options(config_usage, config_options);
>  	}
>  
> -	perf_config_set__delete(config_set);
> +	perf_config_set__delete();
>  out_err:
>  	return ret;
>  }
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index adf2bad..68def9a 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -642,7 +642,7 @@ static int collect_config(const char *var, const char *value,
>  
>  out_free:
>  	free(key);
> -	perf_config_set__delete(set);
> +	perf_config_set__delete();
>  	return -1;
>  }
>  
> @@ -740,10 +740,10 @@ static void perf_config_set__purge(struct perf_config_set *set)
>  	}
>  }
>  
> -void perf_config_set__delete(struct perf_config_set *set)
> +void perf_config_set__delete(void)
>  {
> -	perf_config_set__purge(set);
> -	free(set);
> +	perf_config_set__purge(config_set);
> +	zfree(&config_set);
>  }
>  
>  /*
> diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
> index ea157a4..e9b47b3 100644
> --- a/tools/perf/util/config.h
> +++ b/tools/perf/util/config.h
> @@ -23,6 +23,6 @@ struct perf_config_set {
>  extern struct perf_config_set *config_set;
>  
>  struct perf_config_set *perf_config_set__new(void);
> -void perf_config_set__delete(struct perf_config_set *set);
> +void perf_config_set__delete(void);
>  
>  #endif /* __PERF_CONFIG_H */
> -- 
> 2.5.0