From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751912AbcGFFUn (ORCPT ); Wed, 6 Jul 2016 01:20:43 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36163 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750752AbcGFFUj (ORCPT ); Wed, 6 Jul 2016 01:20:39 -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 , Wang Nan , Taeung Song , Jiri Olsa Subject: [PATCH v5 3/7] perf config: Add 'colors' section default configs arrrays Date: Wed, 6 Jul 2016 14:20:19 +0900 Message-Id: <1467782423-29035-4-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1467782423-29035-1-git-send-email-treeze.taeung@gmail.com> References: <1467782423-29035-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 'colors' section is like below. (at ui/browser.c) static struct ui_browser_colorset { const char *name, *fg, *bg; int colorset; } ui_browser__colorsets[] = { { .colorset = HE_COLORSET_TOP, .name = "top", .fg = "red", .bg = "default", }, ... But I suggest using 'colors' default config array that have all default config key-value pairs for 'colors' section In near future, this array will be used on ui/browser.c because of setting default actual variable for 'colors' config. Cc: Namhyung Kim Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Wang Nan Cc: Alexander Shishkin Signed-off-by: Taeung Song --- tools/perf/util/config.c | 15 +++++++++++++++ tools/perf/util/config.h | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 18dae74..a0c0170 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -30,6 +30,21 @@ static struct perf_config_set *config_set; const char *config_exclusive_filename; +const struct default_config_item colors_config_items[] = { + CONF_STR_VAR("top", "red, default"), + CONF_STR_VAR("medium", "green, default"), + CONF_STR_VAR("normal", "default, default"), + CONF_STR_VAR("selected", "black, yellow"), + CONF_STR_VAR("jump_arrows", "blue, default"), + CONF_STR_VAR("addr", "magenta, default"), + CONF_STR_VAR("root", "white, blue"), + CONF_END() +}; + +const struct default_config_section default_sections[] = { + { .name = "colors", .items = colors_config_items }, +}; + static int get_next_char(void) { int c; diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index 613900f..f2ce8b4 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -73,6 +73,20 @@ enum perf_config_type { CONFIG_TYPE_STRING }; +enum config_section_idx { + CONFIG_COLORS, +}; + +enum colors_config_items_idx { + CONFIG_COLORS_TOP, + CONFIG_COLORS_MEDIUM, + CONFIG_COLORS_NORMAL, + CONFIG_COLORS_SELECTED, + CONFIG_COLORS_JUMP_ARROWS, + CONFIG_COLORS_ADDR, + CONFIG_COLORS_ROOT, +}; + struct default_config_item { const char *name; union { @@ -112,4 +126,6 @@ struct default_config_section { #define CONF_END() \ { .name = NULL } +extern const struct default_config_item colors_config_items[]; + #endif /* __PERF_CONFIG_H */ -- 2.5.0