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 <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1433341559-31848-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 7 insertions, 20 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 514493d703da..0c0071cf4fba 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;
                 }