From mboxrd@z Thu Jan 1 00:00:00 1970 From: Milian Wolff Subject: [PATCH] perf report: always honor callchain order for inlined nodes Date: Tue, 16 May 2017 23:54:22 +0200 Message-ID: <20170516215422.16458-1-milian.wolff@kdab.com> Return-path: Received: from mail.kdab.com ([176.9.126.58]:43970 "EHLO mail.kdab.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753219AbdEPVyb (ORCPT ); Tue, 16 May 2017 17:54:31 -0400 Sender: linux-perf-users-owner@vger.kernel.org List-ID: To: Linux-kernel@vger.kernel.org Cc: linux-perf-users@vger.kernel.org, Milian Wolff , Arnaldo Carvalho de Melo , David Ahern , Namhyung Kim , Peter Zijlstra , Yao Jin So far, the inlined nodes where only reversed when we built perf against libbfd. If that was not available, the addr2line fallback code path was missing the inline_list__reverse call. Now this is done at the central place inside dso__parse_addr_inlines. Cc: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Yao Jin Signed-off-by: Milian Wolff --- tools/perf/util/srcline.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index 62cf42c36955..8df6b29bf984 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -61,6 +61,14 @@ static int inline_list__append(char *filename, char *funcname, int line_nr, return 0; } +static void inline_list__reverse(struct inline_node *node) +{ + struct inline_list *ilist, *n; + + list_for_each_entry_safe_reverse(ilist, n, &node->val, list) + list_move_tail(&ilist->list, &node->val); +} + #ifdef HAVE_LIBBFD_SUPPORT /* @@ -200,14 +208,6 @@ static void addr2line_cleanup(struct a2l_data *a2l) #define MAX_INLINE_NEST 1024 -static void inline_list__reverse(struct inline_node *node) -{ - struct inline_list *ilist, *n; - - list_for_each_entry_safe_reverse(ilist, n, &node->val, list) - list_move_tail(&ilist->list, &node->val); -} - static int addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line, struct dso *dso, bool unwind_inlines, struct inline_node *node) @@ -245,11 +245,6 @@ static int addr2line(const char *dso_name, u64 addr, return 0; } } - - if ((node != NULL) && - (callchain_param.order != ORDER_CALLEE)) { - inline_list__reverse(node); - } } if (a2l->found && a2l->filename) { @@ -493,12 +488,17 @@ char *get_srcline(struct dso *dso, u64 addr, struct symbol *sym, struct inline_node *dso__parse_addr_inlines(struct dso *dso, u64 addr) { const char *dso_name; + struct inline_node *node; dso_name = dso__name(dso); if (dso_name == NULL) return NULL; - return addr2inlines(dso_name, addr, dso); + node = addr2inlines(dso_name, addr, dso); + if (node && callchain_param.order != ORDER_CALLEE) + inline_list__reverse(node); + + return node; } void inline_node__delete(struct inline_node *node) -- 2.13.0