From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753835AbbFIJuC (ORCPT ); Tue, 9 Jun 2015 05:50:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49501 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753136AbbFIJt6 (ORCPT ); Tue, 9 Jun 2015 05:49:58 -0400 Date: Tue, 9 Jun 2015 02:49:33 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: ak@linux.intel.com, a.p.zijlstra@chello.nl, eranian@google.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, dsahern@gmail.com, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org Reply-To: eranian@google.com, a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, ak@linux.intel.com In-Reply-To: <1433341559-31848-4-git-send-email-jolsa@kernel.org> References: <1433341559-31848-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Remove setup_events function Git-Commit-ID: a454742c1252d6242e00b5f4f6f9e5fbce3859d7 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: a454742c1252d6242e00b5f4f6f9e5fbce3859d7 Gitweb: http://git.kernel.org/tip/a454742c1252d6242e00b5f4f6f9e5fbce3859d7 Author: Jiri Olsa AuthorDate: Wed, 3 Jun 2015 16:25:53 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 8 Jun 2015 10:30:30 -0300 perf stat: Remove setup_events function We can use already existing parse_events interface. Both transaction_attrs and transaction_limited_attrs are changed to be single strings. Signed-off-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1433341559-31848-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 514493d..0c0071c 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -73,8 +73,8 @@ static void print_counter(struct perf_evsel *counter, char *prefix); static void print_aggr(char *prefix); /* Default events used for perf stat -T */ -static const char * const transaction_attrs[] = { - "task-clock", +static const char *transaction_attrs = { + "task-clock," "{" "instructions," "cycles," @@ -86,8 +86,8 @@ static const char * const transaction_attrs[] = { }; /* More limited version when the CPU does not have all events. */ -static const char * const transaction_limited_attrs[] = { - "task-clock", +static const char * transaction_limited_attrs = { + "task-clock," "{" "instructions," "cycles," @@ -1533,17 +1533,6 @@ static int perf_stat_init_aggr_mode(void) return 0; } -static int setup_events(const char * const *attrs, unsigned len) -{ - unsigned i; - - for (i = 0; i < len; i++) { - if (parse_events(evsel_list, attrs[i], NULL)) - return -1; - } - return 0; -} - /* * Add default attributes, if there were no attributes specified or * if -d/--detailed, -d -d or -d -d -d is used: @@ -1665,12 +1654,10 @@ static int add_default_attributes(void) int err; if (pmu_have_event("cpu", "cycles-ct") && pmu_have_event("cpu", "el-start")) - err = setup_events(transaction_attrs, - ARRAY_SIZE(transaction_attrs)); + err = parse_events(evsel_list, transaction_attrs, NULL); else - err = setup_events(transaction_limited_attrs, - ARRAY_SIZE(transaction_limited_attrs)); - if (err < 0) { + err = parse_events(evsel_list, transaction_limited_attrs, NULL); + if (err) { fprintf(stderr, "Cannot set up transaction events\n"); return -1; }