From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423198AbcFHIqA (ORCPT ); Wed, 8 Jun 2016 04:46:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54192 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422921AbcFHIp5 (ORCPT ); Wed, 8 Jun 2016 04:45:57 -0400 Date: Wed, 8 Jun 2016 01:45:19 -0700 From: tip-bot for Taeung Song Message-ID: Cc: hpa@zytor.com, namhyung@kernel.org, alexander.shishkin@linux.intel.com, acme@redhat.com, jolsa@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, mhiramat@kernel.org, mingo@kernel.org, tglx@linutronix.de, treeze.taeung@gmail.com Reply-To: mhiramat@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com, jolsa@redhat.com, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, treeze.taeung@gmail.com, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <1465291577-20973-3-git-send-email-treeze.taeung@gmail.com> References: <1465291577-20973-3-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Use new perf_config_set__init() to initialize config set Git-Commit-ID: 8beeb00f2c8498686eee02b8edcd1488b903c90b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8beeb00f2c8498686eee02b8edcd1488b903c90b Gitweb: http://git.kernel.org/tip/8beeb00f2c8498686eee02b8edcd1488b903c90b Author: Taeung Song AuthorDate: Tue, 7 Jun 2016 18:26:12 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 11:01:25 -0300 perf config: Use new perf_config_set__init() to initialize config set 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 Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1465291577-20973-3-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/config.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index e086f59..8749eca 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -646,13 +646,58 @@ out_free: 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 *set = zalloc(sizeof(*set)); if (set) { INIT_LIST_HEAD(&set->sections); - if (perf_config(collect_config, set) < 0) { + if (perf_config_set__init(set) < 0) { perf_config_set__delete(set); set = NULL; }