aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2016-11-21 16:33:27 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-11-23 08:44:04 -0500
commite8c5fe101e55e4c45a2859cea2b4c374595f8867 (patch)
tree8c3f14a3f8066ff0160cff7d8054addddf51215c /tools
parent7b4b82bced0755aecc026d8c14c2608aa0f9e89b (diff)
perf c2c report: Setup browser after opening perf.data
Because of the early browser switch we won't get possible error messages, as it will clear the screen right after showing the message, e.g.: Before: $ sudo perf c2c report -d lcl $ After: $ sudo perf c2c report -d lcl File perf.data not owned by current user or root (use -f to override) $ $ ls -la perf.data -rw-------. 1 acme acme 26648 Nov 22 15:11 perf.data $ Signed-off-by: Jiri Olsa <jolsa@redhat.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Don Zickus <dzickus@redhat.com> Cc: Joe Mario <jmario@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1479764011-10732-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-c2c.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index c6d0dda594d9..15addb06d611 100644
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -2535,13 +2535,6 @@ static int perf_c2c__report(int argc, const char **argv)
2535 if (c2c.stats_only) 2535 if (c2c.stats_only)
2536 c2c.use_stdio = true; 2536 c2c.use_stdio = true;
2537 2537
2538 if (c2c.use_stdio)
2539 use_browser = 0;
2540 else
2541 use_browser = 1;
2542
2543 setup_browser(false);
2544
2545 if (!input_name || !strlen(input_name)) 2538 if (!input_name || !strlen(input_name))
2546 input_name = "perf.data"; 2539 input_name = "perf.data";
2547 2540
@@ -2568,6 +2561,7 @@ static int perf_c2c__report(int argc, const char **argv)
2568 pr_debug("No memory for session\n"); 2561 pr_debug("No memory for session\n");
2569 goto out; 2562 goto out;
2570 } 2563 }
2564
2571 err = setup_nodes(session); 2565 err = setup_nodes(session);
2572 if (err) { 2566 if (err) {
2573 pr_err("Failed setup nodes\n"); 2567 pr_err("Failed setup nodes\n");
@@ -2587,6 +2581,13 @@ static int perf_c2c__report(int argc, const char **argv)
2587 goto out_session; 2581 goto out_session;
2588 } 2582 }
2589 2583
2584 if (c2c.use_stdio)
2585 use_browser = 0;
2586 else
2587 use_browser = 1;
2588
2589 setup_browser(false);
2590
2590 err = perf_session__process_events(session); 2591 err = perf_session__process_events(session);
2591 if (err) { 2592 if (err) {
2592 pr_err("failed to process sample\n"); 2593 pr_err("failed to process sample\n");