Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753846AbbKQPFt (ORCPT ); Tue, 17 Nov 2015 10:05:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34665 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbbKQPFq (ORCPT ); Tue, 17 Nov 2015 10:05:46 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , David Ahern , Peter Zijlstra , Ingo Molnar , Namhyung Kim , Milian Wolff , Wang Nan Subject: [PATCH 1/3] perf tools: Move initial entry call into get_entries function Date: Tue, 17 Nov 2015 16:05:37 +0100 Message-Id: <1447772739-18471-2-git-send-email-jolsa@kernel.org> In-Reply-To: <1447772739-18471-1-git-send-email-jolsa@kernel.org> References: <1447772739-18471-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2071 Lines: 73 Moving initial entry call into get_entries function so all entries processing is on one place. It will be useful for next change that adds ordering logic. Link: http://lkml.kernel.org/n/tip-p8wsesmi0y1abyik381pl32j@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/unwind-libunwind.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c index c83832b555e5..0ae8844fe7a6 100644 --- a/tools/perf/util/unwind-libunwind.c +++ b/tools/perf/util/unwind-libunwind.c @@ -614,10 +614,22 @@ void unwind__finish_access(struct thread *thread) static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, void *arg, int max_stack) { + u64 val; unw_addr_space_t addr_space; unw_cursor_t c; int ret; + ret = perf_reg_value(&val, &ui->sample->user_regs, PERF_REG_IP); + if (ret) + return ret; + + ret = entry(val, ui->thread, cb, arg); + if (ret) + return -ENOMEM; + + if (--max_stack == 0) + return 0; + addr_space = thread__priv(ui->thread); if (addr_space == NULL) return -1; @@ -640,24 +652,17 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, struct thread *thread, struct perf_sample *data, int max_stack) { - u64 ip; struct unwind_info ui = { .sample = data, .thread = thread, .machine = thread->mg->machine, }; - int ret; if (!data->user_regs.regs) return -EINVAL; - ret = perf_reg_value(&ip, &data->user_regs, PERF_REG_IP); - if (ret) - return ret; - - ret = entry(ip, thread, cb, arg); - if (ret) - return -ENOMEM; + if (max_stack <= 0) + return -EINVAL; - return --max_stack > 0 ? get_entries(&ui, cb, arg, max_stack) : 0; + return get_entries(&ui, cb, arg, max_stack); } -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/