From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752570AbbJFHSc (ORCPT ); Tue, 6 Oct 2015 03:18:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55985 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751811AbbJFHSa (ORCPT ); Tue, 6 Oct 2015 03:18:30 -0400 Date: Tue, 6 Oct 2015 00:18:10 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, a.p.zijlstra@chello.nl, bristot@redhat.com, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com Reply-To: dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, jolsa@kernel.org, bristot@redhat.com, acme@redhat.com In-Reply-To: <1444073477-3181-1-git-send-email-jolsa@kernel.org> References: <1444073477-3181-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fail properly in case pattern matching fails to find tracepoint Git-Commit-ID: 27bf90bf0690f55c3679bcc4c325823cf1cfd19d 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: 27bf90bf0690f55c3679bcc4c325823cf1cfd19d Gitweb: http://git.kernel.org/tip/27bf90bf0690f55c3679bcc4c325823cf1cfd19d Author: Jiri Olsa AuthorDate: Mon, 5 Oct 2015 21:31:17 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 5 Oct 2015 17:59:50 -0300 perf tools: Fail properly in case pattern matching fails to find tracepoint Currently we dont fail properly when pattern matching fails to find any tracepoint. Current behaviour: $ perf record -e 'sched:krava*' sleep 1 WARNING: event parser found nothinginvalid or unsupported event: 'sched:krava*' Run 'perf list' for a list of valid events usage: perf record [] [] or: perf record [] -- [] This patch change: $ perf record -e 'sched:krava*' sleep 1 event syntax error: 'sched:krava*' \___ unknown tracepoint Error: File /sys/kernel/debug/tracing/events/sched/krava* not found. Hint: Perhaps this kernel misses some CONFIG_ setting to enable this feature?. Run 'perf list' for a list of valid events usage: perf record [] [] or: perf record [] -- [] Reported-by: Daniel Bristot de Oliveira Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1444073477-3181-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 3ed8bf1..991bbd4 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -449,7 +449,7 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx, char evt_path[MAXPATHLEN]; struct dirent *evt_ent; DIR *evt_dir; - int ret = 0; + int ret = 0, found = 0; snprintf(evt_path, MAXPATHLEN, "%s/%s", tracing_events_path, sys_name); evt_dir = opendir(evt_path); @@ -468,10 +468,17 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx, if (!strglobmatch(evt_ent->d_name, evt_name)) continue; + found++; + ret = add_tracepoint(list, idx, sys_name, evt_ent->d_name, err, head_config); } + if (!found) { + tracepoint_error(err, ENOENT, sys_name, evt_name); + ret = -1; + } + closedir(evt_dir); return ret; }