Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933680Ab0LUJFY (ORCPT ); Tue, 21 Dec 2010 04:05:24 -0500 Received: from mail4.hitachi.co.jp ([133.145.228.5]:46799 "EHLO mail4.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758051Ab0LUJFB (ORCPT ); Tue, 21 Dec 2010 04:05:01 -0500 X-AuditID: b753bd60-a26f8ba000000f8d-f4-4d106dba3694 From: Akihiro Nagai Subject: [PATCH -tip v2 2/6] perf bts: Introduce new sub command 'perf bts trace' To: Arnaldo Carvalho de Melo , Ingo Molnar , Peter Zijlstra , Frederic Weisbecker Cc: linux-kernel@vger.kernel.org, Masami Hiramatsu , 2nddept-manager@sdl.hitachi.co.jp, Akihiro Nagai , Peter Zijlstra , Frederic Weisbecker , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo Date: Tue, 21 Dec 2010 18:05:49 +0900 Message-ID: <20101221090549.8552.26257.stgit@localhost6.localdomain6> In-Reply-To: <20101221090527.8552.41486.stgit@localhost6.localdomain6> References: <20101221090527.8552.41486.stgit@localhost6.localdomain6> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== X-FMFTCR: RANGEB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4739 Lines: 165 Introduce new sub command 'perf bts trace'. This command can parse and print bts log recorded by 'perf bts record'. Usage: - First, record the bts log 'perf bts record ' - Second, parse and print bts log 'perf bts trace' Output: 0xffffffff8146fe0e => 0x0000003806200b20 0x0000003806200b23 => 0x0000003806204910 0xffffffff8146fe0e => 0x0000003806204910 0xffffffff8146fe0e => 0x0000003806204936 0xffffffff8146fe0e => 0x000000380620493d 0x0000003806204981 => 0x00000038062049a3 0x00000038062049a7 => 0x0000003806204988 ... Changes in V2: - Update to the latest -tip tree Signed-off-by: Akihiro Nagai Reviewed-by: Masami Hiramatsu Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-bts.txt | 14 ++++++-- tools/perf/builtin-bts.c | 56 +++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/tools/perf/Documentation/perf-bts.txt b/tools/perf/Documentation/perf-bts.txt index 55a2fe6..5920dcc 100644 --- a/tools/perf/Documentation/perf-bts.txt +++ b/tools/perf/Documentation/perf-bts.txt @@ -3,22 +3,30 @@ perf-bts(1) NAME ---- -perf-bts - Record branch-trace-store log +perf-bts - Record and print branch-trace-store log SYNOPSIS -------- [verse] -'perf bts' record +'perf bts' [] {record|trace} DESCRIPTION ----------- -This command can record branch-trace-store log. +This command can record and print branch-trace-store log. Branch-trace-store is a facility of processors. It can record address of branch to/from on every branch instruction and interrupt. 'perf bts record ' records branch-trace-store log while specified command is executing. And, save to the file "perf.data". +'perf bts trace' parses recorded branch-trace-store log and prints it. + +OPTIONS +------- +-i:: +--input=:: + Specify input file name to analyze. + SEE ALSO -------- linkperf:perf-record[1] diff --git a/tools/perf/builtin-bts.c b/tools/perf/builtin-bts.c index 587cfad..0d546d8 100644 --- a/tools/perf/builtin-bts.c +++ b/tools/perf/builtin-bts.c @@ -1,10 +1,26 @@ #include "builtin.h" #include "perf.h" #include "util/parse-options.h" +#include "util/session.h" +#include "util/cache.h" +#include "util/trace-event.h" +#include + +/* format string of specifying min width to print address */ +#if __WORDSIZE == 32 +#define FMT_ADDR_WIDTH "10" /* length of "0x" + 32bit address */ +#else +#define FMT_ADDR_WIDTH "18" /* length of "0x" + 64bit address */ +#endif +/* format string to print address */ +#define FMT_ADDR "%#0" FMT_ADDR_WIDTH "llx" + +/* default input file name to analyze */ +static const char *input_name = "perf.data"; static const char * const bts_usage[] = { - "perf bts record ", - NULL, + "perf bts [] {record|trace}", + NULL }; /* arguments to call 'perf record' */ @@ -16,11 +32,41 @@ static const char * const record_args[] = { "-d", }; -/* dummy struct option to call parse_options() */ static const struct option bts_options[] = { + OPT_STRING('i', "input", &input_name, "file", "input file name"), OPT_END() }; +static int process_sample_event(event_t *event __unused, + struct sample_data *sample, struct perf_session *session __unused) +{ + /* sample->ip is 'from address', sample->addr is 'to address' */ + printf(FMT_ADDR " => " FMT_ADDR "\n", sample->ip, sample->addr); + + return 0; +} + +static struct perf_event_ops event_ops = { + .sample = process_sample_event, + .ordered_samples = false, +}; + +static int __cmd_trace(void) +{ + struct perf_session *session; + + session = perf_session__new(input_name, O_RDONLY, 0, false); + if (!session) { + fprintf(stderr, "failed to create perf_session.\n"); + return -ENOMEM; + } + + perf_session__process_events(session, &event_ops); + perf_session__delete(session); + + return 0; +} + static int __cmd_record(int argc, const char **argv) { unsigned int rec_argc, i, j; @@ -55,6 +101,10 @@ int cmd_bts(int argc, const char **argv, const char *prefix __used) if (!strncmp(argv[0], "record", 6)) return __cmd_record(argc, argv); + else if (!strncmp(argv[0], "trace", 5)) { + setup_pager(); + return __cmd_trace(); + } else usage_with_options(bts_usage, bts_options); -- 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/