leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf config: Use new perf_config_set__init() to initialize config set

Browse Source 
Instead of perf_config(), this function initializes config set by
reading various files: user config ~/.perfconfig and system config
$(sysconfdir)/perfconfig).

If there are the same config variable in both user and system config
files, user config has higher priority than system config.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1465291577-20973-3-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Taeung Song 2016-06-07 18:26:12 +09:00 committed by Arnaldo Carvalho de Melo
parent 25d8f48f78
commit 8beeb00f2c
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/perf/util/config.c
View File

@ -646,13 +646,58 @@ out_free:
return -1; return -1;
} }
static int perf_config_set__init(struct perf_config_set *set)
{
int ret = -1;
const char *home = NULL;
/* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
if (config_exclusive_filename)
return perf_config_from_file(collect_config, config_exclusive_filename, set);
if (perf_config_system() && !access(perf_etc_perfconfig(), R_OK)) {
if (perf_config_from_file(collect_config, perf_etc_perfconfig(), set) < 0)
goto out;
}
home = getenv("HOME");
if (perf_config_global() && home) {
char *user_config = strdup(mkpath("%s/.perfconfig", home));
struct stat st;
if (user_config == NULL) {
warning("Not enough memory to process %s/.perfconfig, "
"ignoring it.", home);
goto out;
}
if (stat(user_config, &st) < 0)
goto out_free;
if (st.st_uid && (st.st_uid != geteuid())) {
warning("File %s not owned by current user or root, "
"ignoring it.", user_config);
goto out_free;
}
if (!st.st_size)
goto out_free;
ret = perf_config_from_file(collect_config, user_config, set);
out_free:
free(user_config);
}
out:
return ret;
}
struct perf_config_set *perf_config_set__new(void) struct perf_config_set *perf_config_set__new(void)
{ {
struct perf_config_set *set = zalloc(sizeof(*set)); struct perf_config_set *set = zalloc(sizeof(*set));
if (set) { if (set) {
INIT_LIST_HEAD(&set->sections); INIT_LIST_HEAD(&set->sections);
if (perf_config(collect_config, set) < 0) { if (perf_config_set__init(set) < 0) {
perf_config_set__delete(set); perf_config_set__delete(set);
set = NULL; set = NULL;
} }