lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 11 May 2016 19:31:07 +0900 From: Taeung Song <treeze.taeung@...il.com> To: Arnaldo Carvalho de Melo <acme@...nel.org> Cc: linux-kernel@...r.kernel.org, Jiri Olsa <jolsa@...nel.org>, Namhyung Kim <namhyung@...nel.org>, Ingo Molnar <mingo@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Taeung Song <treeze.taeung@...il.com> Subject: [PATCH v2 4/4] perf config: Initialize annotate_browser__opts with default config items Set default config values for 'annotate' section with 'annotate_config_items[]' instead of actual bool type values. (e.g. using annotate_config_items[CONFIG_ANNOTATE_USE_OFFSET].value instead of 'true' bool type value for 'annotate.use_offset'.) Cc: Namhyung Kim <namhyung@...nel.org> Cc: Jiri Olsa <jolsa@...nel.org> Signed-off-by: Taeung Song <treeze.taeung@...il.com> --- tools/perf/ui/browsers/annotate.c | 12 ++++++++---- tools/perf/util/config.h | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 4fc208e..f52e1ea 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -37,10 +37,7 @@ static struct annotate_browser_opt { show_linenr, show_nr_jumps, show_total_period; -} annotate_browser__opts = { - .use_offset = true, - .jump_arrows = true, -}; +} annotate_browser__opts; struct annotate_browser { struct ui_browser b; @@ -1160,5 +1157,12 @@ static int annotate__config(const char *var, const char *value, void annotate_browser__init(void) { + annotate_browser__opts.hide_src_code = CONF_ANNOTATE_DEFAULT_VAL(HIDE_SRC_CODE, b); + annotate_browser__opts.use_offset = CONF_ANNOTATE_DEFAULT_VAL(USE_OFFSET, b); + annotate_browser__opts.jump_arrows = CONF_ANNOTATE_DEFAULT_VAL(JUMP_ARROWS, b); + annotate_browser__opts.show_linenr = CONF_ANNOTATE_DEFAULT_VAL(SHOW_LINENR, b); + annotate_browser__opts.show_nr_jumps = CONF_ANNOTATE_DEFAULT_VAL(SHOW_NR_JUMPS, b); + annotate_browser__opts.show_total_period = CONF_ANNOTATE_DEFAULT_VAL(SHOW_TOTAL_PERIOD, b); + perf_config(annotate__config, NULL); } diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h index e0c8392..344b344 100644 --- a/tools/perf/util/config.h +++ b/tools/perf/util/config.h @@ -54,6 +54,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 } @@ -74,7 +83,14 @@ enum colors_config_items_idx { #define CONF_END() \ { .name = NULL } +#define CONF_DEFAULT_VAL(section, name, field) \ + section##_config_items[CONFIG_##name].value.field + +#define CONF_ANNOTATE_DEFAULT_VAL(name, field) \ + CONF_DEFAULT_VAL(annotate, ANNOTATE_##name, field) + 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
Powered by blists - more mailing lists