From patchwork Fri Sep 16 14:44:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 76389 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp534715qgf; Fri, 16 Sep 2016 07:44:41 -0700 (PDT) X-Received: by 10.98.206.139 with SMTP id y133mr23746685pfg.7.1474037081144; Fri, 16 Sep 2016 07:44:41 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p18si27029101pfd.230.2016.09.16.07.44.40; Fri, 16 Sep 2016 07:44:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964856AbcIPOo3 (ORCPT + 27 others); Fri, 16 Sep 2016 10:44:29 -0400 Received: from mail-it0-f46.google.com ([209.85.214.46]:35250 "EHLO mail-it0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758555AbcIPOoM (ORCPT ); Fri, 16 Sep 2016 10:44:12 -0400 Received: by mail-it0-f46.google.com with SMTP id r192so17582369ita.0 for ; Fri, 16 Sep 2016 07:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F9xzbCvEM9XG6HXyGWD4+z7X2dRnx+D3Byhsmr/s0UM=; b=O14zM+RRBshx9kUDVNw7NGA/qEuYyb4xT90JI3St/lbDhHA3uO/1Ukk6b/U0HNWbc5 UsJuX2pcuOTXIzs03i+510sRvHdn5/aBUTEePNP7UfGdVjKkwn92l9PN9gtdfCjqDWRn GEU8o7cbtseADSu+a+Ok3ML0MP77g8Jx+XVU8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F9xzbCvEM9XG6HXyGWD4+z7X2dRnx+D3Byhsmr/s0UM=; b=JaLrw4bAtNgSV+qbcafuAolo0kesi/CDVFSfK6MmMzVQbUfK+aqBT5ghEUc/cT/vjy GqFmgRBZ3rUEdvZIvpmdG0HAYTX6Bt/yySXnY501ppWF2aSVLZGphUo0PR3Ke3fH9tNB WXxbOg+77hsRevRudGf9j0hkFjNwOdzpq2R49RzZV8QDpAzAHoKb/15QULmco3eFjaX8 LCrMfF0RFWhU8UG923LmTlYIAmnTKGiWJ8AWqtGhl8GF4Ukj2EWDgm+rm1CzKV4DYsiD Yjx+7xOeitdhDJDRjmltZi4K/Z2W07KsE9CsiPuq4WQYnscPRN0od7+mbK9VB75DfN54 GTRQ== X-Gm-Message-State: AE9vXwPflTdLKbLunLn8sPkj9g2GCRrQNrKv6Oan8QSuZfqPenXrEvGXbDFmS8aWxUEL/on0 X-Received: by 10.36.55.146 with SMTP id r140mr6438118itr.73.1474037051585; Fri, 16 Sep 2016 07:44:11 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id 88sm3811653iol.30.2016.09.16.07.44.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Sep 2016 07:44:10 -0700 (PDT) From: Mathieu Poirier To: acme@kernel.org Cc: adrian.hunter@intel.com, acme@infradead.org, mingo@redhat.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH V7 2/3] perf tools: new tracepoint specific function Date: Fri, 16 Sep 2016 08:44:04 -0600 Message-Id: <1474037045-31730-3-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474037045-31730-1-git-send-email-mathieu.poirier@linaro.org> References: <1474037045-31730-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Making function perf_evsel__append_filter() static and introducing a new tracepoint specific function to append filters. That way we eliminate redundant code and avoid formatting mistake. Signed-off-by: Mathieu Poirier Acked-by: Adrian Hunter --- tools/perf/builtin-trace.c | 7 +++---- tools/perf/util/evsel.c | 9 +++++++-- tools/perf/util/evsel.h | 3 +-- tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 4c2704332c14..34effab09f39 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2148,11 +2148,10 @@ 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, - "(%s) && (%s)", filter)) { + if (!perf_evsel__append_tp_filter(trace->syscalls.events.sys_enter, + filter)) { sys_exit = trace->syscalls.events.sys_exit; - err = perf_evsel__append_filter(sys_exit, - "(%s) && (%s)", filter); + err = perf_evsel__append_tp_filter(sys_exit, filter); } free(filter); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index b93369745e08..a99e82d97df2 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1045,8 +1045,8 @@ 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 *fmt, const char *filter) +static int perf_evsel__append_filter(struct perf_evsel *evsel, + const char *fmt, const char *filter) { char *new_filter; @@ -1062,6 +1062,11 @@ int perf_evsel__append_filter(struct perf_evsel *evsel, return -1; } +int perf_evsel__append_tp_filter(struct perf_evsel *evsel, const char *filter) +{ + return perf_evsel__append_filter(evsel, "(%s) && (%s)", filter); +} + int perf_evsel__enable(struct perf_evsel *evsel) { int nthreads = thread_map__nr(evsel->threads); diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 7ab59f15892f..36ed0997e65b 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -233,8 +233,7 @@ 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 *fmt, const char *filter); +int perf_evsel__append_tp_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); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 9692300585f6..751b48fc641c 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, "(%s) && (%s)", str) < 0) { + if (perf_evsel__append_tp_filter(evsel, 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, "(%s) && (%s)", new_filter) < 0) { + if (perf_evsel__append_tp_filter(evsel, new_filter) < 0) { fprintf(stderr, "not enough memory to hold filter string\n"); return -1;