aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/ui/stdio
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2012-10-04 08:49:38 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-10-04 12:29:45 -0400
commit41724e4cf6c443d2dc575669b8555f0e2ae427a9 (patch)
treec9f7453fef649460c13378f356f59093f2f0d952 /tools/perf/ui/stdio
parent5395a04841fcdd9220177f2c21353fe6d4cd0729 (diff)
perf tools: Removing hists pair argument from output path
The hists pointer is now part of the 'struct hist_entry'. And since the overhead and baseline columns are split now, there's no reason to pass it through the output path. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1349354994-17853-5-git-send-email-namhyung@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/ui/stdio')
-rw-r--r--tools/perf/ui/stdio/hist.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 0aa6776caba5..1340c93aa619 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -307,8 +307,7 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
307} 307}
308 308
309static int hist_entry__fprintf(struct hist_entry *he, size_t size, 309static int hist_entry__fprintf(struct hist_entry *he, size_t size,
310 struct hists *hists, struct hists *pair_hists, 310 struct hists *hists, u64 total_period, FILE *fp)
311 u64 total_period, FILE *fp)
312{ 311{
313 char bf[512]; 312 char bf[512];
314 int ret; 313 int ret;
@@ -316,7 +315,6 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
316 .buf = bf, 315 .buf = bf,
317 .size = size, 316 .size = size,
318 .total_period = total_period, 317 .total_period = total_period,
319 .ptr = pair_hists,
320 }; 318 };
321 bool color = !symbol_conf.field_sep; 319 bool color = !symbol_conf.field_sep;
322 320
@@ -335,8 +333,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
335 return ret; 333 return ret;
336} 334}
337 335
338size_t hists__fprintf(struct hists *hists, struct hists *pair, 336size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
339 bool show_header, int max_rows,
340 int max_cols, FILE *fp) 337 int max_cols, FILE *fp)
341{ 338{
342 struct sort_entry *se; 339 struct sort_entry *se;
@@ -351,7 +348,6 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
351 struct perf_hpp dummy_hpp = { 348 struct perf_hpp dummy_hpp = {
352 .buf = bf, 349 .buf = bf,
353 .size = sizeof(bf), 350 .size = sizeof(bf),
354 .ptr = pair,
355 }; 351 };
356 bool first = true; 352 bool first = true;
357 353
@@ -453,7 +449,7 @@ print_entries:
453 if (h->filtered) 449 if (h->filtered)
454 continue; 450 continue;
455 451
456 ret += hist_entry__fprintf(h, max_cols, hists, pair, 452 ret += hist_entry__fprintf(h, max_cols, hists,
457 total_period, fp); 453 total_period, fp);
458 454
459 if (max_rows && ++nr_rows >= max_rows) 455 if (max_rows && ++nr_rows >= max_rows)