From: Namhyung Kim <namhyung@kernel.org>
To: Taeung Song <treeze.taeung@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@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>
Subject: Re: [PATCH v5 7/7] perf config: Initialize annotate_browser__opts with default config items
Date: Tue, 12 Jul 2016 14:47:02 +0900 [thread overview]
Message-ID: <20160712054702.GC20077@danjae.aot.lge.com> (raw)
In-Reply-To: <1467782423-29035-8-git-send-email-treeze.taeung@gmail.com>
On Wed, Jul 06, 2016 at 02:20:23PM +0900, Taeung Song wrote:
> 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
> 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>
> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
> ---
> tools/perf/ui/browsers/annotate.c | 16 ++++++++++++----
> tools/perf/util/config.h | 6 ++++++
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
> index 29dc6d2..0fb78b5 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;
> @@ -1157,7 +1154,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_ANNOTATE_DEFAULT_VAL(HIDE_SRC_CODE, b);
> + annotate_browser__opts.use_offset = CONF_ANNOTATE_DEFAULT_VAL(USE_OFFSET, b);
> + annotate_browser__opts.jump_arrows = CONF_ANNOTATE_DEFAULT_VAL(JUMP_ARROWS, b);
> + annotate_browser__opts.show_linenr = CONF_ANNOTATE_DEFAULT_VAL(SHOW_LINENR, b);
> + annotate_browser__opts.show_nr_jumps = CONF_ANNOTATE_DEFAULT_VAL(SHOW_NR_JUMPS, b);
> + annotate_browser__opts.show_total_period = CONF_ANNOTATE_DEFAULT_VAL(SHOW_TOTAL_PERIOD, b);
> +}
> +
> 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 470c93a..c30e6bb 100644
> --- a/tools/perf/util/config.h
> +++ b/tools/perf/util/config.h
> @@ -136,6 +136,12 @@ struct default_config_section {
> #define CONF_END() \
> { .name = NULL }
>
> +#define CONF_DEFAULT_VAL(section, name, field) \
> + section##_config_items[CONFIG_##name].value.field
> +
> +#define CONF_ANNOTATE_DEFAULT_VAL(name, field) \
> + CONF_DEFAULT_VAL(annotate, ANNOTATE_##name, field)
> +
Instead of making accessor macro for each config section, can we make
it more general like below?
#define CONF_DEFAULT_BOOL(sec, name) \
default_sections[sec##_IDX].items[sec##_##name].b
opts->hide_src_code = CONF_DEFAULT_BOOL(ANNOTATE, HIDE_SRC_CODE);
Thanks,
Namhyung
> extern const struct default_config_item colors_config_items[];
> extern const struct default_config_item annotate_config_items[];
>
> --
> 2.5.0
>
next prev parent reply other threads:[~2016-07-12 5:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-06 5:20 [RFC PATCH v5 0/7] perf config: Introduce default config key-value pairs arrays Taeung Song
2016-07-06 5:20 ` [PATCH v5 1/7] perf config: Introduce default_config_section and default_config_item for default config key-value pairs Taeung Song
2016-07-06 5:20 ` [PATCH v5 2/7] perf config: Add macros assigning key-value pairs to default_config_item Taeung Song
2016-07-06 5:20 ` [PATCH v5 3/7] perf config: Add 'colors' section default configs arrrays Taeung Song
2016-07-06 5:20 ` [PATCH v5 4/7] perf config: Use combined {fore,back}ground colors value instead of each two color Taeung Song
2016-07-06 5:20 ` [PATCH v5 5/7] perf config: Initialize ui_browser__colorsets with default config items Taeung Song
2016-07-12 5:39 ` Namhyung Kim
2016-07-12 6:04 ` Taeung Song
2016-07-06 5:20 ` [PATCH v5 6/7] perf config: Add 'annotate' section default configs arrrays Taeung Song
2016-07-06 5:20 ` [PATCH v5 7/7] perf config: Initialize annotate_browser__opts with default config items Taeung Song
2016-07-12 5:47 ` Namhyung Kim [this message]
2016-07-12 6:09 ` Taeung Song
2016-07-12 4:20 ` [RFC PATCH v5 0/7] perf config: Introduce default config key-value pairs arrays Taeung Song
2016-07-12 5:37 ` Namhyung Kim
2016-07-12 6:03 ` Taeung Song
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=20160712054702.GC20077@danjae.aot.lge.com \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=treeze.taeung@gmail.com \
--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).