From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Wang Nan <wangnan0@huawei.com>,
Taeung Song <treeze.taeung@gmail.com>,
Jiri Olsa <jolsa@redhat.com>
Subject: [PATCH v8 5/5] perf config: Reimplement show_config() using perf_config_set__iter()
Date: Wed, 8 Jun 2016 21:36:53 +0900 [thread overview]
Message-ID: <1465389413-8936-6-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1465389413-8936-1-git-send-email-treeze.taeung@gmail.com>
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 <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/builtin-config.c | 29 +++++++----------------------
tools/perf/util/config.c | 2 +-
tools/perf/util/config.h | 1 +
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index c07f744..9c654f9 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 = &set->sections;
- if (list_empty(sections))
- return -1;
-
- list_for_each_entry(section, sections, node) {
- list_for_each_entry(item, §ion->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(set);
+ ret = perf_config_set__iter(set, show_config, NULL);
if (ret < 0) {
const char * config_filename = config_exclusive_filename;
if (!config_exclusive_filename)
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 23fb8e4..4775d18 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -662,7 +662,7 @@ struct perf_config_set *perf_config_set__new(void)
return set;
}
-static int perf_config_set__iter(struct perf_config_set *set, config_fn_t fn, void *data)
+int perf_config_set__iter(struct perf_config_set *set, config_fn_t fn, void *data)
{
struct perf_config_section *section;
struct perf_config_item *item;
diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
index fafba86..3526bb7 100644
--- a/tools/perf/util/config.h
+++ b/tools/perf/util/config.h
@@ -35,5 +35,6 @@ const char *perf_etc_perfconfig(void);
struct perf_config_set *perf_config_set__new(void);
void perf_config_set__delete(struct perf_config_set **set);
+int perf_config_set__iter(struct perf_config_set *set, config_fn_t fn, void *data);
#endif /* __PERF_CONFIG_H */
--
2.5.0
prev parent reply other threads:[~2016-06-08 12:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 12:36 [RFC][PATCH v8 0/5] perf config: Reimplement perf_config() using perf_config_set__inter() Taeung Song
2016-06-08 12:36 ` [BUGFIX][PATCH v8 1/5] perf config: Handle the error about NULL at perf_config_set__delete() Taeung Song
2016-06-16 8:31 ` [tip:perf/core] perf config: Handle " tip-bot for Taeung Song
2016-06-08 12:36 ` [PATCH v8 2/5] perf config: Bring declarations about config from util/cache.h to util/config.h Taeung Song
2016-06-09 13:29 ` Arnaldo Carvalho de Melo
2016-06-10 6:20 ` Taeung Song
2016-06-10 19:06 ` Arnaldo Carvalho de Melo
2016-06-11 0:59 ` Taeung Song
2016-06-12 6:28 ` Taeung Song
2016-06-08 12:36 ` [PATCH v8 3/5] perf config: Reimplement perf_config() using perf_config_set__iter() Taeung Song
2016-06-09 13:34 ` Arnaldo Carvalho de Melo
2016-06-10 10:58 ` Taeung Song
2016-06-12 8:57 ` Taeung Song
2016-06-20 10:00 ` [PATCH v8 3/5] perf config: Reimplement perf_config() using perf_config_set__it to Taeung Song
2016-06-09 13:41 ` [PATCH v8 3/5] perf config: Reimplement perf_config() using perf_config_set__iter() Arnaldo Carvalho de Melo
2016-06-10 11:05 ` Taeung Song
2016-06-08 12:36 ` [PATCH v8 4/5] perf config: Use zfree() instead of free() at perf_config_set__delete() Taeung Song
2016-06-09 13:37 ` Arnaldo Carvalho de Melo
2016-06-10 11:03 ` Taeung Song
2016-06-08 12:36 ` Taeung Song [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465389413-8936-6-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).