OSDN Git Service

perf ui stdio: No need to use 'spaces' to left align
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 25 Jun 2019 19:24:20 +0000 (16:24 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 25 Jun 2019 19:24:20 +0000 (16:24 -0300)
We can just use the 'field width' for the %s used to print the
alignment, this way we'll get the same result without requiring having a
variable with just lots of space chars.

No way to do that for the dots tho, we still need that variable filled
with dot chars.

  # perf report --stdio --hierarchy > before
  # perf report --stdio --hierarchy > after
  # diff before after
  #

I.e. it continues as:

  # perf report --stdio --hierarchy | head -15
  # To display the perf.data header info, please use --header/--header-only options.
  #
  #
  # Total Lost Samples: 0
  #
  # Samples: 107  of event 'cycles'
  # Event count (approx.): 31378313
  #
  #       Overhead  Command / Shared Object / Symbol
  # ..............  ............................................
  #
      80.13%        swapper
         72.29%        [kernel.vmlinux]
            49.85%        [k] intel_idle
             9.05%        [k] tick_nohz_next_event
  #

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-9s1dxik37waveor7c84hqti2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/stdio/hist.c

index a60f299..4c97e3c 100644 (file)
@@ -566,10 +566,14 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
 static int print_hierarchy_indent(const char *sep, int indent,
                                  const char *line, FILE *fp)
 {
+       int width;
+
        if (sep != NULL || indent < 2)
                return 0;
 
-       return fprintf(fp, "%-.*s", (indent - 2) * HIERARCHY_INDENT, line);
+       width = (indent - 2) * HIERARCHY_INDENT;
+
+       return fprintf(fp, "%-*.*s", width, width, line);
 }
 
 static int hists__fprintf_hierarchy_headers(struct hists *hists,
@@ -587,7 +591,7 @@ static int hists__fprintf_hierarchy_headers(struct hists *hists,
        indent = hists->nr_hpp_node;
 
        /* preserve max indent depth for column headers */
-       print_hierarchy_indent(sep, indent, spaces, fp);
+       print_hierarchy_indent(sep, indent, " ", fp);
 
        /* the first hpp_list_node is for overhead columns */
        fmt_node = list_first_entry(&hists->hpp_formats,
@@ -816,7 +820,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
                if (!h->leaf && !hist_entry__has_hierarchy_children(h, min_pcnt)) {
                        int depth = hists->nr_hpp_node + h->depth + 1;
 
-                       print_hierarchy_indent(sep, depth, spaces, fp);
+                       print_hierarchy_indent(sep, depth, " ", fp);
                        fprintf(fp, "%*sno entry >= %.2f%%\n", indent, "", min_pcnt);
 
                        if (max_rows && ++nr_rows >= max_rows)