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

Commit f6d72532 authored by He Kuang's avatar He Kuang Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Extract common API out of unwind-libunwind-local.c 



This patch extracts common unwind-libunwind APIs out of
unwind-libunwind-local.c, this part will be used by both local and
remote libunwind.

Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1464924803-22214-9-git-send-email-hekuang@huawei.com


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

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ libperf-$(CONFIG_DWARF) += dwarf-aux.o 


libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o

libperf-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind-local.o

libperf-$(CONFIG_LIBUNWIND)          += unwind-libunwind.o



libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o

tools/perf/util/unwind-libunwind-local.c

+0 −34
Original line number Diff line number Diff line
@@ -691,37 +691,3 @@ _unwind_libunwind_ops = { 


struct unwind_libunwind_ops *

local_unwind_libunwind_ops = &_unwind_libunwind_ops;
 


static void unwind__register_ops(struct thread *thread,

				 struct unwind_libunwind_ops *ops)

{

	thread->unwind_libunwind_ops = ops;

}



int unwind__prepare_access(struct thread *thread)

{

	unwind__register_ops(thread, local_unwind_libunwind_ops);



	return thread->unwind_libunwind_ops->prepare_access(thread);

}



void unwind__flush_access(struct thread *thread)

{

	if (thread->unwind_libunwind_ops)

		thread->unwind_libunwind_ops->flush_access(thread);

}



void unwind__finish_access(struct thread *thread)

{

	if (thread->unwind_libunwind_ops)

		thread->unwind_libunwind_ops->finish_access(thread);

}



int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			 struct thread *thread,

			 struct perf_sample *data, int max_stack)

{

	if (thread->unwind_libunwind_ops)

		return thread->unwind_libunwind_ops->get_entries(cb, arg, thread, data, max_stack);

	return 0;

}

tools/perf/util/unwind-libunwind.c

0 → 100644
+38 −0
Original line number Diff line number Diff line 
#include "unwind.h"

#include "thread.h"



struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops;



static void unwind__register_ops(struct thread *thread,

			  struct unwind_libunwind_ops *ops)

{

	thread->unwind_libunwind_ops = ops;

}



int unwind__prepare_access(struct thread *thread)

{

	unwind__register_ops(thread, local_unwind_libunwind_ops);



	return thread->unwind_libunwind_ops->prepare_access(thread);

}



void unwind__flush_access(struct thread *thread)

{

	if (thread->unwind_libunwind_ops)

		thread->unwind_libunwind_ops->flush_access(thread);

}



void unwind__finish_access(struct thread *thread)

{

	if (thread->unwind_libunwind_ops)

		thread->unwind_libunwind_ops->finish_access(thread);

}



int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			 struct thread *thread,

			 struct perf_sample *data, int max_stack)

{

	if (thread->unwind_libunwind_ops)

		return thread->unwind_libunwind_ops->get_entries(cb, arg, thread, data, max_stack);

	return 0;

}