[PATCH v4 5/5] 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 -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              | 25 ++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/tools/perf/Documentation/perf-config.txt 
b/tools/perf/Documentation/perf-config.txt
index d8b3acc..416637b 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 f4a1569..74fcedc 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -24,6 +24,7 @@ static const char * const config_usage[] = {
 
 #define ACTION_LIST (1<<0)
 #define ACTION_LIST_ALL (1<<1)
+#define ACTION_REMOVE (1<<2)
 
 static const struct option config_options[] = {
        OPT_GROUP("Config file location"),
@@ -34,6 +35,8 @@ static const struct option config_options[] = {
                "show current config variables", ACTION_LIST),
        OPT_BIT('a', "list-all", &actions,
                "show current and all possible config variables with default 
values", ACTION_LIST_ALL),
+       OPT_BIT('r', "remove", &actions,
+               "remove specific variables: [section.name ...]", ACTION_REMOVE),
        OPT_END()
 };
 
@@ -484,7 +487,15 @@ static int set_config(const char *section_name, const char 
*name, char *value)
        struct config_element *element_node = NULL;
 
        find_config(&section_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
+                       pr_err("Error: Failed to find the variable.\n");
+       } else {
                value = normalize_value(section_name, name, value);
 
                /* if there isn't existent section, add a new section */
@@ -665,6 +676,18 @@ int cmd_config(int argc, const char **argv, const char 
*prefix __maybe_unused)
                else
                        goto out_err;
                goto out;
+       case ACTION_REMOVE:
+               for (i = 0; argv[i]; i++) {
+                       if (value == NULL)
+                               ret = perf_configset_with_option(set_config, 
argv[i], NULL);
+                       else {
+                               pr_err("invalid key: %s\n", argv[i]);
+                               return -1;
+                       }
+                       if (ret < 0)
+                               goto out;
+               }
+               goto out;
        default:
                if ((!has_option || use_global_config || use_system_config)
                    && argc == 0) {
-- 
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/