Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571AbdIVQi3 (ORCPT ); Fri, 22 Sep 2017 12:38:29 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41561 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752317AbdIVQi1 (ORCPT ); Fri, 22 Sep 2017 12:38:27 -0400 Date: Fri, 22 Sep 2017 09:36:21 -0700 From: tip-bot for Taeung Song Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, treeze.taeung@gmail.com, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com Reply-To: treeze.taeung@gmail.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, jolsa@kernel.org In-Reply-To: <1504754336-9824-1-git-send-email-treeze.taeung@gmail.com> References: <1504754336-9824-1-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Allow creating empty config set for config file autogeneration Git-Commit-ID: 55421b4fb7054f85274b1b6a321e204dac696133 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 Content-Length: 2075 Lines: 68 Commit-ID: 55421b4fb7054f85274b1b6a321e204dac696133 Gitweb: http://git.kernel.org/tip/55421b4fb7054f85274b1b6a321e204dac696133 Author: Taeung Song AuthorDate: Thu, 7 Sep 2017 12:18:56 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 13 Sep 2017 09:49:16 -0300 perf config: Allow creating empty config set for config file autogeneration When there isn't a config file (e.g. ~/.perfconfig) or it has nothing, the config set wasn't created. If the config set does not exist, a config file can't be autogenerated. So allow creating a empty config set in the above case, then we can support the config file autogeneration. Before: $ rm -f ~/.perfconfig $ perf config --user report.children=false $ cat ~/.perfconfig cat: /root/.perfconfig: No such file or directory But I think it should work even if there isn't a config file. After: $ rm -f ~/.perfconfig $ perf config --user report.children=false $ cat ~/.perfconfig # this file is auto-generated. [report] children = false NOTE: As a result, if perf_config_set__init() fails, it looks as if the config set isn't freed. But it isn't a problem. Because the config set will be freed by perf_config_set__delete() at the end of cmd_config(). Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1504754336-9824-1-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/config.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index bc75596..d2b6983 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -700,10 +700,7 @@ struct perf_config_set *perf_config_set__new(void) if (set) { INIT_LIST_HEAD(&set->sections); - if (perf_config_set__init(set) < 0) { - perf_config_set__delete(set); - set = NULL; - } + perf_config_set__init(set); } return set;