Commit c7ac2417 authored by Taeung Song's avatar Taeung Song Committed by Arnaldo Carvalho de Melo

perf config: Add '--system' and '--user' options to select which config file is used

The '--system' option means $(sysconfdir)/perfconfig and '--user' means
$HOME/.perfconfig. If none is used, both system and user config file are
read.  E.g.:

    # perf config [<file-option>] [options]

    With an specific config file:

    # perf config --user | --system

    or both user and system config file:

    # perf config
Signed-off-by: default avatarTaeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1455126685-32367-2-git-send-email-treeze.taeung@gmail.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a7636d9e
...@@ -8,7 +8,7 @@ perf-config - Get and set variables in a configuration file. ...@@ -8,7 +8,7 @@ perf-config - Get and set variables in a configuration file.
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'perf config' -l | --list 'perf config' [<file-option>] -l | --list
DESCRIPTION DESCRIPTION
----------- -----------
...@@ -21,6 +21,14 @@ OPTIONS ...@@ -21,6 +21,14 @@ OPTIONS
--list:: --list::
Show current config variables, name and value, for all sections. 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 CONFIGURATION FILE
------------------ ------------------
...@@ -30,6 +38,10 @@ The '$HOME/.perfconfig' file is used to store a per-user configuration. ...@@ -30,6 +38,10 @@ The '$HOME/.perfconfig' file is used to store a per-user configuration.
The file '$(sysconfdir)/perfconfig' can be used to The file '$(sysconfdir)/perfconfig' can be used to
store a system-wide default configuration. store a system-wide default configuration.
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 Syntax
~~~~~~ ~~~~~~
......
...@@ -13,8 +13,10 @@ ...@@ -13,8 +13,10 @@
#include "util/util.h" #include "util/util.h"
#include "util/debug.h" #include "util/debug.h"
static bool use_system_config, use_user_config;
static const char * const config_usage[] = { static const char * const config_usage[] = {
"perf config [options]", "perf config [<file-option>] [options]",
NULL NULL
}; };
...@@ -25,6 +27,8 @@ enum actions { ...@@ -25,6 +27,8 @@ enum actions {
static struct option config_options[] = { static struct option config_options[] = {
OPT_SET_UINT('l', "list", &actions, OPT_SET_UINT('l', "list", &actions,
"show current config variables", ACTION_LIST), "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() OPT_END()
}; };
...@@ -42,10 +46,23 @@ static int show_config(const char *key, const char *value, ...@@ -42,10 +46,23 @@ static int show_config(const char *key, const char *value,
int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
{ {
int ret = 0; int ret = 0;
char *user_config = mkpath("%s/.perfconfig", getenv("HOME"));
argc = parse_options(argc, argv, config_options, config_usage, argc = parse_options(argc, argv, config_options, config_usage,
PARSE_OPT_STOP_AT_NON_OPTION); 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 = user_config;
switch (actions) { switch (actions) {
case ACTION_LIST: case ACTION_LIST:
if (argc) { if (argc) {
...@@ -53,9 +70,13 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) ...@@ -53,9 +70,13 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
parse_options_usage(config_usage, config_options, "l", 1); parse_options_usage(config_usage, config_options, "l", 1);
} else { } else {
ret = perf_config(show_config, NULL); ret = perf_config(show_config, NULL);
if (ret < 0) if (ret < 0) {
const char * config_filename = config_exclusive_filename;
if (!config_exclusive_filename)
config_filename = user_config;
pr_err("Nothing configured, " pr_err("Nothing configured, "
"please check your ~/.perfconfig file\n"); "please check your %s \n", config_filename);
}
} }
break; break;
default: default:
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR" #define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
#define PERF_PAGER_ENVIRONMENT "PERF_PAGER" #define PERF_PAGER_ENVIRONMENT "PERF_PAGER"
extern const char *config_exclusive_filename;
typedef int (*config_fn_t)(const char *, const char *, void *); typedef int (*config_fn_t)(const char *, const char *, void *);
extern int perf_default_config(const char *, const char *, void *); extern int perf_default_config(const char *, const char *, void *);
extern int perf_config(config_fn_t fn, void *); extern int perf_config(config_fn_t fn, void *);
...@@ -31,6 +33,7 @@ extern u64 perf_config_u64(const char *, const char *); ...@@ -31,6 +33,7 @@ extern u64 perf_config_u64(const char *, const char *);
extern int perf_config_bool(const char *, const char *); extern int perf_config_bool(const char *, const char *);
extern int config_error_nonbool(const char *); extern int config_error_nonbool(const char *);
extern const char *perf_config_dirname(const char *, const char *); extern const char *perf_config_dirname(const char *, const char *);
extern const char *perf_etc_perfconfig(void);
char *alias_lookup(const char *alias); char *alias_lookup(const char *alias);
int split_cmdline(char *cmdline, const char ***argv); int split_cmdline(char *cmdline, const char ***argv);
......
...@@ -26,7 +26,7 @@ static const char *config_file_name; ...@@ -26,7 +26,7 @@ static const char *config_file_name;
static int config_linenr; static int config_linenr;
static int config_file_eof; static int config_file_eof;
static const char *config_exclusive_filename; const char *config_exclusive_filename;
static int get_next_char(void) 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 ...@@ -434,7 +434,7 @@ static int perf_config_from_file(config_fn_t fn, const char *filename, void *dat
return ret; return ret;
} }
static const char *perf_etc_perfconfig(void) const char *perf_etc_perfconfig(void)
{ {
static const char *system_wide; static const char *system_wide;
if (!system_wide) if (!system_wide)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment