From 5f1cfc9dd194ba22314c1e3a85fbda06ad529ef3 Mon Sep 17 00:00:00 2001 From: Ashay Rane Date: Thu, 5 Apr 2012 21:01:01 -0500 Subject: [PATCH] --- yaml --- r: 304811 b: refs/heads/master c: cc68628096b813010f30f69fcf7d1832d18fa767 h: refs/heads/master i: 304809: 472befbb8e447c9b8270f28e770e5b189aeb9b58 304807: b6edcaad0d66c61057ad1dc8ad2651378b74b7a0 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-report.c | 11 +++++++---- trunk/tools/perf/util/ui/browsers/hists.c | 10 +++++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e5e9bdcfa8ea..a847221b9faf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08be4eeda40ea813fa326036fdaf8fa7667eb021 +refs/heads/master: cc68628096b813010f30f69fcf7d1832d18fa767 diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c index 2e317438980b..cec2b8cee80c 100644 --- a/trunk/tools/perf/builtin-report.c +++ b/trunk/tools/perf/builtin-report.c @@ -296,12 +296,15 @@ static size_t hists__fprintf_nr_sample_events(struct hists *self, { size_t ret; char unit; - unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE]; + unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE]; + u64 nr_events = self->stats.total_period; - nr_events = convert_unit(nr_events, &unit); - ret = fprintf(fp, "# Events: %lu%c", nr_events, unit); + nr_samples = convert_unit(nr_samples, &unit); + ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit); if (evname != NULL) - ret += fprintf(fp, " %s", evname); + ret += fprintf(fp, " of event '%s'", evname); + + ret += fprintf(fp, "\n# Event count (approx.): %lu", nr_events); return ret + fprintf(fp, "\n#\n"); } diff --git a/trunk/tools/perf/util/ui/browsers/hists.c b/trunk/tools/perf/util/ui/browsers/hists.c index 2f83e5dc9967..1b820ed2a049 100644 --- a/trunk/tools/perf/util/ui/browsers/hists.c +++ b/trunk/tools/perf/util/ui/browsers/hists.c @@ -840,10 +840,14 @@ static int hists__browser_title(struct hists *self, char *bf, size_t size, int printed; const struct dso *dso = self->dso_filter; const struct thread *thread = self->thread_filter; - unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE]; + unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE]; + u64 nr_events = self->stats.total_period; + + nr_samples = convert_unit(nr_samples, &unit); + printed = scnprintf(bf, size, + "Samples: %lu%c of event '%s', Event count (approx.): %lu", + nr_samples, unit, ev_name, nr_events); - nr_events = convert_unit(nr_events, &unit); - printed = scnprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name); if (self->uid_filter_str) printed += snprintf(bf + printed, size - printed,