Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753151AbbKZIUA (ORCPT ); Thu, 26 Nov 2015 03:20:00 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56001 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753120AbbKZIT5 (ORCPT ); Thu, 26 Nov 2015 03:19:57 -0500 Date: Thu, 26 Nov 2015 00:19:15 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, milian.wolff@kdab.com, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, dsahern@gmail.com, wangnan0@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org Reply-To: wangnan0@huawei.com, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org, peterz@infradead.org, milian.wolff@kdab.com, tglx@linutronix.de, namhyung@kernel.org, hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org In-Reply-To: <1447772739-18471-4-git-send-email-jolsa@kernel.org> References: <1447772739-18471-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Add callchain order setup for DWARF unwinder test Git-Commit-ID: 8dc0564d809e3903834950e2d12f6d1d2fcff708 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 Content-Length: 2770 Lines: 77 Commit-ID: 8dc0564d809e3903834950e2d12f6d1d2fcff708 Gitweb: http://git.kernel.org/tip/8dc0564d809e3903834950e2d12f6d1d2fcff708 Author: Jiri Olsa AuthorDate: Tue, 17 Nov 2015 16:05:39 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 23 Nov 2015 18:31:01 -0300 perf test: Add callchain order setup for DWARF unwinder test Adding callchain order setup for DWARF unwinder test. The test now runs unwinder for both callee and caller orders. Signed-off-by: Jiri Olsa Tested-by: Milian Wolff Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1447772739-18471-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/dwarf-unwind.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c index 01f0b61..b2357e8 100644 --- a/tools/perf/tests/dwarf-unwind.c +++ b/tools/perf/tests/dwarf-unwind.c @@ -51,6 +51,12 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) "krava_1", "test__dwarf_unwind" }; + /* + * The funcs[MAX_STACK] array index, based on the + * callchain order setup. + */ + int idx = callchain_param.order == ORDER_CALLER ? + MAX_STACK - *cnt - 1 : *cnt; if (*cnt >= MAX_STACK) { pr_debug("failed: crossed the max stack value %d\n", MAX_STACK); @@ -63,8 +69,10 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) return -1; } - pr_debug("got: %s 0x%" PRIx64 "\n", symbol, entry->ip); - return strcmp((const char *) symbol, funcs[(*cnt)++]); + (*cnt)++; + pr_debug("got: %s 0x%" PRIx64 ", expecting %s\n", + symbol, entry->ip, funcs[idx]); + return strcmp((const char *) symbol, funcs[idx]); } __attribute__ ((noinline)) @@ -105,8 +113,16 @@ static int compare(void *p1, void *p2) /* Any possible value should be 'thread' */ struct thread *thread = *(struct thread **)p1; - if (global_unwind_retval == -INT_MAX) + if (global_unwind_retval == -INT_MAX) { + /* Call unwinder twice for both callchain orders. */ + callchain_param.order = ORDER_CALLER; + global_unwind_retval = unwind_thread(thread); + if (!global_unwind_retval) { + callchain_param.order = ORDER_CALLEE; + global_unwind_retval = unwind_thread(thread); + } + } return p1 - p2; } -- 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/