diff options
| author |   Jiri Olsa <jolsa@kernel.org> | 2016-08-07 17:28:30 +0200 |
|---|---|---|
| committer |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-08-23 15:37:33 -0300 |
| commit | 29659ab4e7d02c08d8f2d08db0b0f708bd8b6771 (patch) | |
| tree | 797ba34474ca75fdbc80c7512f94b54411469f0f /tools/perf/ui/stdio/hist.c | |
| parent | perf tools stdio: Display multiple header lines (diff) | |
| download | linux-dev-29659ab4e7d02c08d8f2d08db0b0f708bd8b6771.tar.xz linux-dev-29659ab4e7d02c08d8f2d08db0b0f708bd8b6771.zip | |
perf hists: Add support for header span
Add span argument for header callback function.
The handling of this argument is completely in the hands of the
callback. The only thing the caller ensures is it's zeroed on the
beginning.
Omitting span skipping in hierarchy headers and gtk code.
The c2c code use this to span header lines based on the entries span
configuration.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1470583710-1649-6-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | tools/perf/ui/stdio/hist.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index 9b807cbb56b1..9b65f4a6b35a 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c @@ -549,7 +549,7 @@ static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp, struct perf_hpp_list_node, list); perf_hpp_list__for_each_format(&fmt_node->hpp, fmt) { - fmt->header(fmt, hpp, hists, 0); + fmt->header(fmt, hpp, hists, 0, NULL); fprintf(fp, "%s%s", hpp->buf, sep ?: " "); } @@ -569,7 +569,7 @@ static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp, header_width += fprintf(fp, "+"); first_col = false; - fmt->header(fmt, hpp, hists, 0); + fmt->header(fmt, hpp, hists, 0, NULL); header_width += fprintf(fp, "%s", trim(hpp->buf)); } @@ -645,18 +645,21 @@ static void fprintf_line(struct hists *hists, struct perf_hpp *hpp, struct perf_hpp_fmt *fmt; const char *sep = symbol_conf.field_sep; bool first = true; + int span = 0; hists__for_each_format(hists, fmt) { if (perf_hpp__should_skip(fmt, hists)) continue; - if (!first) + if (!first && !span) fprintf(fp, "%s", sep ?: " "); else first = false; - fmt->header(fmt, hpp, hists, line); - fprintf(fp, "%s", hpp->buf); + fmt->header(fmt, hpp, hists, line, &span); + + if (!span) + fprintf(fp, "%s", hpp->buf); } } |