[PATCH v7 7/7] perf config: Add a option 'remove' to perf-config

[Taeung Song]

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.tae...@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 f24926e..281e759 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 680a655..9253eae 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[] = {
@@ -35,6 +36,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_END()
 };
 
@@ -532,7 +535,14 @@ static int set_config(struct list_head *sections, const 
char *config_file_name,
        struct config_element *element = NULL;
 
        find_config(sections, &section, &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 */
@@ -659,6 +669,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);
@@ -690,6 +701,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_file_name,
+                                                                        
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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/