From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v13 23/23] perf config: Add a option 'remove' to perf-config
Date: Fri, 8 Jan 2016 20:39:53 +0900 [thread overview]
Message-ID: <1452253193-30502-24-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1452253193-30502-1-git-send-email-treeze.taeung@gmail.com>
A option 'remove' is to remove specific config variables.
For the syntax examples,
# perf config [<file-option>] -r | --remove [section.name ...]
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/Documentation/perf-config.txt | 6 ++++++
tools/perf/builtin-config.c | 37 ++++++++++++++++++++++++++++++--
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 367a73b..98314c2 100644
--- a/tools/perf/Documentation/perf-config.txt
+++ b/tools/perf/Documentation/perf-config.txt
@@ -15,6 +15,8 @@ or
'perf config' [<file-option>] -a | --list-all
or
'perf config' [<file-option>] -k | --skel
+or
+'perf config' [<file-option>] -r | --remove [section.name ...]
DESCRIPTION
-----------
@@ -47,6 +49,10 @@ OPTIONS
--verbose::
Be more verbose. (show config description)
+-r::
+--remove::
+ Remove specific config variables.
+
CONFIGURATION FILE
------------------
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 387f148..3857d74 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_SKEL
+ ACTION_SKEL,
+ ACTION_REMOVE
} actions;
static struct option config_options[] = {
@@ -35,6 +36,8 @@ static struct option config_options[] = {
OPT_SET_UINT('k', "skel", &actions,
"produce an skeleton with the possible"
" config variables", ACTION_SKEL),
+ OPT_SET_UINT('r', "remove", &actions,
+ "remove specific variables: [section.name ...]", ACTION_REMOVE),
OPT_INCR('v', "verbose", &verbose, "Be more verbose"
" (show config description)"),
OPT_BOOLEAN(0, "system", &use_system_config, "use system config file"),
@@ -487,7 +490,13 @@ static int set_config(struct list_head *sections, const char *config_file_name,
struct config_element *element = NULL;
find_config(sections, §ion, &element, section_name, name);
- if (value != NULL) {
+ if (!value) {
+ /* value == NULL means remove the variable */
+ if (section && element) {
+ free(element->value);
+ element->value = NULL;
+ }
+ } else {
value = normalize_value(section_name, name, value);
/* if there isn't existent section, add a new section */
@@ -638,6 +647,7 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
set_option_flag(config_options, 'l', "list", PARSE_OPT_EXCLUSIVE);
set_option_flag(config_options, 'a', "list-all", PARSE_OPT_EXCLUSIVE);
+ set_option_flag(config_options, 'r', "remove", PARSE_OPT_EXCLUSIVE);
argc = parse_options(argc, argv, config_options, config_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
@@ -667,6 +677,29 @@ int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused)
}
switch (actions) {
+ case ACTION_REMOVE:
+ if (argc) {
+ for (i = 0; argv[i]; i++) {
+ if (!use_system_config && !use_user_config) {
+ ret = perf_configset_with_option(set_config,
+ &system_sections,
+ system_config,
+ argv[i], NULL);
+ ret = perf_configset_with_option(set_config,
+ &user_sections,
+ user_config,
+ argv[i], NULL);
+ } else
+ ret = perf_configset_with_option(set_config, sections,
+ config_exclusive_filename,
+ argv[i], NULL);
+ }
+ } else {
+ pr_err("Error: Missing arguments\n");
+ parse_options_usage(config_usage, config_options, "r", 1);
+ return -1;
+ }
+ break;
case ACTION_SKEL:
if (argc)
parse_options_usage(config_usage, config_options, "k", 1);
--
2.5.0
prev parent reply other threads:[~2016-01-08 11:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 11:39 [PATCH v13 00/22] perf config: Add functionalities into perf-config and document config info Taeung Song
2016-01-08 11:39 ` [PATCH v13 01/23] perf config: Document variables for 'colors' section in man page Taeung Song
2016-02-03 10:09 ` [tip:perf/core] " tip-bot for Taeung Song
2016-01-08 11:39 ` [PATCH v13 02/23] perf config: Document variables for 'tui' and 'gtk' sections " Taeung Song
2016-02-03 10:09 ` [tip:perf/core] perf config: Document variables for 'tui' and ' gtk' " tip-bot for Taeung Song
2016-01-08 11:39 ` [PATCH v13 03/23] perf config: Document 'buildid.dir' variable " Taeung Song
2016-02-03 10:09 ` [tip:perf/core] " tip-bot for Taeung Song
2016-01-08 11:39 ` [PATCH v13 04/23] perf config: Document variables for 'annotate' section " Taeung Song
2016-01-21 14:45 ` Arnaldo Carvalho de Melo
2016-01-22 7:11 ` Taeung Song
2016-02-03 10:10 ` [tip:perf/core] " tip-bot for Taeung Song
2016-01-08 11:39 ` [PATCH v13 05/23] perf config: Document variables for 'help' " Taeung Song
2016-01-21 14:46 ` Arnaldo Carvalho de Melo
2016-01-22 8:00 ` Taeung Song
2016-01-08 11:39 ` [PATCH v13 06/23] perf config: Document 'hist.percentage' variable " Taeung Song
2016-01-21 14:54 ` Arnaldo Carvalho de Melo
2016-01-22 8:03 ` Taeung Song
2016-02-03 10:10 ` [tip:perf/core] " tip-bot for Taeung Song
2016-01-08 11:39 ` [PATCH v13 07/23] perf config: Document 'ui.show-headers' " Taeung Song
2016-01-08 11:39 ` [PATCH v13 08/23] perf config: Document variables for 'call-graph' section " Taeung Song
2016-01-08 11:39 ` [PATCH v13 09/23] perf config: Document variables for 'report' " Taeung Song
2016-01-08 11:39 ` [PATCH v13 10/23] perf config: Document 'top.children' variable " Taeung Song
2016-01-08 11:39 ` [PATCH v13 11/23] perf config: Document 'man.viewer' " Taeung Song
2016-01-08 11:39 ` [PATCH v13 12/23] perf config: Document 'pager.<subcommand>' variables " Taeung Song
2016-01-08 11:39 ` [PATCH v13 13/23] perf config: Document 'kmem.default' variable " Taeung Song
2016-01-08 11:39 ` [PATCH v13 14/23] perf config: Document 'record.build-id' " Taeung Song
2016-01-08 11:39 ` [PATCH v13 15/23] perf config: Add '--system' and '--user' options to select which config file is used Taeung Song
2016-01-08 11:39 ` [PATCH v13 16/23] perf config: Collect configs to handle config variables Taeung Song
2016-01-08 11:39 ` [PATCH v13 17/23] perf config: Add 'list-all' option to perf-config Taeung Song
2016-01-08 11:39 ` [PATCH v13 18/23] perf config: Add a option 'skel' " Taeung Song
2016-01-08 11:39 ` [PATCH v13 19/23] perf config: Add --verbose option for showing config description Taeung Song
2016-01-08 11:39 ` [PATCH v13 20/23] perf config: Add 'get' functionality Taeung Song
2016-01-08 11:39 ` [PATCH v13 21/23] perf config: Add 'set' feature Taeung Song
2016-01-08 11:39 ` [PATCH v13 22/23] perf config: normalize a value depending on default type of it Taeung Song
2016-01-08 11:39 ` Taeung Song [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452253193-30502-24-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).