From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754507AbcEXGu5 (ORCPT ); Tue, 24 May 2016 02:50:57 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:33059 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754482AbcEXGuy (ORCPT ); Tue, 24 May 2016 02:50:54 -0400 From: Taeung Song To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, Jiri Olsa , Namhyung Kim , Ingo Molnar , Peter Zijlstra , Alexander Shishkin , Masami Hiramatsu , Taeung Song , Jiri Olsa , Masami Hiramatsu Subject: [PATCH v3 6/7] perf config: Add 'annotate' section default configs arrrays Date: Tue, 24 May 2016 15:50:25 +0900 Message-Id: <1464072626-21161-7-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464072626-21161-1-git-send-email-treeze.taeung@gmail.com> References: <1464072626-21161-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 Actual variable for 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 'annoate' default config array that have all default config key-value pairs for 'annotate' section In near future, this arrays will be used on ui/browsers/annoate.c because of setting default actual variable for 'annotate' config. Cc: Namhyung Kim Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Alexander Shishkin 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 e38d187..9a06cb0 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -31,6 +31,7 @@ const char *config_exclusive_filename; const struct perf_config_section default_sections[] = { { .name = "colors" }, + { .name = "annotate" }, }; const struct default_config_item colors_config_items[] = { @@ -44,6 +45,16 @@ 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() +}; + static int get_next_char(void) { int c; diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index f2220a8..696e5bc 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -46,6 +46,7 @@ struct perf_config_set { enum config_section_idx { CONFIG_COLORS, + CONFIG_ANNOTATE, }; enum colors_config_items_idx { @@ -58,6 +59,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, +}; + #define CONF_VAR(_name, _field, _val, _type) \ { .name = _name, .value._field = _val, .type = _type } @@ -79,6 +89,7 @@ enum colors_config_items_idx { { .name = NULL } extern const struct default_config_item colors_config_items[]; +extern const struct default_config_item annotate_config_items[]; struct perf_config_set *perf_config_set__new(void); void perf_config_set__delete(struct perf_config_set *set); -- 2.5.0