Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbcDVKWl (ORCPT ); Fri, 22 Apr 2016 06:22:41 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:35131 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752178AbcDVKVw (ORCPT ); Fri, 22 Apr 2016 06:21:52 -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 Subject: [PATCH v10 1/2] perf config: Prepare all default configs Date: Fri, 22 Apr 2016 19:21:41 +0900 Message-Id: <1461320502-18604-2-git-send-email-treeze.taeung@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461320502-18604-1-git-send-email-treeze.taeung@gmail.com> References: <1461320502-18604-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: 6842 Lines: 265 To precisely manage configs, prepare all default perf's configs that contain default section name, variable name, value and correct type, not string type. In the near future, this will be used when checking type of config variable or showing all configs with default values, etc. Cc: Namhyung Kim Cc: Masami Hiramatsu Cc: Jiri Olsa Signed-off-by: Taeung Song --- tools/perf/util/config.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++- tools/perf/util/config.h | 44 +++++++++++++- 2 files changed, 192 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index dad7d82..e09ecbb 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -29,6 +29,154 @@ static int config_file_eof; const char *config_exclusive_filename; +struct perf_config_section default_sections[] = { + { .name = "colors" }, + { .name = "tui" }, + { .name = "buildid" }, + { .name = "annotate" }, + { .name = "gtk" }, + { .name = "pager" }, + { .name = "help" }, + { .name = "hist" }, + { .name = "ui" }, + { .name = "call-graph" }, + { .name = "report" }, + { .name = "top" }, + { .name = "man" }, + { .name = "kmem" }, + { .name = "intel-pt" }, + { .name = "convert" }, +}; + +struct perf_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() +}; + +struct perf_config_item tui_config_items[] = { + CONF_BOOL_VAR("report", true), + CONF_BOOL_VAR("annotate", true), + CONF_BOOL_VAR("top", true), + CONF_END() +}; + +struct perf_config_item buildid_config_items[] = { + CONF_STR_VAR("dir", "~/.debug"), + CONF_END() +}; + +struct perf_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() +}; + +struct perf_config_item gtk_config_items[] = { + CONF_BOOL_VAR("annotate", false), + CONF_BOOL_VAR("report", false), + CONF_BOOL_VAR("top", false), + CONF_END() +}; + +struct perf_config_item pager_config_items[] = { + CONF_BOOL_VAR("cmd", true), + CONF_BOOL_VAR("report", true), + CONF_BOOL_VAR("annotate", true), + CONF_BOOL_VAR("top", true), + CONF_BOOL_VAR("diff", true), + CONF_END() +}; + +struct perf_config_item help_config_items[] = { + CONF_STR_VAR("format", "man"), + CONF_INT_VAR("autocorrect", 0), + CONF_END() +}; + +struct perf_config_item hist_config_items[] = { + CONF_STR_VAR("percentage", "absolute"), + CONF_END() +}; + +struct perf_config_item ui_config_items[] = { + CONF_BOOL_VAR("show-headers", true), + CONF_END() +}; + +struct perf_config_item call_graph_config_items[] = { + CONF_STR_VAR("record-mode", "fp"), + CONF_LONG_VAR("dump-size", 8192), + CONF_STR_VAR("print-type", "graph"), + CONF_STR_VAR("order", "callee"), + CONF_STR_VAR("sort-key", "function"), + CONF_DOUBLE_VAR("threshold", 0.5), + CONF_LONG_VAR("print-limit", 0), + CONF_END() +}; + +struct perf_config_item report_config_items[] = { + CONF_BOOL_VAR("group", true), + CONF_BOOL_VAR("children", true), + CONF_FLOAT_VAR("percent-limit", 0), + CONF_U64_VAR("queue-size", 0), + CONF_END() +}; + +struct perf_config_item top_config_items[] = { + CONF_BOOL_VAR("children", true), + CONF_END() +}; + +struct perf_config_item man_config_items[] = { + CONF_STR_VAR("viewer", "man"), + CONF_END() +}; + +struct perf_config_item kmem_config_items[] = { + CONF_STR_VAR("default", "slab"), + CONF_END() +}; + +struct perf_config_item intel_pt_config_items[] = { + CONF_INT_VAR("cache-divisor", 64), + CONF_BOOL_VAR("mispred-all", false), + CONF_END() +}; + +struct perf_config_item convert_config_items[] = { + CONF_U64_VAR("queue-size", 0), + CONF_END() +}; + +struct perf_config_item *default_config_items[] = { + colors_config_items, + tui_config_items, + buildid_config_items, + annotate_config_items, + gtk_config_items, + pager_config_items, + help_config_items, + hist_config_items, + ui_config_items, + call_graph_config_items, + report_config_items, + top_config_items, + man_config_items, + kmem_config_items, + intel_pt_config_items, + convert_config_items, +}; + static int get_next_char(void) { int c; @@ -659,7 +807,7 @@ struct perf_config_set *perf_config_set__new(void) static void perf_config_item__delete(struct perf_config_item *item) { - zfree(&item->name); + zfree((char **)&item->name); zfree(&item->value); free(item); } @@ -677,7 +825,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 22ec626..297b33e 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -4,14 +4,34 @@ #include #include +enum perf_config_type { + CONFIG_TYPE_BOOL, + CONFIG_TYPE_INT, + CONFIG_TYPE_LONG, + CONFIG_TYPE_U64, + CONFIG_TYPE_FLOAT, + CONFIG_TYPE_DOUBLE, + CONFIG_TYPE_STRING +}; + struct perf_config_item { - char *name; + const char *name; char *value; + union { + bool b; + int i; + u32 l; + u64 ll; + float f; + double d; + const char *s; + } default_value; + enum perf_config_type type; struct list_head node; }; struct perf_config_section { - char *name; + const char *name; struct list_head items; struct list_head node; }; @@ -20,6 +40,26 @@ struct perf_config_set { struct list_head sections; }; +#define CONF_VAR(_name, _field, _val, _type) \ + { .name = _name, .default_value._field = _val, .type = _type } + +#define CONF_BOOL_VAR(_name, _val) \ + CONF_VAR(_name, b, _val, CONFIG_TYPE_BOOL) +#define CONF_INT_VAR(_name, _val) \ + CONF_VAR(_name, i, _val, CONFIG_TYPE_INT) +#define CONF_LONG_VAR(_name, _val) \ + CONF_VAR(_name, l, _val, CONFIG_TYPE_LONG) +#define CONF_U64_VAR(_name, _val) \ + CONF_VAR(_name, ll, _val, CONFIG_TYPE_U64) +#define CONF_FLOAT_VAR(_name, _val) \ + CONF_VAR(_name, f, _val, CONFIG_TYPE_FLOAT) +#define CONF_DOUBLE_VAR(_name, _val) \ + CONF_VAR(_name, d, _val, CONFIG_TYPE_DOUBLE) +#define CONF_STR_VAR(_name, _val) \ + CONF_VAR(_name, s, _val, CONFIG_TYPE_STRING) +#define CONF_END() \ + { .name = NULL } + struct perf_config_set *perf_config_set__new(void); void perf_config_set__delete(struct perf_config_set *set); -- 2.5.0