Re: [PATCH v9 2/9] perf config: Add '--system' and '--user' options to select which config file is used

[Namhyung Kim]

On Tue, Nov 03, 2015 at 10:50:13AM +0900, Taeung Song wrote:
> The file-options '--system' means $(sysconfdir)/perfconfig and
> '--user' means $HOME/.perfconfig. If file-option isn't used,
> both system and user config file is read.
> The syntax examples are like below.
> 
>     perf config [<file-option>] [options]
> 
>     a specific config file.
>     # perf config --user | --system
>     or
>     both user and system config file.
>     # perf config
> 
> Signed-off-by: Taeung Song <treeze.taeung@xxxxxxxxx>

Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>

Thanks,
Namhyung


> ---
>  tools/perf/Documentation/perf-config.txt | 14 +++++++++++++-
>  tools/perf/builtin-config.c              | 18 +++++++++++++++++-
>  tools/perf/util/cache.h                  |  3 +++
>  tools/perf/util/config.c                 |  4 ++--
>  4 files changed, 35 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
> index a590319..2188722 100644
> --- a/tools/perf/Documentation/perf-config.txt
> +++ b/tools/perf/Documentation/perf-config.txt
> @@ -8,7 +8,7 @@ perf-config - Get and set variables in a configuration file.
>  SYNOPSIS
>  --------
>  [verse]
> -'perf config' -l | --list
> +'perf config' [<file-option>] -l | --list
>  
>  DESCRIPTION
>  -----------
> @@ -21,6 +21,14 @@ OPTIONS
>  --list::
>  	Show current config variables, name and value, for all sections.
>  
> +--user::
> +	For writing and reading options: write to user
> +	'$HOME/.perfconfig' file or read it.
> +
> +--system::
> +	For writing and reading options: write to system-wide
> +	'$(sysconfdir)/perfconfig' or read it.
> +
>  CONFIGURATION FILE
>  ------------------
>  
> @@ -33,6 +41,10 @@ store a system-wide default configuration.
>  The variables are divided into sections. In each section, the variables
>  that are composed of a name and value.
>  
> +When reading or writing, the values are read from the system and user
> +configuration files by default, and options '--system' and '--user'
> +can be used to tell the command to read from or write to only that location.
> +
>  Syntax
>  ~~~~~~
>  
> diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
> index 2d16150..68e105a 100644
> --- a/tools/perf/builtin-config.c
> +++ b/tools/perf/builtin-config.c
> @@ -13,8 +13,10 @@
>  #include "util/util.h"
>  #include "util/debug.h"
>  
> +static bool use_system_config, use_user_config;
> +
>  static const char * const config_usage[] = {
> -	"perf config [options]",
> +	"perf config [<file-option>] [options]",
>  	NULL
>  };
>  
> @@ -25,6 +27,8 @@ enum actions {
>  static struct option config_options[] = {
>  	OPT_SET_UINT('l', "list", &actions,
>  		     "show current config variables", ACTION_LIST),
> +	OPT_BOOLEAN(0, "system", &use_system_config, "use system config file"),
> +	OPT_BOOLEAN(0, "user", &use_user_config, "use user config file"),
>  	OPT_END()
>  };
>  
> @@ -46,6 +50,18 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
>  	argc = parse_options(argc, argv, config_options, config_usage,
>  			     PARSE_OPT_STOP_AT_NON_OPTION);
>  
> +	if (use_system_config && use_user_config) {
> +		pr_err("Error: only one config file at a time\n");
> +		parse_options_usage(config_usage, config_options, "user", 0);
> +		parse_options_usage(NULL, config_options, "system", 0);
> +		return -1;
> +	}
> +
> +	if (use_system_config)
> +		config_exclusive_filename = perf_etc_perfconfig();
> +	else if (use_user_config)
> +		config_exclusive_filename = mkpath("%s/.perfconfig", getenv("HOME"));
> +
>  	switch (actions) {
>  	case ACTION_LIST:
>  	default:
> diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
> index c861373..d1eb75f 100644
> --- a/tools/perf/util/cache.h
> +++ b/tools/perf/util/cache.h
> @@ -19,6 +19,8 @@
>  #define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"
>  #define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
>  
> +extern const char *config_exclusive_filename;
> +
>  typedef int (*config_fn_t)(const char *, const char *, void *);
>  extern int perf_default_config(const char *, const char *, void *);
>  extern int perf_config(config_fn_t fn, void *);
> @@ -27,6 +29,7 @@ extern u64 perf_config_u64(const char *, const char *);
>  extern int perf_config_bool(const char *, const char *);
>  extern int config_error_nonbool(const char *);
>  extern const char *perf_config_dirname(const char *, const char *);
> +extern const char *perf_etc_perfconfig(void);
>  
>  /* pager.c */
>  extern void setup_pager(void);
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index 2e452ac..55ef373 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -26,7 +26,7 @@ static const char *config_file_name;
>  static int config_linenr;
>  static int config_file_eof;
>  
> -static const char *config_exclusive_filename;
> +const char *config_exclusive_filename;
>  
>  static int get_next_char(void)
>  {
> @@ -434,7 +434,7 @@ static int perf_config_from_file(config_fn_t fn, const char *filename, void *dat
>  	return ret;
>  }
>  
> -static const char *perf_etc_perfconfig(void)
> +const char *perf_etc_perfconfig(void)
>  {
>  	static const char *system_wide;
>  	if (!system_wide)
> -- 
> 1.9.1
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/