From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752859AbcE1MBa (ORCPT ); Sat, 28 May 2016 08:01:30 -0400 Received: from szxga04-in.huawei.com ([58.251.152.52]:14774 "EHLO szxga04-in.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751125AbcE1MAm (ORCPT ); Sat, 28 May 2016 08:00:42 -0400 From: He Kuang To: , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v6 04/11] perf tools: Move unwind__prepare_access from thread_new into thread__insert_map Date: Sat, 28 May 2016 11:59:53 +0000 Message-ID: <1464436800-39860-5-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1464436800-39860-1-git-send-email-hekuang@huawei.com> References: <1464436800-39860-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.0A090206.5749885A.00C3,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: efe0bd43360217dbe566e696e4043cb2 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. Signed-off-by: He Kuang --- tools/perf/util/thread.c | 7 ++----- tools/perf/util/unwind-libunwind.c | 7 +++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 6d3900c..045477d 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -43,11 +43,6 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu = -1; INIT_LIST_HEAD(&thread->comm_list); - register_local_unwind_libunwind_ops(thread); - - if (unwind__prepare_access(thread) < 0) - goto err_thread; - comm_str = malloc(32); if (!comm_str) goto err_thread; @@ -207,6 +202,8 @@ void thread__insert_map(struct thread *thread, struct map *map) { map_groups__fixup_overlappings(thread->mg, map, stderr); map_groups__insert(thread->mg, map); + + unwind__prepare_access(thread); } static int thread__clone_map_groups(struct thread *thread, diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c index 0277b22..93d2d8e 100644 --- a/tools/perf/util/unwind-libunwind.c +++ b/tools/perf/util/unwind-libunwind.c @@ -695,10 +695,9 @@ void register_local_unwind_libunwind_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; + register_local_unwind_libunwind_ops(thread); + + return thread->unwind_libunwind_ops->prepare_access(thread); } void unwind__flush_access(struct thread *thread) -- 1.8.5.2