From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752826AbcEaLTs (ORCPT ); Tue, 31 May 2016 07:19:48 -0400 Received: from szxga04-in.huawei.com ([58.251.152.52]:62197 "EHLO szxga04-in.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751023AbcEaLTl (ORCPT ); Tue, 31 May 2016 07:19:41 -0400 From: He Kuang To: , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v7 04/14] perf tools: Move unwind__prepare_access from thread_new into thread__insert_map Date: Tue, 31 May 2016 11:19:02 +0000 Message-ID: <1464693552-104294-5-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1464693552-104294-1-git-send-email-hekuang@huawei.com> References: <1464693552-104294-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.0A020204.574D7344.0065,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: abaa8f9bda5a3a8ba42d69dba483f72d Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For determine the libunwind methods to use, we should get the 32bit/64bit information from maps of a thread. When a thread is newly created, the information is not prepared. This patch moves unwind__prepare_access() into thread__insert_map() so we can get the information we need from maps. Meanwhile, let thread__insert_map() return value and show messages on error. Signed-off-by: He Kuang --- tools/perf/util/machine.c | 10 ++++++++-- tools/perf/util/thread.c | 13 +++---------- tools/perf/util/thread.h | 2 +- tools/perf/util/unwind-libunwind.c | 7 +++---- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index bdc33ce..0bd6aac 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1353,7 +1353,10 @@ int machine__process_mmap2_event(struct machine *machine, if (map == NULL) goto out_problem_map; - thread__insert_map(thread, map); + ret = thread__insert_map(thread, map); + if (ret) + pr_err("Thread insert map error\n"); + thread__put(thread); map__put(map); return 0; @@ -1403,7 +1406,10 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event if (map == NULL) goto out_problem_map; - thread__insert_map(thread, map); + ret = thread__insert_map(thread, map); + if (ret) + pr_err("Thread insert map error\n"); + thread__put(thread); map__put(map); return 0; diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 95ff1b8..0615ef3 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -43,15 +43,6 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu = -1; INIT_LIST_HEAD(&thread->comm_list); -#ifdef HAVE_LIBUNWIND_SUPPORT - unwind__register_ops(thread, local_unwind_libunwind_ops); -#else - unwind__register_ops(thread, NULL); -#endif - - if (unwind__prepare_access(thread) < 0) - goto err_thread; - comm_str = malloc(32); if (!comm_str) goto err_thread; @@ -207,10 +198,12 @@ size_t thread__fprintf(struct thread *thread, FILE *fp) map_groups__fprintf(thread->mg, fp); } -void thread__insert_map(struct thread *thread, struct map *map) +int thread__insert_map(struct thread *thread, struct map *map) { map_groups__fixup_overlappings(thread->mg, map, stderr); map_groups__insert(thread->mg, map); + + return unwind__prepare_access(thread); } static int thread__clone_map_groups(struct thread *thread, diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h index 152fb9a..e7a82a3 100644 --- a/tools/perf/util/thread.h +++ b/tools/perf/util/thread.h @@ -76,7 +76,7 @@ int thread__comm_len(struct thread *thread); struct comm *thread__comm(const struct thread *thread); struct comm *thread__exec_comm(const struct thread *thread); const char *thread__comm_str(const struct thread *thread); -void thread__insert_map(struct thread *thread, struct map *map); +int thread__insert_map(struct thread *thread, struct map *map); int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp); size_t thread__fprintf(struct thread *thread, FILE *fp); diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c index 77b8521..e35c5bfda 100644 --- a/tools/perf/util/unwind-libunwind.c +++ b/tools/perf/util/unwind-libunwind.c @@ -700,10 +700,9 @@ void unwind__register_ops(struct thread *thread, int unwind__prepare_access(struct thread *thread) { - if (thread->unwind_libunwind_ops) - return thread->unwind_libunwind_ops->prepare_access(thread); - else - return 0; + unwind__register_ops(thread, local_unwind_libunwind_ops); + + return thread->unwind_libunwind_ops->prepare_access(thread); } void unwind__flush_access(struct thread *thread) -- 1.8.5.2