From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934908AbbIVVaK (ORCPT ); Tue, 22 Sep 2015 17:30:10 -0400 Received: from mga11.intel.com ([192.55.52.93]:25758 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934130AbbIVVaG (ORCPT ); Tue, 22 Sep 2015 17:30:06 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,574,1437462000"; d="scan'208";a="810764262" From: kan.liang@intel.com To: acme@kernel.org Cc: jolsa@kernel.org, a.p.zijlstra@chello.nl, mingo@redhat.com, namhyung@kernel.org, ak@linux.intel.com, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH RFC 01/10] perf,tools: Add 'C' event/group modifier Date: Tue, 22 Sep 2015 10:13:34 -0400 Message-Id: <1442931223-51708-2-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1442931223-51708-1-git-send-email-kan.liang@intel.com> References: <1442931223-51708-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang Add a new event/group modifier 'C' to mark the event which will be read counter statistics during sampling. Signed-off-by: Kan Liang --- tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 8 +++++++- tools/perf/util/parse-events.l | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 7906666..d017795 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -115,6 +115,7 @@ struct perf_evsel { int exclude_GH; int nr_members; int sample_read; + int counter_read; unsigned long *per_pkg_mask; struct perf_evsel *leader; char *group_name; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 61c2bc2..95b43a4 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -860,6 +860,7 @@ struct event_modifier { int precise; int exclude_GH; int sample_read; + int counter_read; int pinned; }; @@ -874,6 +875,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str, int eI = evsel ? evsel->attr.exclude_idle : 0; int precise = evsel ? evsel->attr.precise_ip : 0; int sample_read = 0; + int counter_read = 0; int pinned = evsel ? evsel->attr.pinned : 0; int exclude = eu | ek | eh; @@ -911,6 +913,8 @@ static int get_event_modifier(struct event_modifier *mod, char *str, eG = 1; } else if (*str == 'S') { sample_read = 1; + } else if (*str == 'C') { + counter_read = 1; } else if (*str == 'D') { pinned = 1; } else @@ -941,6 +945,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str, mod->precise = precise; mod->exclude_GH = exclude_GH; mod->sample_read = sample_read; + mod->counter_read = counter_read; mod->pinned = pinned; return 0; @@ -955,7 +960,7 @@ static int check_modifier(char *str) char *p = str; /* The sizeof includes 0 byte as well. */ - if (strlen(str) > (sizeof("ukhGHpppSDI") - 1)) + if (strlen(str) > (sizeof("ukhGHpppSCDI") - 1)) return -1; while (*p) { @@ -994,6 +999,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->attr.exclude_idle = mod.eI; evsel->exclude_GH = mod.exclude_GH; evsel->sample_read = mod.sample_read; + evsel->counter_read = mod.counter_read; if (perf_evsel__is_group_leader(evsel)) evsel->attr.pinned = mod.pinned; diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 936d566..e6c5790 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -122,7 +122,7 @@ num_raw_hex [a-fA-F0-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_event [ukhpGHSCDI]+ modifier_bp [rwx]{1,3} %% -- 1.8.3.1