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: He Kuang <heku...@huawei.com>
---
tools/perf/util/Build | 1 +
tools/perf/util/unwind-libunwind-local.c | 38 -----------------------------
tools/perf/util/unwind-libunwind.c | 42 ++++++++++++++++++++++++++++++++
tools/perf/util/unwind.h | 2 --
4 files changed, 43 insertions(+), 40 deletions(-)
create mode 100644 tools/perf/util/unwind-libunwind.c
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 5e23d85..004fb1d 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -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
diff --git a/tools/perf/util/unwind-libunwind-local.c
b/tools/perf/util/unwind-libunwind-local.c
index e35c5bfda..9c70486 100644
--- a/tools/perf/util/unwind-libunwind-local.c
+++ b/tools/perf/util/unwind-libunwind-local.c
@@ -691,41 +691,3 @@ _unwind_libunwind_ops = {
struct unwind_libunwind_ops *
local_unwind_libunwind_ops = &_unwind_libunwind_ops;
-
-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);
- else
- return 0;
-}
diff --git a/tools/perf/util/unwind-libunwind.c
b/tools/perf/util/unwind-libunwind.c
new file mode 100644
index 0000000..787adbb
--- /dev/null
+++ b/tools/perf/util/unwind-libunwind.c
@@ -0,0 +1,42 @@
+#include "unwind.h"
+#include "thread.h"
+
+struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops;
+
+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);
+ else
+ return 0;
+}
diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h
index bd7377b..25001be 100644
--- a/tools/perf/util/unwind.h
+++ b/tools/perf/util/unwind.h
@@ -23,8 +23,6 @@ struct unwind_libunwind_ops {
struct perf_sample *data, int max_stack);
};
-struct unwind_libunwind_ops *local_unwind_libunwind_ops;
-
#ifdef HAVE_DWARF_UNWIND_SUPPORT
int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
struct thread *thread,
--
1.8.5.2
