From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753574AbcE3DXJ (ORCPT ); Sun, 29 May 2016 23:23:09 -0400 Received: from szxga04-in.huawei.com ([58.251.152.52]:61404 "EHLO szxga04-in.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1161113AbcE3DXG (ORCPT ); Sun, 29 May 2016 23:23:06 -0400 From: He Kuang To: , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v6 06/11 1 update 2/2] perf tools: Extract common API out of unwind-libunwind-local.c Date: Mon, 30 May 2016 03:22:36 +0000 Message-ID: <1464578556-89341-2-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1464578556-89341-1-git-send-email-hekuang@huawei.com> References: <57498AAF.1080206@huawei.com> <1464578556-89341-1-git-send-email-hekuang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090205.574BB20C.0009,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: e796b6f4a3d6e7efed22bb1c0cfc154c Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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