perf hists: Print number of samples, not the period sum
Commit-ID: 69cf0218d1f0d1d8f14687fec070126021502451 Gitweb: http://git.kernel.org/tip/69cf0218d1f0d1d8f14687fec070126021502451 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 17 Feb 2011 10:37:23 -0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 25 Feb 2011 10:55:03 +0100
perf hists: Print number of samples, not the period sum
So that we match the header where we state the number of events with the "Samples" column when using 'perf report -n/--show-nr-samples':
[root@emilia ~]# perf record -a sleep 1
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.111 MB perf.data (~4860 samples) ] [root@emilia ~]# perf report --stdio --show-nr-samples
# Events: 11 cycles
#
# Overhead Samples Command Shared Object Symbol
# ........ .......... ........... .................. ............................
#
16.65% 1 sleep [kernel.kallsyms] [k] unmap_vmas
16.10% 1 perf libpthread-2.12.so [.] __pthread_cleanup_push_defer
15.79% 2 perf [kernel.kallsyms] [k] format_decode
12.88% 1 kworker/1:2 [kernel.kallsyms] [k] cache_reap
10.69% 1 swapper [kernel.kallsyms] [k] _raw_spin_lock
7.55% 1 sleep [kernel.kallsyms] [k] prepare_exec_creds
6.00% 1 perf [jbd2] [k] start_this_handle
5.29% 1 perf [kernel.kallsyms] [k] seq_read
4.75% 1 perf [kernel.kallsyms] [k] get_pid_task
4.30% 1 perf [kernel.kallsyms] [k] _raw_spin_unlock_irqrestore #
# (For a higher level overview, try: perf report --sort comm,dso) #
[root@emilia ~]#
Reported-by Stephane Eranian <[email protected]>
Reported-by Cliff Wickman <[email protected]>
Acked-by Stephane Eranian <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Tom Zanussi <[email protected]>
Cc <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
[ cherry-picked it from perf/core, as it has been reported by others as well. ]
Signed-off-by Ingo Molnar <[email protected]>
--- tools/perf/util/hist.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +5 -2
@@ -585,6 +585,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size, {struct sort_entry *se;u64 period, total, period_sys, period_us, period_guest_sys, period_guest_us; +u64 nr_events;const char *sep = symbol_conf.field_sep;int ret;
@@ -593,6 +594,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size,if (pair_hists) { period = self->pair ? self->pair->period :0 ; + nr_events = self->pair ? self->pair->nr_events :0 ; total = pair_hists->stats.total_period; period_sys = self->pair ? self->pair->period_sys :0 ; period_us = self->pair ? self->pair->period_us :0 ;
@@ -600,6 +602,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size, period_guest_us = self->pair ? self->pair->period_guest_us :0 ; }else { period = self->period; + nr_events = self->nr_events; total = session_total; period_sys = self->period_sys; period_us = self->period_us;
@@ -640,9 +643,9 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size,if (symbol_conf.show_nr_samples) {if (sep) - ret +=snprintf (s + ret, size - ret,"%c%" PRIu64, *sep, period); + ret +=snprintf (s + ret, size - ret,"%c%" PRIu64, *sep, nr_events);else - ret +=snprintf (s + ret, size - ret,"%11" PRIu64, period); + ret +=snprintf (s + ret, size - ret,"%11" PRIu64, nr_events); }if (pair_hists) {