From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Milian Wolff <milian.wolff@kdab.com>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 3/3] perf test: Add callchain order setup for DWARF unwinder test
Date: Tue, 17 Nov 2015 16:05:39 +0100 [thread overview]
Message-ID: <1447772739-18471-4-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1447772739-18471-1-git-send-email-jolsa@kernel.org>
Adding callchain order setup for DWARF unwinder test. The test
now runs unwinder for both callee and caller orders.
Link: http://lkml.kernel.org/n/tip-zz3q3vrre3re8efdw3c89aef@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
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 07221793a3ac..05d9ba387c43 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;
}
--
2.4.3
next prev parent reply other threads:[~2015-11-17 15:06 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 15:05 [PATCH 0/3] perf tools DWARF libunwind: Add callchain order support Jiri Olsa
2015-11-17 15:05 ` [PATCH 1/3] perf tools: Move initial entry call into get_entries function Jiri Olsa
2015-11-26 8:18 ` [tip:perf/core] perf callchain: " tip-bot for Jiri Olsa
2015-11-17 15:05 ` [PATCH 2/3] perf tools: Add callchain order support for libunwind DWARF unwinder Jiri Olsa
2015-11-18 4:13 ` Wangnan (F)
2015-11-18 5:41 ` Namhyung Kim
2015-11-18 7:26 ` Wangnan (F)
2015-11-22 15:27 ` Namhyung Kim
2015-11-18 8:25 ` Jiri Olsa
2015-11-18 9:25 ` Namhyung Kim
2015-11-18 8:26 ` Jiri Olsa
2015-11-18 7:52 ` [PATCHv2 " Jiri Olsa
2015-11-18 9:29 ` Wangnan (F)
2015-11-26 8:18 ` [tip:perf/core] perf callchain: Add " tip-bot for Jiri Olsa
2015-11-18 7:54 ` [PATCH 2/3] perf tools: Add callchain " Jiri Olsa
2015-11-18 7:59 ` Wangnan (F)
2015-11-18 8:12 ` Jiri Olsa
2015-11-17 15:05 ` Jiri Olsa [this message]
2015-11-26 8:19 ` [tip:perf/core] perf test: Add callchain order setup for DWARF unwinder test tip-bot for Jiri Olsa
2015-11-18 4:22 ` [PATCH 0/3] perf tools DWARF libunwind: Add callchain order support Wangnan (F)
2015-11-19 11:22 ` [PATCH 4/3] perf tools: Add callchain order support for libdw DWARF unwinder Jiri Olsa
2015-11-19 12:10 ` Wangnan (F)
2015-11-19 12:18 ` Wangnan (F)
2015-11-19 13:01 ` [PATCHv2 " Jiri Olsa
2015-11-26 8:19 ` [tip:perf/core] perf callchain: Add " tip-bot for Jiri Olsa
2015-11-19 19:10 ` [PATCH 0/3] perf tools DWARF libunwind: Add callchain order support Arnaldo Carvalho de Melo
2015-11-20 8:38 ` Jiri Olsa
2015-11-22 19:13 ` Milian Wolff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447772739-18471-4-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=milian.wolff@kdab.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.