From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754488AbbFAXAm (ORCPT ); Mon, 1 Jun 2015 19:00:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48916 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754347AbbFAXAX (ORCPT ); Mon, 1 Jun 2015 19:00:23 -0400 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Peter Zijlstra , Paul Mackerras , David Ahern , Namhyung Kim , Ingo Molnar , Andi Kleen , Stephane Eranian Subject: [PATCH 3/9] perf stat: Remove setup_events function Date: Tue, 2 Jun 2015 00:59:57 +0200 Message-Id: <1433199603-20082-4-git-send-email-jolsa@kernel.org> In-Reply-To: <1433199603-20082-1-git-send-email-jolsa@kernel.org> References: <1433199603-20082-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can use already existing parse_events interface. Both transaction_attrs and transaction_limited_attrs are changed to be single strings. Link: http://lkml.kernel.org/n/tip-9r37hrfb81v16xthafgxtppk@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/builtin-stat.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 1f9269419b01..902d4a270021 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," @@ -1535,17 +1535,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: @@ -1667,11 +1656,9 @@ 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)); + err = parse_events(evsel_list, transaction_limited_attrs, NULL); if (err < 0) { fprintf(stderr, "Cannot set up transaction events\n"); return -1; -- 1.9.3