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>,
Masami Hiramatsu <mhiramat@kernel.org>,
Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v8 4/4] perf config: Initialize perf_config_set with all default configs
Date: Thu, 14 Apr 2016 16:53:21 +0900 [thread overview]
Message-ID: <1460620401-23430-5-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1460620401-23430-1-git-send-email-treeze.taeung@gmail.com>
To avoid duplicated config variables and
use perf_config_set classifying between standard
perf config variables and unknown or new config
variables other than them, initialize perf_config_set
with all default configs.
And this will be needed when showing all configs with
default value or checking correct type of a config
variable in the near future.
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
tools/perf/builtin-config.c | 11 +++++++----
tools/perf/util/config.c | 39 ++++++++++++++++++++++++++++++++++-----
tools/perf/util/config.h | 7 +++++++
3 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/tools/perf/builtin-config.c b/tools/perf/builtin-config.c
index fe1b77f..0fe9bc5 100644
--- a/tools/perf/builtin-config.c
+++ b/tools/perf/builtin-config.c
@@ -35,6 +35,7 @@ static struct option config_options[] = {
static int show_config(struct perf_config_set *set)
{
+ bool has_value = false;
struct perf_config_section *section;
struct perf_config_item *item;
struct list_head *sections;
@@ -43,19 +44,21 @@ static int show_config(struct perf_config_set *set)
return -1;
sections = &set->sections;
- if (list_empty(sections))
- return -1;
-
list_for_each_entry(section, sections, node) {
list_for_each_entry(item, §ion->items, node) {
char *value = item->value;
- if (value)
+ if (value) {
printf("%s.%s=%s\n", section->name,
item->name, value);
+ has_value = true;
+ }
}
}
+ if (!has_value)
+ return -1;
+
return 0;
}
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 5604392..61af657 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -663,6 +663,7 @@ static struct perf_config_section *add_section(struct list_head *sections,
if (!section)
return NULL;
+ section->is_allocated = true;
INIT_LIST_HEAD(§ion->items);
section->name = strdup(section_name);
if (!section->name) {
@@ -683,6 +684,7 @@ static struct perf_config_item *add_config_item(struct perf_config_section *sect
if (!item)
return NULL;
+ item->is_allocated = true;
item->name = strdup(name);
if (!item->name) {
pr_debug("%s: strdup failed\n", __func__);
@@ -751,12 +753,35 @@ out_free:
return -1;
}
+static struct perf_config_set *perf_config_set__init(struct perf_config_set *set)
+{
+ int i, j;
+ struct perf_config_section *section;
+ struct perf_config_item *items;
+ struct list_head *sections = &set->sections;
+
+ INIT_LIST_HEAD(&set->sections);
+
+ for (i = 0; i != CONFIG_END; i++) {
+ section = &default_sections[i];
+ INIT_LIST_HEAD(§ion->items);
+
+ items = default_config_items[i];
+ for (j = 0; items[j].name != NULL; j++)
+ list_add_tail(&items[j].node, §ion->items);
+
+ list_add_tail(§ion->node, sections);
+ }
+
+ return set;
+}
+
struct perf_config_set *perf_config_set__new(void)
{
struct perf_config_set *set = zalloc(sizeof(*set));
if (set) {
- INIT_LIST_HEAD(&set->sections);
+ perf_config_set__init(set);
perf_config(collect_config, set);
}
@@ -765,9 +790,11 @@ struct perf_config_set *perf_config_set__new(void)
static void perf_config_item__delete(struct perf_config_item *item)
{
- zfree((char **)&item->name);
zfree(&item->value);
- free(item);
+ if (item->is_allocated) {
+ zfree((char **)&item->name);
+ free(item);
+ }
}
static void perf_config_section__purge(struct perf_config_section *section)
@@ -783,8 +810,10 @@ 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((char **)§ion->name);
- free(section);
+ if (section->is_allocated) {
+ zfree((char **)§ion->name);
+ free(section);
+ }
}
static void perf_config_set__purge(struct perf_config_set *set)
diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
index 84dcc1d..35c0075 100644
--- a/tools/perf/util/config.h
+++ b/tools/perf/util/config.h
@@ -14,6 +14,11 @@ enum perf_config_type {
CONFIG_TYPE_STRING
};
+/**
+ * struct perf_config_item - element of perf's configs
+ *
+ * @is_allocated: unknown or new config other than default config
+ */
struct perf_config_item {
const char *name;
char *value;
@@ -27,11 +32,13 @@ struct perf_config_item {
const char *s;
} default_value;
enum perf_config_type type;
+ bool is_allocated;
struct list_head node;
};
struct perf_config_section {
const char *name;
+ bool is_allocated;
struct list_head items;
struct list_head node;
};
--
2.5.0
prev parent reply other threads:[~2016-04-14 7:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 7:53 [RFC][PATCH v8 0/4] Infrastructure code for perf-config Taeung Song
2016-04-14 7:53 ` [PATCH v8 1/4] perf config: Introduce perf_config_set class Taeung Song
2016-04-14 13:37 ` [tip:perf/core] " tip-bot for Taeung Song
2016-04-14 7:53 ` [PATCH v8 2/4] perf config: Let show_config() work with perf_config_set Taeung Song
2016-04-14 13:37 ` [tip:perf/core] perf config: Make show_config() use perf_config_set tip-bot for Taeung Song
2016-04-14 7:53 ` [PATCH v8 3/4] perf config: Prepare all default configs Taeung Song
2016-04-14 12:19 ` Arnaldo Carvalho de Melo
2016-04-14 16:42 ` Taeung Song
2016-04-18 14:55 ` Taeung Song
2016-04-20 12:44 ` Namhyung Kim
2016-04-20 13:22 ` Arnaldo Carvalho de Melo
2016-04-20 15:29 ` Taeung Song
2016-04-20 15:11 ` Taeung Song
2016-04-14 7:53 ` Taeung Song [this message]
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=1460620401-23430-5-git-send-email-treeze.taeung@gmail.com \
--to=treeze.taeung@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).