From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080AbbFYH5a (ORCPT ); Thu, 25 Jun 2015 03:57:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36383 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752007AbbFYH5T (ORCPT ); Thu, 25 Jun 2015 03:57:19 -0400 Date: Thu, 25 Jun 2015 00:57:01 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: maddy@linux.vnet.ibm.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, namhyung@kernel.org, mpe@ellerman.id.au, jolsa@redhat.com, hpa@zytor.com, ak@linux.intel.com, sukadev@linux.vnet.ibm.com Reply-To: tglx@linutronix.de, maddy@linux.vnet.ibm.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@redhat.com, mpe@ellerman.id.au, namhyung@kernel.org, ak@linux.intel.com, sukadev@linux.vnet.ibm.com, hpa@zytor.com In-Reply-To: <1433921123-25327-8-git-send-email-sukadev@linux.vnet.ibm.com> References: <1433921123-25327-8-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Allow events with dot Git-Commit-ID: 5b021ddf81b0bcd17d88186b605f53a2ca452d3a 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: 5b021ddf81b0bcd17d88186b605f53a2ca452d3a Gitweb: http://git.kernel.org/tip/5b021ddf81b0bcd17d88186b605f53a2ca452d3a Author: Andi Kleen AuthorDate: Wed, 10 Jun 2015 00:25:11 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Jun 2015 18:21:37 -0300 perf tools: Allow events with dot The Intel events use a dot to separate event name and unit mask. Allow dot in names in the scanner, and remove special handling of dot as EOF. Also remove the hack in jevents to replace dot with underscore. This way dotted events can be specified directly by the user. I'm not fully sure this change to the scanner is correct (what was the dot special case good for?), but I haven't found anything that breaks with it so far at least. Signed-off-by: Andi Kleen Acked-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/1433921123-25327-8-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Sukadev Bhattiprolu Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.l | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 09e738f..13cef3c 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -119,8 +119,8 @@ event [^,{}/]+ num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ -name [a-zA-Z_*?][a-zA-Z0-9_*?]* -name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?]* +name [a-zA-Z_*?][a-zA-Z0-9_*?.]* +name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.]* /* If you add a modifier you need to update check_modifier() */ modifier_event [ukhpGHSDI]+ modifier_bp [rwx]{1,3} @@ -165,7 +165,6 @@ modifier_bp [rwx]{1,3} return PE_EVENT_NAME; } -. | <> { BEGIN(INITIAL); REWIND(0);