From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751412AbbJWIdO (ORCPT ); Fri, 23 Oct 2015 04:33:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55708 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbbJWIdM (ORCPT ); Fri, 23 Oct 2015 04:33:12 -0400 Date: Fri, 23 Oct 2015 01:32:53 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: bp@suse.de, wangnan0@huawei.com, eranian@google.com, namhyung@kernel.org, jolsa@redhat.com, hpa@zytor.com, fweisbec@gmail.com, mingo@kernel.org, tglx@linutronix.de, dsahern@gmail.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: tglx@linutronix.de, mingo@kernel.org, fweisbec@gmail.com, adrian.hunter@intel.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, wangnan0@huawei.com, bp@suse.de, eranian@google.com, namhyung@kernel.org, hpa@zytor.com, jolsa@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Don't die() when finding an invalid config option Git-Commit-ID: f06cff7c59b6b252d667435d7baad48687b41002 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f06cff7c59b6b252d667435d7baad48687b41002 Gitweb: http://git.kernel.org/tip/f06cff7c59b6b252d667435d7baad48687b41002 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 22 Oct 2015 18:10:52 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 22 Oct 2015 18:10:52 -0300 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 Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-pqtsffh2kwr5mwm4qg9kgotu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/annotate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index ba72e01..d4d7cc2 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; }