From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Taeung Song <treeze.taeung@gmail.com>,
Jiri Olsa <jolsa@redhat.com>,
Masami Hiramatsu <mhiramat@kernel.org>
Subject: [PATCH v3 2/7] perf config: Add 'colors' section default configs arrrays
Date: Tue, 24 May 2016 15:50:21 +0900 [thread overview]
Message-ID: <1464072626-21161-3-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1464072626-21161-1-git-send-email-treeze.taeung@gmail.com>
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 <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/util/cache.h | 1 +
tools/perf/util/config.c | 17 ++++++++++++++++-
tools/perf/util/config.h | 18 +++++++++++++++++-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 0d814bb..54bbd55 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -7,6 +7,7 @@
#include <subcmd/pager.h>
#include "../perf.h"
#include "../ui/ui.h"
+#include "config.h"
#include <linux/string.h>
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index dad7d82..e38d187 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -29,6 +29,21 @@ static int config_file_eof;
const char *config_exclusive_filename;
+const struct perf_config_section default_sections[] = {
+ { .name = "colors" },
+};
+
+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()
+};
+
static int get_next_char(void)
{
int c;
@@ -677,7 +692,7 @@ static void perf_config_section__purge(struct perf_config_section *section)
static void perf_config_section__delete(struct perf_config_section *section)
{
perf_config_section__purge(section);
- zfree(§ion->name);
+ zfree((char **)§ion->name);
free(section);
}
diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
index 5a11ca6..f2220a8 100644
--- a/tools/perf/util/config.h
+++ b/tools/perf/util/config.h
@@ -35,7 +35,7 @@ struct perf_config_item {
};
struct perf_config_section {
- char *name;
+ const char *name;
struct list_head items;
struct list_head node;
};
@@ -44,6 +44,20 @@ struct perf_config_set {
struct list_head sections;
};
+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,
+};
+
#define CONF_VAR(_name, _field, _val, _type) \
{ .name = _name, .value._field = _val, .type = _type }
@@ -64,6 +78,8 @@ struct perf_config_set {
#define CONF_END() \
{ .name = NULL }
+extern const struct default_config_item colors_config_items[];
+
struct perf_config_set *perf_config_set__new(void);
void perf_config_set__delete(struct perf_config_set *set);
--
2.5.0
next prev parent reply other threads:[~2016-05-24 6:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 6:50 [PATCH v3 0/7] perf config: Introduce default config key-value pairs arrays Taeung Song
2016-05-24 6:50 ` [PATCH v3 1/7] perf config: Introduce default_config_item for default config key-value pairs Taeung Song
2016-05-24 6:50 ` Taeung Song [this message]
2016-05-24 6:50 ` [PATCH v3 3/7] perf config: Use combined {fore,back}ground colors value instead of each two color Taeung Song
2016-05-24 6:50 ` [PATCH v3 4/7] perf config: Initialize ui_browser__colorsets with default config items Taeung Song
2016-05-24 6:50 ` [PATCH v3 5/7] perf config: Introduce perf_default_config_init() Taeung Song
2016-05-24 6:50 ` [PATCH v3 6/7] perf config: Add 'annotate' section default configs arrrays Taeung Song
2016-05-24 6:50 ` [PATCH v3 7/7] perf config: Initialize annotate_browser__opts with default config items Taeung Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464072626-21161-3-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®