p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf report: Use hierarchy hpp list on stdio 

Now hpp formats are linked using perf_hpp_list_node when hierarchy is
enabled.  Use this info to print entries with multiple sort keys in a
single hierarchy properly.

For example, the below example shows using 4 sort keys with 2 levels.

  $ perf report --hierarchy -s '{prev_pid,prev_comm},{next_pid,next_comm}' \
   --percent-limit 1 -i perf.data.sched
  ...
  #    Overhead  prev_pid+prev_comm / next_pid+next_comm
  # ...........  .......................................
  #
      22.36%     0  swapper/0
          9.48%     17773  transmission-gt
          5.25%     109  kworker/0:1H
          1.53%     6524  Xephyr
      21.39%     17773  transmission-gt
          9.52%     0  swapper/0
          9.04%     0  swapper/2
          1.78%     0  swapper/3

Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1457361308-514-6-git-send-email-namhyung@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Namhyung Kim 2016-03-07 16:44:49 -03:00 committed by Ingo Molnar
parent 2dbbe9f26c
commit f58c95e344
1 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
tools/perf/ui/stdio/hist.c
View File

@ -417,6 +417,7 @@ static int hist_entry__hierarchy_fprintf(struct hist_entry *he,
{ {
const char *sep = symbol_conf.field_sep; const char *sep = symbol_conf.field_sep;
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
struct perf_hpp_list_node *fmt_node;
char *buf = hpp->buf; char *buf = hpp->buf;
size_t size = hpp->size; size_t size = hpp->size;
int ret, printed = 0; int ret, printed = 0;
@ -428,10 +429,10 @@ static int hist_entry__hierarchy_fprintf(struct hist_entry *he,
ret = scnprintf(hpp->buf, hpp->size, "%*s", he->depth * HIERARCHY_INDENT, ""); ret = scnprintf(hpp->buf, hpp->size, "%*s", he->depth * HIERARCHY_INDENT, "");
advance_hpp(hpp, ret); advance_hpp(hpp, ret);
hists__for_each_format(he->hists, fmt) { /* the first hpp_list_node is for overhead columns */
if (perf_hpp__is_sort_entry(fmt) || perf_hpp__is_dynamic_entry(fmt)) fmt_node = list_first_entry(&hists->hpp_formats,
break; struct perf_hpp_list_node, list);
perf_hpp_list__for_each_format(&fmt_node->hpp, fmt) {
/* /*
* If there's no field_sep, we still need * If there's no field_sep, we still need
* to display initial ' '. * to display initial ' '.
@ -529,80 +530,85 @@ static int print_hierarchy_indent(const char *sep, int indent,
static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp, static int print_hierarchy_header(struct hists *hists, struct perf_hpp *hpp,
const char *sep, FILE *fp) const char *sep, FILE *fp)
{ {
bool first = true; bool first_node, first_col;
int indent; int indent;
int depth; int depth;
unsigned width = 0; unsigned width = 0;
unsigned header_width = 0; unsigned header_width = 0;
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
struct perf_hpp_list_node *fmt_node;
indent = hists->nr_hpp_node; indent = hists->nr_hpp_node;
/* preserve max indent depth for column headers */ /* preserve max indent depth for column headers */
print_hierarchy_indent(sep, indent, spaces, fp); print_hierarchy_indent(sep, indent, spaces, fp);
hists__for_each_format(hists, fmt) { /* the first hpp_list_node is for overhead columns */
if (perf_hpp__is_sort_entry(fmt) || perf_hpp__is_dynamic_entry(fmt)) fmt_node = list_first_entry(&hists->hpp_formats,
break; struct perf_hpp_list_node, list);
if (!first)
fprintf(fp, "%s", sep ?: " ");
else
first = false;
perf_hpp_list__for_each_format(&fmt_node->hpp, fmt) {
fmt->header(fmt, hpp, hists_to_evsel(hists)); fmt->header(fmt, hpp, hists_to_evsel(hists));
fprintf(fp, "%s", hpp->buf); fprintf(fp, "%s%s", hpp->buf, sep ?: " ");
} }
/* combine sort headers with ' / ' */ /* combine sort headers with ' / ' */
first = true; first_node = true;
hists__for_each_format(hists, fmt) { list_for_each_entry_continue(fmt_node, &hists->hpp_formats, list) {
if (!perf_hpp__is_sort_entry(fmt) && !perf_hpp__is_dynamic_entry(fmt)) if (!first_node)
continue; header_width += fprintf(fp, " / ");
first_node = false;
first_col = true;
perf_hpp_list__for_each_format(&fmt_node->hpp, fmt) {
if (perf_hpp__should_skip(fmt, hists)) if (perf_hpp__should_skip(fmt, hists))
continue; continue;
if (!first) if (!first_col)
header_width += fprintf(fp, " / "); header_width += fprintf(fp, "+");
else { first_col = false;
fprintf(fp, "%s", sep ?: " ");
first = false;
}
fmt->header(fmt, hpp, hists_to_evsel(hists)); fmt->header(fmt, hpp, hists_to_evsel(hists));
rtrim(hpp->buf); rtrim(hpp->buf);
header_width += fprintf(fp, "%s", ltrim(hpp->buf)); header_width += fprintf(fp, "%s", ltrim(hpp->buf));
} }
}
fprintf(fp, "\n# "); fprintf(fp, "\n# ");
/* preserve max indent depth for initial dots */ /* preserve max indent depth for initial dots */
print_hierarchy_indent(sep, indent, dots, fp); print_hierarchy_indent(sep, indent, dots, fp);
first = true; /* the first hpp_list_node is for overhead columns */
hists__for_each_format(hists, fmt) { fmt_node = list_first_entry(&hists->hpp_formats,
if (perf_hpp__is_sort_entry(fmt) || perf_hpp__is_dynamic_entry(fmt)) struct perf_hpp_list_node, list);
break;
if (!first) first_col = true;
fprintf(fp, "%s", sep ?: " "); perf_hpp_list__for_each_format(&fmt_node->hpp, fmt) {
else if (!first_col)
first = false; fprintf(fp, "%s", sep ?: "..");
first_col = false;
width = fmt->width(fmt, hpp, hists_to_evsel(hists)); width = fmt->width(fmt, hpp, hists_to_evsel(hists));
fprintf(fp, "%.*s", width, dots); fprintf(fp, "%.*s", width, dots);
} }
depth = 0; depth = 0;
hists__for_each_format(hists, fmt) { list_for_each_entry_continue(fmt_node, &hists->hpp_formats, list) {
if (!perf_hpp__is_sort_entry(fmt) && !perf_hpp__is_dynamic_entry(fmt)) first_col = true;
continue; width = depth * HIERARCHY_INDENT;
perf_hpp_list__for_each_format(&fmt_node->hpp, fmt) {
if (perf_hpp__should_skip(fmt, hists)) if (perf_hpp__should_skip(fmt, hists))
continue; continue;
width = fmt->width(fmt, hpp, hists_to_evsel(hists)); if (!first_col)
width += depth * HIERARCHY_INDENT; width++; /* for '+' sign between column header */
first_col = false;
width += fmt->width(fmt, hpp, hists_to_evsel(hists));
}
if (width > header_width) if (width > header_width)
header_width = width; header_width = width;
@ -621,6 +627,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
int max_cols, float min_pcnt, FILE *fp) int max_cols, float min_pcnt, FILE *fp)
{ {
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
struct perf_hpp_list_node *fmt_node;
struct rb_node *nd; struct rb_node *nd;
size_t ret = 0; size_t ret = 0;
unsigned int width; unsigned int width;
@ -650,6 +657,10 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
fprintf(fp, "# "); fprintf(fp, "# ");
if (symbol_conf.report_hierarchy) { if (symbol_conf.report_hierarchy) {
list_for_each_entry(fmt_node, &hists->hpp_formats, list) {
perf_hpp_list__for_each_format(&fmt_node->hpp, fmt)
perf_hpp__reset_width(fmt, hists);
}
nr_rows += print_hierarchy_header(hists, &dummy_hpp, sep, fp); nr_rows += print_hierarchy_header(hists, &dummy_hpp, sep, fp);
goto print_entries; goto print_entries;
} }
@ -734,9 +745,9 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
* display "no entry >= x.xx%" message. * display "no entry >= x.xx%" message.
*/ */
if (!h->leaf && !hist_entry__has_hierarchy_children(h, min_pcnt)) { if (!h->leaf && !hist_entry__has_hierarchy_children(h, min_pcnt)) {
int nr_sort = hists->nr_sort_keys; int depth = hists->nr_hpp_node + h->depth + 1;
print_hierarchy_indent(sep, nr_sort + h->depth + 1, spaces, fp); print_hierarchy_indent(sep, depth, spaces, fp);
fprintf(fp, "%*sno entry >= %.2f%%\n", indent, "", min_pcnt); fprintf(fp, "%*sno entry >= %.2f%%\n", indent, "", min_pcnt);
if (max_rows && ++nr_rows >= max_rows) if (max_rows && ++nr_rows >= max_rows)