[PATCH v5 6/6] perf config: Add a option 'remove' to perf-config
From: Taeung Song
Date: Mon Aug 17 2015 - 13:29:03 EST
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.taeung@xxxxxxxxx>
---
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' [<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 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/