From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755559AbbGFQc7 (ORCPT ); Mon, 6 Jul 2015 12:32:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50299 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751687AbbGFQc6 (ORCPT ); Mon, 6 Jul 2015 12:32:58 -0400 Date: Mon, 6 Jul 2015 09:32:36 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, bp@suse.de, dzickus@redhat.com, jolsa@redhat.com, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, eranian@google.com, dsahern@gmail.com Reply-To: acme@redhat.com, jolsa@redhat.com, hpa@zytor.com, tglx@linutronix.de, dsahern@gmail.com, eranian@google.com, namhyung@kernel.org, bp@suse.de, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, fweisbec@gmail.com, mingo@kernel.org, dzickus@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Introduce append_filter() method Git-Commit-ID: 64ec84f5f96ea1d043c01e32e49e45286c6f4160 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: 64ec84f5f96ea1d043c01e32e49e45286c6f4160 Gitweb: http://git.kernel.org/tip/64ec84f5f96ea1d043c01e32e49e45286c6f4160 Author: Arnaldo Carvalho de Melo AuthorDate: Sat, 4 Jul 2015 12:19:13 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 6 Jul 2015 08:57:51 -0300 perf evsel: Introduce append_filter() method To allow building filters in evsel->filter, that will eventually be applied via perf_evsel__apply_filter(). 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-sjfoes3pycx7nlpmgedca13v@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 17 +++++++++++++++++ tools/perf/util/evsel.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index ae925b9..6cc97f3 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -836,6 +836,23 @@ int perf_evsel__set_filter(struct perf_evsel *evsel, const char *filter) return -1; } +int perf_evsel__append_filter(struct perf_evsel *evsel, + const char *op, const char *filter) +{ + char *new_filter; + + if (evsel->filter == NULL) + return perf_evsel__set_filter(evsel, filter); + + if (asprintf(&new_filter,"(%s) %s (%s)", evsel->filter, op, filter) > 0) { + 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 8aea4ba..fe9f327 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -183,6 +183,8 @@ 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__append_filter(struct perf_evsel *evsel, + const char *op, 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);