Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1261149
| From | Taeung Song <treeze.taeung@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v9 9/9] perf config: Add a option 'remove' to perf-config |
| Date | 2015-11-03 03:00 +0100 |
| Message-ID | <qqz3e-4xe-55@gated-at.bofh.it> (permalink) |
| References | <qqz3c-4xe-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
A option 'remove' is to remove specific config variables.
For the syntax examples,
# perf config [<file-option>] -r | --remove [section.name ...]
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/Documentation/perf-config.txt | 6 +++++
tools/perf/builtin-config.c | 38 ++++++++++++++++++++++++++++++--
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
index 3caa1d1..a32e0c2 100644
--- a/tools/perf/Documentation/perf-config.txt
+++ b/tools/perf/Documentation/perf-config.txt
@@ -13,6 +13,8 @@ or
'perf config' [<file-option>] -l | --list
or
'perf config' [<file-option>] -a | --list-all
+or
+'perf config' [<file-option>] -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 04884fd..bc47b65 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -22,7 +22,8 @@ static const char * const config_usage[] = {
enum actions {
ACTION_LIST = 1,
- ACTION_LIST_ALL
+ ACTION_LIST_ALL,
+ ACTION_REMOVE
} actions;
static struct option config_options[] = {
@@ -31,6 +32,8 @@ static 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_BOOLEAN(0, "system", &use_system_config, "use system config file"),
OPT_BOOLEAN(0, "user", &use_user_config, "use user config file"),
OPT_END()
@@ -423,7 +426,14 @@ 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) {
+ if (!element->value)
+ free(element->value);
+ element->value = NULL;
+ }
+ } else {
value = normalize_value(section_name, name, value);
/* if there isn't existent section, add a new section */
@@ -572,6 +582,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);
@@ -601,6 +612,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_LIST_ALL:
if (argc == 0) {
ret = show_all_config(sections);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v9 0/9] perf tools: Add 'perf-config' command Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
[PATCH v9 7/9] perf config: Add 'set' feature Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
[PATCH v9 3/9] perf config: Collect configs to handle config variables Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
Re: [PATCH v9 3/9] perf config: Collect configs to handle config variables Namhyung Kim <namhyung@kernel.org> - 2015-11-03 13:20 +0100
[PATCH v9 2/9] perf config: Add '--system' and '--user' options to select which config file is used Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
Re: [PATCH v9 2/9] perf config: Add '--system' and '--user' options to select which config file is used Namhyung Kim <namhyung@kernel.org> - 2015-11-03 12:50 +0100
[PATCH v9 5/9] perf config: Add a option 'list-all' to perf-config Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
Re: [PATCH v9 5/9] perf config: Add a option 'list-all' to perf-config Namhyung Kim <namhyung@kernel.org> - 2015-11-03 13:40 +0100
[PATCH v9 6/9] perf config: Add 'get' functionaliy Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
[PATCH v9 9/9] perf config: Add a option 'remove' to perf-config Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
[PATCH v9 4/9] perf config: Add comparing name treating '_' and '-' as being the same thing. Taeung Song <treeze.taeung@gmail.com> - 2015-11-03 03:00 +0100
Re: [PATCH v9 4/9] perf config: Add comparing name treating '_' and '-' as being the same thing. Namhyung Kim <namhyung@kernel.org> - 2015-11-03 13:20 +0100
csiph-web