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

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

perf callchains: Use thread->mg->machine 

The unwind__get_entries() already receives the thread parameter, from where it can
obtain the matching machine structure, shorten the signature.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-isjc6bm8mv4612mhi6af64go@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cc8b7c2b

tools/perf/tests/dwarf-unwind.c

+9 −9
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) 
}



__attribute__ ((noinline))

static int unwind_thread(struct thread *thread, struct machine *machine)

static int unwind_thread(struct thread *thread)

{

	struct perf_sample sample;

	unsigned long cnt = 0;
@@ -72,7 +72,7 @@ static int unwind_thread(struct thread *thread, struct machine *machine) 
		goto out;

	}



	err = unwind__get_entries(unwind_entry, &cnt, machine, thread,

	err = unwind__get_entries(unwind_entry, &cnt, thread,

				  &sample, MAX_STACK);

	if (err)

		pr_debug("unwind failed\n");
@@ -89,21 +89,21 @@ static int unwind_thread(struct thread *thread, struct machine *machine) 
}



__attribute__ ((noinline))

static int krava_3(struct thread *thread, struct machine *machine)

static int krava_3(struct thread *thread)

{

	return unwind_thread(thread, machine);

	return unwind_thread(thread);

}



__attribute__ ((noinline))

static int krava_2(struct thread *thread, struct machine *machine)

static int krava_2(struct thread *thread)

{

	return krava_3(thread, machine);

	return krava_3(thread);

}



__attribute__ ((noinline))

static int krava_1(struct thread *thread, struct machine *machine)

static int krava_1(struct thread *thread)

{

	return krava_2(thread, machine);

	return krava_2(thread);

}



int test__dwarf_unwind(void)
@@ -137,7 +137,7 @@ int test__dwarf_unwind(void) 
		goto out;

	}



	err = krava_1(thread, machine);

	err = krava_1(thread);



 out:

	machine__delete_threads(machine);

tools/perf/util/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -1486,7 +1486,7 @@ int thread__resolve_callchain(struct thread *thread, 
	    (!sample->user_stack.size))

		return 0;



	return unwind__get_entries(unwind_entry, &callchain_cursor, thread->mg->machine,

	return unwind__get_entries(unwind_entry, &callchain_cursor,

				   thread, sample, max_stack);



}

tools/perf/util/unwind-libdw.c

+2 −2
Original line number Diff line number Diff line
@@ -164,14 +164,14 @@ frame_callback(Dwfl_Frame *state, void *arg) 
}



int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			struct machine *machine, struct thread *thread,

			struct thread *thread,

			struct perf_sample *data,

			int max_stack)

{

	struct unwind_info ui = {

		.sample		= data,

		.thread		= thread,

		.machine	= machine,

		.machine	= thread->mg->machine,

		.cb		= cb,

		.arg		= arg,

		.max_stack	= max_stack,

tools/perf/util/unwind-libunwind.c

+2 −2
Original line number Diff line number Diff line
@@ -592,14 +592,14 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, 
}



int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			struct machine *machine, struct thread *thread,

			struct thread *thread,

			struct perf_sample *data, int max_stack)

{

	u64 ip;

	struct unwind_info ui = {

		.sample       = data,

		.thread       = thread,

		.machine      = machine,

		.machine      = thread->mg->machine,

	};

	int ret;

tools/perf/util/unwind.h

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ typedef int (*unwind_entry_cb_t)(struct unwind_entry *entry, void *arg); 


#ifdef HAVE_DWARF_UNWIND_SUPPORT

int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			struct machine *machine,

			struct thread *thread,

			struct perf_sample *data, int max_stack);

/* libunwind specific */
@@ -38,7 +37,6 @@ static inline void unwind__finish_access(struct thread *thread __maybe_unused) { 
static inline int

unwind__get_entries(unwind_entry_cb_t cb __maybe_unused,

		    void *arg __maybe_unused,

		    struct machine *machine __maybe_unused,

		    struct thread *thread __maybe_unused,

		    struct perf_sample *data __maybe_unused,

		    int max_stack __maybe_unused)