From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755485AbbGFQcT (ORCPT ); Mon, 6 Jul 2015 12:32:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50270 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbbGFQcR (ORCPT ); Mon, 6 Jul 2015 12:32:17 -0400 Date: Mon, 6 Jul 2015 09:31:59 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@redhat.com, acme@redhat.com, dsahern@gmail.com, adrian.hunter@intel.com, dzickus@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, eranian@google.com, mingo@kernel.org, fweisbec@gmail.com, tglx@linutronix.de, bp@suse.de, namhyung@kernel.org Reply-To: linux-kernel@vger.kernel.org, dzickus@redhat.com, dsahern@gmail.com, adrian.hunter@intel.com, jolsa@redhat.com, acme@redhat.com, tglx@linutronix.de, mingo@kernel.org, fweisbec@gmail.com, eranian@google.com, hpa@zytor.com, namhyung@kernel.org, bp@suse.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Introduce set_filter method Git-Commit-ID: 12467ae4e37aab5e263cc9ab6b6909ae0588844c 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: 12467ae4e37aab5e263cc9ab6b6909ae0588844c Gitweb: http://git.kernel.org/tip/12467ae4e37aab5e263cc9ab6b6909ae0588844c Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 3 Jul 2015 17:05:50 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 6 Jul 2015 10:46:36 -0300 perf evsel: Introduce set_filter method Replaces existing filter string with the one provided. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-jst49z83li0yx3g18o54u51a@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 13 +++++++++++++ tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 3 +-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 6676774..ae925b9 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -823,6 +823,19 @@ int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads, (void *)filter); } +int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter) +{ + char *new_filter = strdup(filter); + + if (new_filter != NULL) { + free(evsel->filter); + evsel->filter = new_filter; + return 0; + } + + return -1; +} + int perf_evsel__enable(struct perf_evsel *evsel, int ncpus, int nthreads) { return perf_evsel__run_ioctl(evsel, ncpus, nthreads, diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index a3ebb83..8aea4ba 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -182,6 +182,7 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel, void perf_evsel__set_sample_id(struct perf_evsel *evsel, bool use_sample_identifier); +int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter); int perf_evsel__apply_filter(struct perf_evsel *evsel, int ncpus, int nthreads, const char *filter); int perf_evsel__enable(struct perf_evsel *evsel, int ncpus, int nthreads); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 09f8d23..a71eeb2 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1177,8 +1177,7 @@ int parse_filter(const struct option *opt, const char *str, return -1; } - last->filter = strdup(str); - if (last->filter == NULL) { + if (perf_evsel__set_filter(last, str) < 0) { fprintf(stderr, "not enough memory to hold filter string\n"); return -1; }