| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 24 Jul 2012 18:01:28 +0900
From: Namhyung Kim <namhyung@...nel.org>
To: Arnaldo Carvalho de Melo <acme@...stprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Mackerras <paulus@...ba.org>,
Ingo Molnar <mingo@...nel.org>,
LKML <linux-kernel@...r.kernel.org>,
Stephane Eranian <eranian@...gle.com>,
Jiri Olsa <jolsa@...hat.com>,
Ulrich Drepper <drepper@...il.com>,
Andi Kleen <andi@...stfloor.org>
Subject: [PATCH 07/12] perf ui/hist: Add support to group viewing
Show group members' overhead also when showing the leader's.
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Signed-off-by: Namhyung Kim <namhyung@...nel.org>
---
tools/perf/ui/hist.c | 132 +++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 119 insertions(+), 13 deletions(-)
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 8092a621bbec..57d00b75b6fa 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -4,32 +4,83 @@
#include "../util/util.h"
#include "../util/hist.h"
#include "../util/sort.h"
+#include "../util/evsel.h"
static int hpp_header_overhead(struct hist_print_context *ctx)
{
+ int len = 8;
+ const char *str = "Overhead";
+
if (ctx->pair_hists)
- return scnprintf(ctx->s, ctx->size, "Baseline");
- else
- return scnprintf(ctx->s, ctx->size, "Overhead");
+ str = "Baseline";
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+
+ BUG_ON(!perf_evsel__is_group_leader(evsel));
+
+ len *= evsel->nr_children + 1;
+ }
+ return scnprintf(ctx->s, ctx->size, "%-*s", len, str);
}
static int hpp_width_overhead(struct hist_print_context *ctx __used)
{
- return 8;
+ int len = 8;
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ len *= evsel->nr_children + 1;
+ }
+ return len;
}
static int hpp_color_overhead(struct hist_print_context *ctx,
struct hist_entry *he)
{
+ int ret;
double percent = 100.0 * he->stat.period / ctx->total_period;
- return percent_color_snprintf(ctx->s, ctx->size, " %5.2f%%", percent);
+
+ ret = percent_color_snprintf(ctx->s, ctx->size, " %5.2f%%", percent);
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ int i;
+
+ for (i = 0; i < evsel->nr_children; i++) {
+ u64 period = he->group_stats[i].period;
+ u64 total_period = ctx->hists->group_stats[i].total_period;
+
+ percent = 100.0 * period / total_period;
+ ret += percent_color_snprintf(ctx->s + ret, ctx->size - ret,
+ " %5.2f%%", percent);
+ }
+ }
+ return ret;
}
static int hpp_entry_overhead(struct hist_print_context *ctx,
struct hist_entry *he)
{
+ int ret;
double percent = 100.0 * he->stat.period / ctx->total_period;
- return scnprintf(ctx->s, ctx->size, " %5.2f%%", percent);
+
+ ret = scnprintf(ctx->s, ctx->size, " %5.2f%%", percent);
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ int i;
+
+ for (i = 0; i < evsel->nr_children; i++) {
+ u64 period = he->group_stats[i].period;
+ u64 total_period = ctx->hists->group_stats[i].total_period;
+
+ percent = 100.0 * period / total_period;
+ ret += scnprintf(ctx->s + ret, ctx->size - ret,
+ " %5.2f%%", percent);
+ }
+ }
+ return ret;
}
static int hpp_header_overhead_sys(struct hist_print_context *ctx)
@@ -130,34 +181,86 @@ static int hpp_entry_overhead_guest_us(struct hist_print_context *ctx,
static int hpp_header_samples(struct hist_print_context *ctx)
{
- return scnprintf(ctx->s, ctx->size, " Samples ");
+ int len = 11;
+ const char str[] = " Samples ";
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ len += (len + 2) * evsel->nr_children;
+ }
+ return scnprintf(ctx->s, ctx->size, "%-*s", len, str);
}
static int hpp_width_samples(struct hist_print_context *ctx __used)
{
- return 11;
+ int len = 11;
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ len += (len + 2) * evsel->nr_children;
+ }
+ return len;
}
static int hpp_entry_samples(struct hist_print_context *ctx,
struct hist_entry *he)
{
- return scnprintf(ctx->s, ctx->size, "%11" PRIu64, he->stat.nr_events);
+ int ret;
+
+ ret = scnprintf(ctx->s, ctx->size, "%11" PRIu64, he->stat.nr_events);
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ int i;
+
+ for (i = 0; i < evsel->nr_children; i++) {
+ ret += scnprintf(ctx->s + ret, ctx->size - ret,
+ " %11" PRIu64, he->group_stats[i].nr_events);
+ }
+ }
+ return ret;
}
static int hpp_header_period(struct hist_print_context *ctx)
{
- return scnprintf(ctx->s, ctx->size, " Period ");
+ int len = 12;
+ const char str[] = " Period ";
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ len += (len + 2) * evsel->nr_children;
+ }
+ return scnprintf(ctx->s, ctx->size, "%-*s", len, str);
}
static int hpp_width_period(struct hist_print_context *ctx __used)
{
- return 12;
+ int len = 12;
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ len += (len + 2) * evsel->nr_children;
+ }
+ return len;
}
static int hpp_entry_period(struct hist_print_context *ctx,
struct hist_entry *he)
{
- return scnprintf(ctx->s, ctx->size, "%12" PRIu64, he->stat.period);
+ int ret;
+
+ ret = scnprintf(ctx->s, ctx->size, "%12" PRIu64, he->stat.period);
+
+ if (symbol_conf.report_group) {
+ struct perf_evsel *evsel = hists_2_evsel(ctx->hists);
+ int i;
+
+ for (i = 0; i < evsel->nr_children; i++) {
+ ret += scnprintf(ctx->s + ret, ctx->size - ret,
+ " %12" PRIu64, he->group_stats[i].period);
+ }
+ }
+ return ret;
}
static int hpp_header_delta(struct hist_print_context *ctx)
@@ -801,6 +904,9 @@ unsigned int hists__sort_list_width(struct hists *hists)
{
struct sort_entry *se;
int i, ret = 0;
+ struct hist_print_context dummy_ctx = {
+ .hists = hists,
+ };
for (i = 0; i < PERF_HPP__MAX_INDEX; i++) {
if (!hpp_functions[i].cond)
@@ -808,7 +914,7 @@ unsigned int hists__sort_list_width(struct hists *hists)
if (i)
ret += 2;
- ret += hpp_functions[i].width(NULL);
+ ret += hpp_functions[i].width(&dummy_ctx);
}
list_for_each_entry(se, &hist_entry__sort_list, list)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists