[PATCH v4 6/6] perf config: Reimplement show_config() using perf_config()

[Taeung Song]

Old show_config() directly use config set so
there are many duplicated code with perf_config_set__iter().

So reimplement show_config() using perf_config() that use
perf_config_set__iter() with config set that already
contains all configs.

Cc: Namhyung Kim 
Cc: Jiri Olsa 
Cc: Masami Hiramatsu 
Cc: Alexander Shishkin 
Signed-off-by: Taeung Song 
---
 tools/perf/builtin-config.c | 29 +++--
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 4dab41e..b6ae8ea 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -33,28 +33,13 @@ static struct option config_options[] = {
OPT_END()
 };
 
-static int show_config(struct perf_config_set *set)
+static int show_config(const char *key, const char *value,
+  void *cb __maybe_unused)
 {
-   struct perf_config_section *section;
-   struct perf_config_item *item;
-   struct list_head *sections;
-
-   if (set == NULL)
-   return -1;
-
-   sections = >sections;
-   if (list_empty(sections))
-   return -1;
-
-   list_for_each_entry(section, sections, node) {
-   list_for_each_entry(item, >items, node) {
-   char *value = item->value;
-
-   if (value)
-   printf("%s.%s=%s\n", section->name,
-  item->name, value);
-   }
-   }
+   if (value)
+   printf("%s=%s\n", key, value);
+   else
+   printf("%s\n", key);
 
return 0;
 }
@@ -96,7 +81,7 @@ int cmd_config(int argc, const char **argv, const char 
*prefix __maybe_unused)
pr_err("Error: takes no arguments\n");
parse_options_usage(config_usage, config_options, "l", 
1);
} else {
-   ret = show_config(config_set);
+   ret = perf_config(show_config, NULL);
if (ret < 0) {
const char * config_filename = 
config_exclusive_filename;
if (!config_exclusive_filename)
-- 
2.5.0

[PATCH v4 6/6] perf config: Reimplement show_config() using perf_config()

[Taeung Song]

Old show_config() directly use config set so
there are many duplicated code with perf_config_set__iter().

So reimplement show_config() using perf_config() that use
perf_config_set__iter() with config set that already
contains all configs.

Cc: Namhyung Kim 
Cc: Jiri Olsa 
Cc: Masami Hiramatsu 
Cc: Alexander Shishkin 
Signed-off-by: Taeung Song 
---
 tools/perf/builtin-config.c | 29 +++--
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index 4dab41e..b6ae8ea 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -33,28 +33,13 @@ static struct option config_options[] = {
OPT_END()
 };
 
-static int show_config(struct perf_config_set *set)
+static int show_config(const char *key, const char *value,
+  void *cb __maybe_unused)
 {
-   struct perf_config_section *section;
-   struct perf_config_item *item;
-   struct list_head *sections;
-
-   if (set == NULL)
-   return -1;
-
-   sections = >sections;
-   if (list_empty(sections))
-   return -1;
-
-   list_for_each_entry(section, sections, node) {
-   list_for_each_entry(item, >items, node) {
-   char *value = item->value;
-
-   if (value)
-   printf("%s.%s=%s\n", section->name,
-  item->name, value);
-   }
-   }
+   if (value)
+   printf("%s=%s\n", key, value);
+   else
+   printf("%s\n", key);
 
return 0;
 }
@@ -96,7 +81,7 @@ int cmd_config(int argc, const char **argv, const char 
*prefix __maybe_unused)
pr_err("Error: takes no arguments\n");
parse_options_usage(config_usage, config_options, "l", 
1);
} else {
-   ret = show_config(config_set);
+   ret = perf_config(show_config, NULL);
if (ret < 0) {
const char * config_filename = 
config_exclusive_filename;
if (!config_exclusive_filename)
-- 
2.5.0