From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752154AbbJCHu6 (ORCPT ); Sat, 3 Oct 2015 03:50:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59170 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751718AbbJCHu4 (ORCPT ); Sat, 3 Oct 2015 03:50:56 -0400 Date: Sat, 3 Oct 2015 00:50:39 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: eranian@google.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, fweisbec@gmail.com, dsahern@gmail.com, bp@suse.de, namhyung@kernel.org, acme@redhat.com, jolsa@redhat.com, adrian.hunter@intel.com, tglx@linutronix.de Reply-To: tglx@linutronix.de, adrian.hunter@intel.com, jolsa@redhat.com, acme@redhat.com, namhyung@kernel.org, bp@suse.de, dsahern@gmail.com, fweisbec@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, eranian@google.com, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf list: Honour 'event_glob' whem printing selectable PMUs Git-Commit-ID: fa52ceabc2a3e70431a82bca2bc547a15eaf19df 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: fa52ceabc2a3e70431a82bca2bc547a15eaf19df Gitweb: http://git.kernel.org/tip/fa52ceabc2a3e70431a82bca2bc547a15eaf19df Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 2 Oct 2015 15:28:16 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 2 Oct 2015 15:28:16 -0300 perf list: Honour 'event_glob' whem printing selectable PMUs Some PMUs, like the 'intel_bts' one can be used as an event name, i.e.: $ perf record -e intel_bts:// usleep 1 Is a valid event name. But the code printing such PMUs was not honouring the 'event_glob' parameter, so the following line was always appearing: $ intel_bts// [Kernel PMU event] Fix it: $ [acme@felicio linux]$ perf list data List of pre-defined events (to be used in -e): uncore_imc/data_reads/ [Kernel PMU event] uncore_imc/data_writes/ [Kernel PMU event] $ Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-ajb71858n7q7ao77b8pyy74w@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/pmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 41a356b..e4b173d 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1008,7 +1008,8 @@ void print_pmu_events(const char *event_glob, bool name_only) goto out_enomem; j++; } - if (pmu->selectable) { + if (pmu->selectable && + (event_glob == NULL || strglobmatch(pmu->name, event_glob))) { char *s; if (asprintf(&s, "%s//", pmu->name) < 0) goto out_enomem;