diff options
| author | Arnaldo Carvalho de Melo | 2015-10-22 23:10:52 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2015-10-22 23:10:52 +0200 |
| commit | f06cff7c59b6b252d667435d7baad48687b41002 (patch) | |
| tree | eee276fd27aeae2e92e2aff91cb4a3af87a792fa /tools | |
| parent | perf ui tui: Register the error callbacks before initializing the widgets (diff) | |
| download | kernel-qcow2-linux-f06cff7c59b6b252d667435d7baad48687b41002.tar.gz kernel-qcow2-linux-f06cff7c59b6b252d667435d7baad48687b41002.tar.xz kernel-qcow2-linux-f06cff7c59b6b252d667435d7baad48687b41002.zip | |
perf annotate: Don't die() when finding an invalid config option
The perf_config() infrastructure we inherited from git calls die() when
the provided config callback returns -1, meaning some key in a config
section is unexpected, that seems ok for a stdio based tool, but in
--tui we end up messing up the output, so just tell the user about the
error, wait for a keystroke and return 0, being more resilient and
proceeding with what we managed to parse.
That die() needs to die, tho :-)
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-pqtsffh2kwr5mwm4qg9kgotu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/ui/browsers/annotate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index ba72e018e99a..d4d7cc27252f 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -1152,9 +1152,9 @@ static int annotate__config(const char *var, const char *value, sizeof(struct annotate_config), annotate_config__cmp); if (cfg == NULL) - return -1; - - *cfg->value = perf_config_bool(name, value); + ui__warning("%s variable unknown, ignoring...", var); + else + *cfg->value = perf_config_bool(name, value); return 0; } |