From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758294AbcIPMsT (ORCPT ); Fri, 16 Sep 2016 08:48:19 -0400 Received: from mga07.intel.com ([134.134.136.100]:54712 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756262AbcIPMsM (ORCPT ); Fri, 16 Sep 2016 08:48:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,344,1470726000"; d="scan'208";a="761950717" Subject: Re: [PATCH V6 1/3] perf tools: making perf_evsel__append_filter() generic To: Mathieu Poirier , acme@kernel.org References: <1473957428-28311-1-git-send-email-mathieu.poirier@linaro.org> <1473957428-28311-2-git-send-email-mathieu.poirier@linaro.org> Cc: mingo@redhat.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, jolsa@kernel.org, acme@infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <141c782a-7b5f-1086-87d3-cc80e4c010d3@intel.com> Date: Fri, 16 Sep 2016 15:43:30 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1473957428-28311-2-git-send-email-mathieu.poirier@linaro.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15/09/16 19:37, Mathieu Poirier wrote: > By making function perf_evsel__append_filter() take a format rather > than an operator it is possible to reuse the code for other purposes > (ex. intelPT and CoreSight) than tracepoints. intelPT -> Intel PT > > Signed-off-by: Mathieu Poirier Otherwise: Acked-by: Adrian Hunter > --- > tools/perf/builtin-trace.c | 9 +++++++-- > tools/perf/util/evsel.c | 4 ++-- > tools/perf/util/evsel.h | 2 +- > tools/perf/util/parse-events.c | 4 ++-- > 4 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c > index b8c6766301db..4c2704332c14 100644 > --- a/tools/perf/builtin-trace.c > +++ b/tools/perf/builtin-trace.c > @@ -2140,6 +2140,7 @@ out_delete_sys_enter: > static int trace__set_ev_qualifier_filter(struct trace *trace) > { > int err = -1; > + struct perf_evsel *sys_exit; > char *filter = asprintf_expr_inout_ints("id", !trace->not_ev_qualifier, > trace->ev_qualifier_ids.nr, > trace->ev_qualifier_ids.entries); > @@ -2147,8 +2148,12 @@ static int trace__set_ev_qualifier_filter(struct trace *trace) > if (filter == NULL) > goto out_enomem; > > - if (!perf_evsel__append_filter(trace->syscalls.events.sys_enter, "&&", filter)) > - err = perf_evsel__append_filter(trace->syscalls.events.sys_exit, "&&", filter); > + if (!perf_evsel__append_filter(trace->syscalls.events.sys_enter, > + "(%s) && (%s)", filter)) { > + sys_exit = trace->syscalls.events.sys_exit; > + err = perf_evsel__append_filter(sys_exit, > + "(%s) && (%s)", filter); > + } > > free(filter); > out: > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c > index 21fd573106ed..b93369745e08 100644 > --- a/tools/perf/util/evsel.c > +++ b/tools/perf/util/evsel.c > @@ -1046,14 +1046,14 @@ 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) > + const char *fmt, 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) { > + if (asprintf(&new_filter, fmt, evsel->filter, filter) > 0) { > free(evsel->filter); > evsel->filter = new_filter; > return 0; > diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h > index 4d44129e050b..7ab59f15892f 100644 > --- a/tools/perf/util/evsel.h > +++ b/tools/perf/util/evsel.h > @@ -234,7 +234,7 @@ void perf_evsel__set_sample_id(struct perf_evsel *evsel, > > 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); > + const char *fmt, 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); > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > index 6c913c3914fb..9692300585f6 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -1762,7 +1762,7 @@ static int set_filter(struct perf_evsel *evsel, const void *arg) > return -1; > } > > - if (perf_evsel__append_filter(evsel, "&&", str) < 0) { > + if (perf_evsel__append_filter(evsel, "(%s) && (%s)", str) < 0) { > fprintf(stderr, > "not enough memory to hold filter string\n"); > return -1; > @@ -1793,7 +1793,7 @@ static int add_exclude_perf_filter(struct perf_evsel *evsel, > > snprintf(new_filter, sizeof(new_filter), "common_pid != %d", getpid()); > > - if (perf_evsel__append_filter(evsel, "&&", new_filter) < 0) { > + if (perf_evsel__append_filter(evsel, "(%s) && (%s)", new_filter) < 0) { > fprintf(stderr, > "not enough memory to hold filter string\n"); > return -1; >