From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423210AbcFHIrv (ORCPT ); Wed, 8 Jun 2016 04:47:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54330 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161478AbcFHIrr (ORCPT ); Wed, 8 Jun 2016 04:47:47 -0400 Date: Wed, 8 Jun 2016 01:47:03 -0700 From: tip-bot for He Kuang Message-ID: Cc: hpa@zytor.com, alexander.shishkin@linux.intel.com, ak@linux.intel.com, adrian.hunter@intel.com, wangnan0@huawei.com, kan.liang@intel.com, mingo@kernel.org, jpoimboe@redhat.com, penberg@kernel.org, sukadev@linux.vnet.ibm.com, tumanova@linux.vnet.ibm.com, mhiramat@kernel.org, tglx@linutronix.de, jolsa@kernel.org, peterz@infradead.org, eranian@google.com, hekuang@huawei.com, dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org Reply-To: adrian.hunter@intel.com, wangnan0@huawei.com, kan.liang@intel.com, hpa@zytor.com, ak@linux.intel.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, tglx@linutronix.de, mhiramat@kernel.org, tumanova@linux.vnet.ibm.com, jpoimboe@redhat.com, penberg@kernel.org, mingo@kernel.org, sukadev@linux.vnet.ibm.com, eranian@google.com, peterz@infradead.org, linux-kernel@vger.kernel.org, acme@redhat.com, namhyung@kernel.org, hekuang@huawei.com, dsahern@gmail.com In-Reply-To: <1464924803-22214-5-git-send-email-hekuang@huawei.com> References: <1464924803-22214-5-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map Git-Commit-ID: 8132a2a84147d3c98cf580d5759387325fbabf73 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: 8132a2a84147d3c98cf580d5759387325fbabf73 Gitweb: http://git.kernel.org/tip/8132a2a84147d3c98cf580d5759387325fbabf73 Author: He Kuang AuthorDate: Fri, 3 Jun 2016 03:33:13 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 12:08:52 -0300 perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map To 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 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-5-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 14 ++++++++++++-- tools/perf/util/thread.c | 13 +++++++++---- tools/perf/util/thread.h | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 205d270..9d931f5 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1353,11 +1353,16 @@ 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) + goto out_problem_insert; + thread__put(thread); map__put(map); return 0; +out_problem_insert: + map__put(map); out_problem_map: thread__put(thread); out_problem: @@ -1403,11 +1408,16 @@ 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) + goto out_problem_insert; + thread__put(thread); map__put(map); return 0; +out_problem_insert: + map__put(map); out_problem_map: thread__put(thread); out_problem: diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index ada58e6..0bf55256 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -43,9 +43,6 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu = -1; INIT_LIST_HEAD(&thread->comm_list); - if (unwind__prepare_access(thread) < 0) - goto err_thread; - comm_str = malloc(32); if (!comm_str) goto err_thread; @@ -201,10 +198,18 @@ 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) { + int ret; + + ret = unwind__prepare_access(thread); + if (ret) + return ret; + map_groups__fixup_overlappings(thread->mg, map, stderr); map_groups__insert(thread->mg, map); + + return 0; } static int thread__clone_map_groups(struct thread *thread, diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h index 07ffb18..99263cb 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);