Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef503831 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d53e57d0

tools/perf/builtin-trace.c

+5 −8
Original line number Diff line number Diff line
@@ -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;

tools/perf/tests/evsel-tp-sched.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name, 


int test__perf_evsel__tp_sched_test(void)

{

	struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch", 0);

	struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch");

	int ret = 0;



	if (evsel == NULL) {
@@ -63,7 +63,7 @@ int test__perf_evsel__tp_sched_test(void) 


	perf_evsel__delete(evsel);



	evsel = perf_evsel__newtp("sched", "sched_wakeup", 0);

	evsel = perf_evsel__newtp("sched", "sched_wakeup");



	if (perf_evsel__test_field(evsel, "comm", 16, true))

		ret = -1;

tools/perf/tests/mmap-basic.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int test__basic_mmap(void) 
		char name[64];



		snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]);

		evsels[i] = perf_evsel__newtp("syscalls", name, i);

		evsels[i] = perf_evsel__newtp("syscalls", name);

		if (evsels[i] == NULL) {

			pr_debug("perf_evsel__new\n");

			goto out_free_evlist;

tools/perf/tests/open-syscall-all-cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int test__open_syscall_event_on_all_cpus(void) 


	CPU_ZERO(&cpu_set);



	evsel = perf_evsel__newtp("syscalls", "sys_enter_open", 0);

	evsel = perf_evsel__newtp("syscalls", "sys_enter_open");

	if (evsel == NULL) {

		pr_debug("is debugfs mounted on /sys/kernel/debug?\n");

		goto out_thread_map_delete;

tools/perf/tests/open-syscall-tp-fields.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ int test__syscall_open_tp_fields(void) 
		goto out;

	}



	evsel = perf_evsel__newtp("syscalls", "sys_enter_open", 0);

	evsel = perf_evsel__newtp("syscalls", "sys_enter_open");

	if (evsel == NULL) {

		pr_debug("%s: perf_evsel__newtp\n", __func__);

		goto out_delete_evlist;