Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643AbcK1IwE (ORCPT ); Mon, 28 Nov 2016 03:52:04 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33763 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754617AbcK1Ivr (ORCPT ); Mon, 28 Nov 2016 03:51:47 -0500 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Wang Nan , Taeung Song Subject: [PATCH v9 7/7] perf config: Initialize annotate_browser__opts with default config items Date: Mon, 28 Nov 2016 17:51:18 +0900 Message-Id: <1480323078-15623-8-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480323078-15623-1-git-send-email-treeze.taeung@gmail.com> References: <1480323078-15623-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2395 Lines: 65 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 Cc: Jiri Olsa Cc: Wang Nan Signed-off-by: Taeung Song --- 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 ec7a30f..183f9c7 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; @@ -1162,7 +1159,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 8adf164..930880e 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -140,6 +140,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