From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752811AbbHQR27 (ORCPT ); Mon, 17 Aug 2015 13:28:59 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33160 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751918AbbHQR25 (ORCPT ); Mon, 17 Aug 2015 13:28:57 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, jolsa@redhat.com, namhyung@kernel.org, Ingo Molnar , Taeung Song Subject: [PATCH v5 6/6] perf config: Add a option 'remove' to perf-config Date: Tue, 18 Aug 2015 00:19:25 +0900 Message-Id: <1439824765-10564-7-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439824765-10564-1-git-send-email-treeze.taeung@gmail.com> References: <1439824765-10564-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A option 'remove' is to remove specific config variables. For the syntax examples, # perf config -r | --remove [section.name ...] Signed-off-by: Taeung Song --- tools/perf/Documentation/perf-config.txt | 6 ++++++ tools/perf/builtin-config.c | 26 ++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt index 9c95af8..cfa6013 100644 --- a/tools/perf/Documentation/perf-config.txt +++ b/tools/perf/Documentation/perf-config.txt @@ -13,6 +13,8 @@ or 'perf config' [] -l | --list or 'perf config' [] -a | --list-all +or +'perf config' [] -r | --remove [section.name ...] DESCRIPTION ----------- @@ -37,6 +39,10 @@ OPTIONS --list-all:: Show current and all possible config variables with default values. +-r:: +--remove:: + Remove specific config variables. + CONFIGURATION FILE ------------------ diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c index d5cc3e8..8d50637 100644 --- a/tools/perf/builtin-config.c +++ b/tools/perf/builtin-config.c @@ -23,7 +23,8 @@ static const char * const config_usage[] = { enum actions { ACTION_LIST = 1, - ACTION_LIST_ALL + ACTION_LIST_ALL, + ACTION_REMOVE } actions; static const struct option config_options[] = { @@ -36,6 +37,8 @@ static const struct option config_options[] = { OPT_SET_UINT('a', "list-all", &actions, "show current and all possible config variables with default values", ACTION_LIST_ALL), + OPT_SET_UINT('r', "remove", &actions, + "remove specific variables: [section.name ...]", ACTION_REMOVE), OPT_END() }; @@ -495,7 +498,14 @@ static int set_config(const char *section_name, const char *name, char *value) struct config_element *element_node = NULL; find_config(§ion_node, &element_node, section_name, name); - if (value != NULL) { + if (!value) { + /* value == NULL means remove the variable */ + if (section_node && element_node) { + if (!element_node->value) + free(element_node->value); + element_node->value = NULL; + } + } else { value = normalize_value(section_name, name, value); /* if there isn't existent section, add a new section */ @@ -651,6 +661,18 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) perf_config_from_file(collect_current_config, config_file_name, NULL); switch (actions) { + case ACTION_REMOVE: + if (argc) { + for (i = 0; argv[i]; i++) { + ret = perf_configset_with_option(set_config, argv[i], NULL); + if (ret < 0) + goto out_err; + } + } else { + pr_err("Error: wrong number of arguments\n"); + goto out_err; + } + break; case ACTION_LIST_ALL: if (argc == 0) { ret = show_all_config(); -- 1.9.1