diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-03-11 18:12:44 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-12 04:28:46 -0500 |
commit | f9224c5c944b60cf709db4adf1f5195264b8d194 (patch) | |
tree | 6c40539b5111a6e9a021e0fe6e22e95997217c3c /tools/perf/builtin-report.c | |
parent | dd2ee78dd8e4c6d6f1a333fd60c3dd27d1b07042 (diff) |
perf report: Implement initial UI using newt
Newt has widespread availability and provides a rather simple
API as can be seen by the size of this patch.
The work needed to support it will benefit other frontends too.
In this initial patch it just checks if the output is a tty, if
not it falls back to the previous behaviour, also if
newt-devel/libnewt-dev is not installed the previous behaviour
is maintaned.
Pressing enter on a symbol will annotate it, ESC in the
annotation window will return to the report symbol list.
More work will be done to remove the special casing in
color_fprintf, stop using fmemopen/FILE in the printing of
hist_entries, etc.
Also the annotation doesn't need to be done via spawning "perf
annotate" and then browsing its output, we can do better by
calling directly the builtin-annotate.c functions, that would
then be moved to tools/perf/util/annotate.c and shared with perf
top, etc
But lets go by baby steps, this patch already improves perf
usability by allowing to quickly do annotations on symbols from
the report screen and provides a first experimentation with
libnewt/TUI integration of tools.
Tested on RHEL5 and Fedora12 X86_64 and on Debian PARISC64 to
browse a perf.data file collected on a Fedora12 x86_64 box.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Avi Kivity <avi@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1268349164-5822-5-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index f815de25d0fc..1f9f8695f055 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -267,6 +267,7 @@ static int __cmd_report(void) | |||
267 | int ret = -EINVAL; | 267 | int ret = -EINVAL; |
268 | struct perf_session *session; | 268 | struct perf_session *session; |
269 | struct rb_node *next; | 269 | struct rb_node *next; |
270 | const char *help = "For a higher level overview, try: perf report --sort comm,dso"; | ||
270 | 271 | ||
271 | session = perf_session__new(input_name, O_RDONLY, force); | 272 | session = perf_session__new(input_name, O_RDONLY, force); |
272 | if (session == NULL) | 273 | if (session == NULL) |
@@ -301,30 +302,38 @@ static int __cmd_report(void) | |||
301 | stats = rb_entry(next, struct event_stat_id, rb_node); | 302 | stats = rb_entry(next, struct event_stat_id, rb_node); |
302 | perf_session__collapse_resort(&stats->hists); | 303 | perf_session__collapse_resort(&stats->hists); |
303 | perf_session__output_resort(&stats->hists, stats->stats.total); | 304 | perf_session__output_resort(&stats->hists, stats->stats.total); |
304 | if (rb_first(&session->stats_by_id) == | ||
305 | rb_last(&session->stats_by_id)) | ||
306 | fprintf(stdout, "# Samples: %Ld\n#\n", | ||
307 | stats->stats.total); | ||
308 | else | ||
309 | fprintf(stdout, "# Samples: %Ld %s\n#\n", | ||
310 | stats->stats.total, | ||
311 | __event_name(stats->type, stats->config)); | ||
312 | 305 | ||
313 | perf_session__fprintf_hists(&stats->hists, NULL, false, stdout, | 306 | if (use_browser) |
307 | perf_session__browse_hists(&stats->hists, | ||
308 | stats->stats.total, help); | ||
309 | else { | ||
310 | if (rb_first(&session->stats_by_id) == | ||
311 | rb_last(&session->stats_by_id)) | ||
312 | fprintf(stdout, "# Samples: %Ld\n#\n", | ||
313 | stats->stats.total); | ||
314 | else | ||
315 | fprintf(stdout, "# Samples: %Ld %s\n#\n", | ||
316 | stats->stats.total, | ||
317 | __event_name(stats->type, stats->config)); | ||
318 | |||
319 | perf_session__fprintf_hists(&stats->hists, NULL, false, stdout, | ||
314 | stats->stats.total); | 320 | stats->stats.total); |
315 | fprintf(stdout, "\n\n"); | 321 | fprintf(stdout, "\n\n"); |
322 | } | ||
323 | |||
316 | next = rb_next(&stats->rb_node); | 324 | next = rb_next(&stats->rb_node); |
317 | } | 325 | } |
318 | 326 | ||
319 | if (sort_order == default_sort_order && | 327 | if (!use_browser && sort_order == default_sort_order && |
320 | parent_pattern == default_parent_pattern) | 328 | parent_pattern == default_parent_pattern) { |
321 | fprintf(stdout, "#\n# (For a higher level overview, try: perf report --sort comm,dso)\n#\n"); | 329 | fprintf(stdout, "#\n# (%s)\n#\n", help); |
322 | 330 | ||
323 | if (show_threads) { | 331 | if (show_threads) { |
324 | bool raw_printing_style = !strcmp(pretty_printing_style, "raw"); | 332 | bool style = !strcmp(pretty_printing_style, "raw"); |
325 | perf_read_values_display(stdout, &show_threads_values, | 333 | perf_read_values_display(stdout, &show_threads_values, |
326 | raw_printing_style); | 334 | style); |
327 | perf_read_values_destroy(&show_threads_values); | 335 | perf_read_values_destroy(&show_threads_values); |
336 | } | ||
328 | } | 337 | } |
329 | out_delete: | 338 | out_delete: |
330 | perf_session__delete(session); | 339 | perf_session__delete(session); |
@@ -447,7 +456,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) | |||
447 | { | 456 | { |
448 | argc = parse_options(argc, argv, options, report_usage, 0); | 457 | argc = parse_options(argc, argv, options, report_usage, 0); |
449 | 458 | ||
450 | setup_pager(); | 459 | setup_browser(); |
451 | 460 | ||
452 | if (symbol__init() < 0) | 461 | if (symbol__init() < 0) |
453 | return -1; | 462 | return -1; |