From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423260AbcFHItj (ORCPT ); Wed, 8 Jun 2016 04:49:39 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54470 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161420AbcFHIth (ORCPT ); Wed, 8 Jun 2016 04:49:37 -0400 Date: Wed, 8 Jun 2016 01:48:53 -0700 From: tip-bot for He Kuang Message-ID: Cc: dsahern@gmail.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, hpa@zytor.com, kan.liang@intel.com, tglx@linutronix.de, mhiramat@kernel.org, tumanova@linux.vnet.ibm.com, hekuang@huawei.com, mingo@kernel.org, eranian@google.com, alexander.shishkin@linux.intel.com, adrian.hunter@intel.com, peterz@infradead.org, sukadev@linux.vnet.ibm.com, acme@redhat.com, namhyung@kernel.org, ak@linux.intel.com, penberg@kernel.org, jolsa@kernel.org Reply-To: eranian@google.com, alexander.shishkin@linux.intel.com, tglx@linutronix.de, hekuang@huawei.com, mingo@kernel.org, tumanova@linux.vnet.ibm.com, mhiramat@kernel.org, hpa@zytor.com, kan.liang@intel.com, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, dsahern@gmail.com, wangnan0@huawei.com, jolsa@kernel.org, penberg@kernel.org, acme@redhat.com, ak@linux.intel.com, namhyung@kernel.org, sukadev@linux.vnet.ibm.com, peterz@infradead.org, adrian.hunter@intel.com In-Reply-To: <1464924803-22214-9-git-send-email-hekuang@huawei.com> References: <1464924803-22214-9-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Extract common API out of unwind-libunwind-local.c Git-Commit-ID: f6d725324ab281880a0b736df5812e3a1e807779 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f6d725324ab281880a0b736df5812e3a1e807779 Gitweb: http://git.kernel.org/tip/f6d725324ab281880a0b736df5812e3a1e807779 Author: He Kuang AuthorDate: Fri, 3 Jun 2016 03:33:17 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 12:08:53 -0300 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: He Kuang Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Ekaterina Tumanova Cc: Josh Poimboeuf Cc: Kan Liang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Pekka Enberg Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Sukadev Bhattiprolu Cc: Wang Nan Link: http://lkml.kernel.org/r/1464924803-22214-9-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/Build | 1 + tools/perf/util/unwind-libunwind-local.c | 34 ---------------------------- tools/perf/util/unwind-libunwind.c | 38 ++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 34 deletions(-) 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 b0c5db1..9c70486 100644 --- a/tools/perf/util/unwind-libunwind-local.c +++ b/tools/perf/util/unwind-libunwind-local.c @@ -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; -} diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c new file mode 100644 index 0000000..f86f903 --- /dev/null +++ b/tools/perf/util/unwind-libunwind.c @@ -0,0 +1,38 @@ +#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; +}