[PATCH v6 06/11 1 update 2/2] perf tools: Extract common API out of unwind-libunwind-local.c

From: He Kuang
Date: Sun May 29 2016 - 23:23:11 EST


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 <hekuang@xxxxxxxxxx>
---
tools/perf/util/Build | 1 +
tools/perf/util/unwind-libunwind-local.c | 32 ------------------------------
tools/perf/util/unwind-libunwind.c | 34 ++++++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 32 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 93d2d8e..37e53f8 100644
--- a/tools/perf/util/unwind-libunwind-local.c
+++ b/tools/perf/util/unwind-libunwind-local.c
@@ -692,35 +692,3 @@ void register_local_unwind_libunwind_ops(struct thread *thread)
{
thread->unwind_libunwind_ops = &_unwind_libunwind_ops;
}
-
-int unwind__prepare_access(struct thread *thread)
-{
- register_local_unwind_libunwind_ops(thread);
-
- 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..40d0453
--- /dev/null
+++ b/tools/perf/util/unwind-libunwind.c
@@ -0,0 +1,34 @@
+#include "unwind.h"
+#include "thread.h"
+
+int unwind__prepare_access(struct thread *thread)
+{
+ register_local_unwind_libunwind_ops(thread);
+
+ 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;
+}
--
1.8.5.2