[tip:perf/core] perf hists browser: Align column header in hierarchy mode

[tip-bot for Namhyung Kim]

Commit-ID:  d8b92400d3ba6bb9a310c42b7518a81eb90f83be
Gitweb: http://git.kernel.org/tip/d8b92400d3ba6bb9a310c42b7518a81eb90f83be
Author: Namhyung Kim 
AuthorDate: Thu, 25 Feb 2016 00:13:46 +0900
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Wed, 24 Feb 2016 20:21:14 -0300

perf hists browser: Align column header in hierarchy mode

Like in stdio, fit column header to hierarchy output.  Merge column
headers with "/" as a separator.

   OverheadCommand / Shared Object / Symbol
  ...
  +   0.09%dwm
  +   0.06%emacs
  -   0.05%perf
 -   0.05%[kernel.vmlinux]
+   0.03%[k] memcpy_orig
+   0.01%[k] unmap_single_vma
+   0.01%[k] smp_call_function_single
+   0.00%[k] native_irq_return_iret
+   0.00%[k] arch_trigger_all_cpu_backtrace_handler
+   0.00%[k] native_write_msr_safe

Signed-off-by: Namhyung Kim 
Acked-by: Pekka Enberg 
Cc: Andi Kleen 
Cc: David Ahern 
Cc: Jiri Olsa 
Cc: Peter Zijlstra 
Cc: Stephane Eranian 
Cc: Wang Nan 
Link: 
http://lkml.kernel.org/r/1456326830-30456-15-git-send-email-namhy...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/ui/browsers/hists.c | 71 +-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 2bccf68..6bcd767 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1451,11 +1451,80 @@ static int hists_browser__scnprintf_headers(struct 
hist_browser *browser, char *
return ret;
 }
 
+static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser 
*browser, char *buf, size_t size)
+{
+   struct hists *hists = browser->hists;
+   struct perf_hpp dummy_hpp = {
+   .buf= buf,
+   .size   = size,
+   };
+   struct perf_hpp_fmt *fmt;
+   size_t ret = 0;
+   int column = 0;
+   int nr_sort_keys = hists->hpp_list->nr_sort_keys;
+   bool first = true;
+
+   ret = scnprintf(buf, size, " ");
+   if (advance_hpp_check(_hpp, ret))
+   return ret;
+
+   hists__for_each_format(hists, fmt) {
+   if (column++ < browser->b.horiz_scroll)
+   continue;
+
+   if (perf_hpp__is_sort_entry(fmt) || 
perf_hpp__is_dynamic_entry(fmt))
+   break;
+
+   ret = fmt->header(fmt, _hpp, hists_to_evsel(hists));
+   if (advance_hpp_check(_hpp, ret))
+   break;
+
+   ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "  ");
+   if (advance_hpp_check(_hpp, ret))
+   break;
+   }
+
+   ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "%*s",
+   (nr_sort_keys - 1) * HIERARCHY_INDENT, "");
+   if (advance_hpp_check(_hpp, ret))
+   return ret;
+
+   hists__for_each_format(hists, fmt) {
+   if (!perf_hpp__is_sort_entry(fmt) && 
!perf_hpp__is_dynamic_entry(fmt))
+   continue;
+   if (perf_hpp__should_skip(fmt, hists))
+   continue;
+
+   if (first) {
+   first = false;
+   } else {
+   ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, " / ");
+   if (advance_hpp_check(_hpp, ret))
+   break;
+   }
+
+   ret = fmt->header(fmt, _hpp, hists_to_evsel(hists));
+   dummy_hpp.buf[ret] = '\0';
+   rtrim(dummy_hpp.buf);
+
+   ret = strlen(dummy_hpp.buf);
+   if (advance_hpp_check(_hpp, ret))
+   break;
+   }
+
+   return ret;
+}
+
 static void hist_browser__show_headers(struct hist_browser *browser)
 {
char headers[1024];
 
-   hists_browser__scnprintf_headers(browser, headers, sizeof(headers));
+   if (symbol_conf.report_hierarchy)
+   hists_browser__scnprintf_hierarchy_headers(browser, headers,
+  sizeof(headers));
+   else
+   hists_browser__scnprintf_headers(browser, headers,
+sizeof(headers));
ui_browser__gotorc(>b, 0, 0);
ui_browser__set_color(>b, HE_COLORSET_ROOT);
ui_browser__write_nstring(>b, headers, browser->b.width + 1);

[tip:perf/core] perf hists browser: Align column header in hierarchy mode

[tip-bot for Namhyung Kim]

Commit-ID:  d8b92400d3ba6bb9a310c42b7518a81eb90f83be
Gitweb: http://git.kernel.org/tip/d8b92400d3ba6bb9a310c42b7518a81eb90f83be
Author: Namhyung Kim 
AuthorDate: Thu, 25 Feb 2016 00:13:46 +0900
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Wed, 24 Feb 2016 20:21:14 -0300

perf hists browser: Align column header in hierarchy mode

Like in stdio, fit column header to hierarchy output.  Merge column
headers with "/" as a separator.

   OverheadCommand / Shared Object / Symbol
  ...
  +   0.09%dwm
  +   0.06%emacs
  -   0.05%perf
 -   0.05%[kernel.vmlinux]
+   0.03%[k] memcpy_orig
+   0.01%[k] unmap_single_vma
+   0.01%[k] smp_call_function_single
+   0.00%[k] native_irq_return_iret
+   0.00%[k] arch_trigger_all_cpu_backtrace_handler
+   0.00%[k] native_write_msr_safe

Signed-off-by: Namhyung Kim 
Acked-by: Pekka Enberg 
Cc: Andi Kleen 
Cc: David Ahern 
Cc: Jiri Olsa 
Cc: Peter Zijlstra 
Cc: Stephane Eranian 
Cc: Wang Nan 
Link: 
http://lkml.kernel.org/r/1456326830-30456-15-git-send-email-namhy...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/ui/browsers/hists.c | 71 +-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 2bccf68..6bcd767 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1451,11 +1451,80 @@ static int hists_browser__scnprintf_headers(struct 
hist_browser *browser, char *
return ret;
 }
 
+static int hists_browser__scnprintf_hierarchy_headers(struct hist_browser 
*browser, char *buf, size_t size)
+{
+   struct hists *hists = browser->hists;
+   struct perf_hpp dummy_hpp = {
+   .buf= buf,
+   .size   = size,
+   };
+   struct perf_hpp_fmt *fmt;
+   size_t ret = 0;
+   int column = 0;
+   int nr_sort_keys = hists->hpp_list->nr_sort_keys;
+   bool first = true;
+
+   ret = scnprintf(buf, size, " ");
+   if (advance_hpp_check(_hpp, ret))
+   return ret;
+
+   hists__for_each_format(hists, fmt) {
+   if (column++ < browser->b.horiz_scroll)
+   continue;
+
+   if (perf_hpp__is_sort_entry(fmt) || 
perf_hpp__is_dynamic_entry(fmt))
+   break;
+
+   ret = fmt->header(fmt, _hpp, hists_to_evsel(hists));
+   if (advance_hpp_check(_hpp, ret))
+   break;
+
+   ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "  ");
+   if (advance_hpp_check(_hpp, ret))
+   break;
+   }
+
+   ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, "%*s",
+   (nr_sort_keys - 1) * HIERARCHY_INDENT, "");
+   if (advance_hpp_check(_hpp, ret))
+   return ret;
+
+   hists__for_each_format(hists, fmt) {
+   if (!perf_hpp__is_sort_entry(fmt) && 
!perf_hpp__is_dynamic_entry(fmt))
+   continue;
+   if (perf_hpp__should_skip(fmt, hists))
+   continue;
+
+   if (first) {
+   first = false;
+   } else {
+   ret = scnprintf(dummy_hpp.buf, dummy_hpp.size, " / ");
+   if (advance_hpp_check(_hpp, ret))
+   break;
+   }
+
+   ret = fmt->header(fmt, _hpp, hists_to_evsel(hists));
+   dummy_hpp.buf[ret] = '\0';
+   rtrim(dummy_hpp.buf);
+
+   ret = strlen(dummy_hpp.buf);
+   if (advance_hpp_check(_hpp, ret))
+   break;
+   }
+
+   return ret;
+}
+
 static void hist_browser__show_headers(struct hist_browser *browser)
 {
char headers[1024];
 
-   hists_browser__scnprintf_headers(browser, headers, sizeof(headers));
+   if (symbol_conf.report_hierarchy)
+   hists_browser__scnprintf_hierarchy_headers(browser, headers,
+  sizeof(headers));
+   else
+   hists_browser__scnprintf_headers(browser, headers,
+sizeof(headers));
ui_browser__gotorc(>b, 0, 0);
ui_browser__set_color(>b, HE_COLORSET_ROOT);
ui_browser__write_nstring(>b, headers, browser->b.width + 1);