perf hists: Use own hpp_list for hierarchy mode

Now each hists has its own hpp lists in hierarchy.  So instead of having
a pointer to a single perf_hpp_fmt in a hist entry, make it point the
hpp_list for its level.  This will be used to support multiple sort keys
in a single hierarchy level.

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-3-git-send-email-namhyung@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 22 insertions, 22 deletions

diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 6d06fbb365b6..073642a63cc9 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -451,33 +451,33 @@ static int hist_entry__hierarchy_fprintf(struct hist_entry *he,
                 advance_hpp(hpp, ret);
         }
 
-        if (sep)
-                ret = scnprintf(hpp->buf, hpp->size, "%s", sep);
-        else
+        if (!sep)
                 ret = scnprintf(hpp->buf, hpp->size, "%*s",
-                                (nr_sort_key - 1) * HIERARCHY_INDENT + 2, "");
+                                (nr_sort_key - 1) * HIERARCHY_INDENT, "");
         advance_hpp(hpp, ret);
 
         printed += fprintf(fp, "%s", buf);
 
-        hpp->buf  = buf;
-        hpp->size = size;
-
-        /*
-         * No need to call hist_entry__snprintf_alignment() since this
-         * fmt is always the last column in the hierarchy mode.
-         */
-        fmt = he->fmt;
-        if (perf_hpp__use_color() && fmt->color)
-                fmt->color(fmt, hpp, he);
-        else
-                fmt->entry(fmt, hpp, he);
-
-        /*
-         * dynamic entries are right-aligned but we want left-aligned
-         * in the hierarchy mode
-         */
-        printed += fprintf(fp, "%s\n", ltrim(buf));
+        perf_hpp_list__for_each_format(he->hpp_list, fmt) {
+                hpp->buf  = buf;
+                hpp->size = size;
+
+                /*
+                 * No need to call hist_entry__snprintf_alignment() since this
+                 * fmt is always the last column in the hierarchy mode.
+                 */
+                if (perf_hpp__use_color() && fmt->color)
+                        fmt->color(fmt, hpp, he);
+                else
+                        fmt->entry(fmt, hpp, he);
+
+                /*
+                 * dynamic entries are right-aligned but we want left-aligned
+                 * in the hierarchy mode
+                 */
+                printed += fprintf(fp, "%s%s", sep ?: "  ", ltrim(buf));
+        }
+        printed += putc('\n', fp);
 
         if (symbol_conf.use_callchain && he->leaf) {
                 u64 total = hists__total_period(hists);