perf evsel: Remove idx parm from constructor

Most uses of the evsel constructor are followed by a call to
perf_evlist__add with an idex of evlist->nr_entries, so make rename
the current constructor to perf_evsel__new_idx and remove the need
for passing the constructor for the common case.

We still need the new_idx variant because the way groups are handled,
with evsel->nr_members holding the number of entries in an evlist,
partitioning the evlist into sublists inside a single linked list.

This asks for a clarifying refactoring, but for now simplify the non
parser cases, so that tool writers don't have to bother with evsel idx
setting.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-zy9tskx6jqm2rmw7468zze2a@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 329b7832b5da..68943cad70d4 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -149,10 +149,9 @@ static void perf_evsel__delete_priv(struct perf_evsel *evsel)
         perf_evsel__delete(evsel);
 }
 
-static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction,
-                                                    void *handler, int idx)
+static struct perf_evsel *perf_evsel__syscall_newtp(const char *direction, void *handler)
 {
-        struct perf_evsel *evsel = perf_evsel__newtp("raw_syscalls", direction, idx);
+        struct perf_evsel *evsel = perf_evsel__newtp("raw_syscalls", direction);
 
         if (evsel) {
                 evsel->priv = malloc(sizeof(struct syscall_tp));
@@ -186,17 +185,16 @@ static int perf_evlist__add_syscall_newtp(struct perf_evlist *evlist,
                                           void *sys_exit_handler)
 {
         int ret = -1;
-        int idx = evlist->nr_entries;
         struct perf_evsel *sys_enter, *sys_exit;
 
-        sys_enter = perf_evsel__syscall_newtp("sys_enter", sys_enter_handler, idx++);
+        sys_enter = perf_evsel__syscall_newtp("sys_enter", sys_enter_handler);
         if (sys_enter == NULL)
                 goto out;
 
         if (perf_evsel__init_sc_tp_ptr_field(sys_enter, args))
                 goto out_delete_sys_enter;
 
-        sys_exit = perf_evsel__syscall_newtp("sys_exit", sys_exit_handler, idx++);
+        sys_exit = perf_evsel__syscall_newtp("sys_exit", sys_exit_handler);
         if (sys_exit == NULL)
                 goto out_delete_sys_enter;
 
@@ -1824,8 +1822,7 @@ static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp);
 
 static void perf_evlist__add_vfs_getname(struct perf_evlist *evlist)
 {
-        struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname",
-                                                     evlist->nr_entries);
+        struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname");
         if (evsel == NULL)
                 return;