Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754662AbcK1IwN (ORCPT ); Mon, 28 Nov 2016 03:52:13 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33957 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754610AbcK1Ivo (ORCPT ); Mon, 28 Nov 2016 03:51:44 -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 , Jiri Olsa Subject: [PATCH v9 6/7] perf config: Add default section and item arrays for 'annotate' config Date: Mon, 28 Nov 2016 17:51:17 +0900 Message-Id: <1480323078-15623-7-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: 2704 Lines: 91 Actual values for default configs of 'annotate' section is like below. (at ui/browsers/annoate.c) static struct annotate_browser_opt { bool hide_src_code, use_offset, jump_arrows, show_linenr, show_nr_jumps, show_total_period; } annotate_browser__opts = { .use_offset = true, .jump_arrows = true, }; But I suggest using default config arrays for 'annotate' section that contain all default config key-value pairs for it. In near future, this arrays will be used on ui/browsers/annoate.c because of setting default values of actual variables for 'annotate' config. Cc: Namhyung Kim Cc: Jiri Olsa Cc: Wang Nan Signed-off-by: Taeung Song --- tools/perf/util/config.c | 11 +++++++++++ tools/perf/util/config.h | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index b56aa0e..5b16a226 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -41,8 +41,19 @@ const struct default_config_item colors_config_items[] = { CONF_END() }; +const struct default_config_item annotate_config_items[] = { + CONF_BOOL_VAR("hide_src_code", false), + CONF_BOOL_VAR("use_offset", true), + CONF_BOOL_VAR("jump_arrows", true), + CONF_BOOL_VAR("show_nr_jumps", false), + CONF_BOOL_VAR("show_linenr", false), + CONF_BOOL_VAR("show_total_period", false), + CONF_END() +}; + const struct default_config_section default_sections[] = { { .name = "colors", .items = colors_config_items }, + { .name = "annotate", .items = annotate_config_items }, }; static int get_next_char(void) diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index fba7304..8adf164 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -79,6 +79,7 @@ enum perf_config_type { enum config_section_idx { CONFIG_COLORS, + CONFIG_ANNOTATE, }; enum colors_config_items_idx { @@ -91,6 +92,15 @@ enum colors_config_items_idx { CONFIG_COLORS_ROOT, }; +enum annotate_config_items_idx { + CONFIG_ANNOTATE_HIDE_SRC_CODE, + CONFIG_ANNOTATE_USE_OFFSET, + CONFIG_ANNOTATE_JUMP_ARROWS, + CONFIG_ANNOTATE_SHOW_NR_JUMPS, + CONFIG_ANNOTATE_SHOW_LINENR, + CONFIG_ANNOTATE_SHOW_TOTAL_PERIOD, +}; + struct default_config_item { const char *name; union { @@ -132,5 +142,6 @@ struct default_config_section { 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[]; #endif /* __PERF_CONFIG_H */ -- 2.7.4