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>,
Masami Hiramatsu <mhiramat@kernel.org>,
Wang Nan <wangnan0@huawei.com>,
Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v8 7/7] perf config: Initialize annotate_browser__opts with default config items
Date: Mon, 5 Sep 2016 14:24:40 +0900 [thread overview]
Message-ID: <1473053080-23461-8-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1473053080-23461-1-git-send-email-treeze.taeung@gmail.com>
Set default config values for 'annotate' section with 'annotate_config_items[]'
instead of actual bool type values.
(e.g. using annotate_config_items[CONFIG_ANNOTATE_USE_OFFSET].value.b
instead of 'true' bool type value for 'annotate.use_offset'.)
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/ui/browsers/annotate.c | 16 ++++++++++++----
tools/perf/util/config.h | 3 +++
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 4c18271..b5c975c 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -38,10 +38,7 @@ static struct annotate_browser_opt {
show_linenr,
show_nr_jumps,
show_total_period;
-} annotate_browser__opts = {
- .use_offset = true,
- .jump_arrows = true,
-};
+} annotate_browser__opts;
struct annotate_browser {
struct ui_browser b;
@@ -1160,7 +1157,18 @@ static int annotate__config(const char *var, const char *value,
return 0;
}
+static void default_annotate_config_init(void)
+{
+ annotate_browser__opts.hide_src_code = CONF_DEFAULT_BOOL(ANNOTATE, HIDE_SRC_CODE);
+ annotate_browser__opts.use_offset = CONF_DEFAULT_BOOL(ANNOTATE, USE_OFFSET);
+ annotate_browser__opts.jump_arrows = CONF_DEFAULT_BOOL(ANNOTATE, JUMP_ARROWS);
+ annotate_browser__opts.show_linenr = CONF_DEFAULT_BOOL(ANNOTATE, SHOW_LINENR);
+ annotate_browser__opts.show_nr_jumps = CONF_DEFAULT_BOOL(ANNOTATE, SHOW_NR_JUMPS);
+ annotate_browser__opts.show_total_period = CONF_DEFAULT_BOOL(ANNOTATE, SHOW_TOTAL_PERIOD);
+}
+
void annotate_browser__init(void)
{
+ default_annotate_config_init();
perf_config(annotate__config, NULL);
}
diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
index 2fcfd51..76f5b21 100644
--- a/tools/perf/util/config.h
+++ b/tools/perf/util/config.h
@@ -136,6 +136,9 @@ struct default_config_section {
#define CONF_END() \
{ .name = NULL }
+#define CONF_DEFAULT_BOOL(sec, name) \
+ default_sections[CONFIG_##sec].items[CONFIG_##sec##_##name].value.b
+
extern const struct default_config_section default_sections[];
extern const struct default_config_item colors_config_items[];
extern const struct default_config_item annotate_config_items[];
--
2.7.4
prev parent reply other threads:[~2016-09-05 5:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-05 5:24 [PATCH v8 0/7] perf config: Introduce default config key-value pairs arrays Taeung Song
2016-09-05 5:24 ` [PATCH v8 1/7] perf config: Introduce default_config_section and default_config_item for default config key-value pairs Taeung Song
2016-09-05 5:24 ` [PATCH v8 2/7] perf config: Add macros assigning key-value pairs to default_config_item Taeung Song
2016-09-05 5:24 ` [PATCH v8 3/7] perf config: Add default section and item arrays for 'colors' config Taeung Song
2016-09-05 5:24 ` [PATCH v8 4/7] perf config: Use combined {fore,back}ground colors value instead of each two color Taeung Song
2016-09-05 5:24 ` [PATCH v8 5/7] perf config: Initialize ui_browser__colorsets with default config items Taeung Song
2016-09-05 5:24 ` [PATCH v8 6/7] perf config: Add default section and item arrays for 'annotate' config Taeung Song
2016-09-05 5:24 ` 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=1473053080-23461-8-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--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).