summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2009-12-16 12:27:10 -0200
committerIngo Molnar <mingo@elte.hu>2009-12-16 16:51:50 +0100
commit3e6055ab981dfd379a1b9bd54b556e81ae9c215f (patch)
treee890c792d89b9433d6ee5e91cfc1dd012d9e26dc
parent4ecf84d086fbeca5a622e971fff013b291dbde86 (diff)
downloadlinux-3e6055ab981dfd379a1b9bd54b556e81ae9c215f.tar.bz2
perf session: Move perf report specific hits out of perf_session__fprintf_hists
Those don't make sense for tools such as 'perf diff'. Signed-off-by: Arnaldo Carvalho de Melo <acme@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: <1260973631-28035-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--tools/perf/builtin-report.c5
-rw-r--r--tools/perf/util/hist.c11
2 files changed, 5 insertions, 11 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 24d20e7d125a..c4f3a08f7c48 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -224,7 +224,12 @@ static int __cmd_report(void)
perf_session__collapse_resort(session);
perf_session__output_resort(session, session->events_stats.total);
+ fprintf(stdout, "# Samples: %ld\n#\n", session->events_stats.total);
perf_session__fprintf_hists(session, stdout);
+ if (sort_order == default_sort_order &&
+ parent_pattern == default_parent_pattern)
+ fprintf(stdout, "#\n# (For a higher level overview, try: perf report --sort comm,dso)\n#\n");
+
if (show_threads) {
bool raw_printing_style = !strcmp(pretty_printing_style, "raw");
perf_read_values_display(stdout, &show_threads_values,
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 270eb8f3dcee..6e416a62e0d6 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -515,9 +515,6 @@ size_t perf_session__fprintf_hists(struct perf_session *self, FILE *fp)
init_rem_hits();
- fprintf(fp, "# Samples: %ld\n", self->events_stats.total);
- fprintf(fp, "#\n");
-
fprintf(fp, "# Overhead");
if (symbol_conf.show_nr_samples) {
if (symbol_conf.field_sep)
@@ -578,14 +575,6 @@ print_entries:
ret += hist_entry__fprintf(fp, pos, self);
}
- if (sort_order == default_sort_order &&
- parent_pattern == default_parent_pattern) {
- fprintf(fp, "#\n");
- fprintf(fp, "# (For a higher level overview, try: perf report --sort comm,dso)\n");
- fprintf(fp, "#\n");
- }
- fprintf(fp, "\n");
-
free(rem_sq_bracket);
return ret;