Re: [PATCH v5 7/7] perf config: Initialize annotate_browser__opts with default config items

[Taeung Song <treeze.taeung@gmail.com>]

On 07/12/2016 02:47 PM, Namhyung Kim wrote:
> 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);
>
>

Understood!
I'll change the macro to general macro as you said. :-D

Thanks,
Taeung

>
>
>>   extern const struct default_config_item colors_config_items[];
>>   extern const struct default_config_item annotate_config_items[];
>>
>> --
>> 2.5.0
>>