Add overhead{,_sys,_us,_guest_sys,_guest_us}, sample and period sort
keys so that they can be selected with --sort/-s option.

  $ perf report -s period,comm --stdio
  ...
  # Overhead        Period          Command
  # ........  ............  ...............
  #
      47.06%           152          swapper
      13.93%            45  qemu-system-arm
      12.38%            40         synergys
       3.72%            12          firefox
       2.48%             8            xchat

Acked-by: Ingo Molnar <mi...@kernel.org>
Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
 tools/perf/ui/hist.c   |  9 +++++++--
 tools/perf/util/sort.c | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 400dad8c41e4..f3e96463550b 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -348,8 +348,13 @@ void perf_hpp__init(void)
        int i;
 
        for (i = 0; i < PERF_HPP__MAX_INDEX; i++) {
-               INIT_LIST_HEAD(&perf_hpp__format[i].list);
-               INIT_LIST_HEAD(&perf_hpp__format[i].sort_list);
+               struct perf_hpp_fmt *fmt = &perf_hpp__format[i];
+
+               INIT_LIST_HEAD(&fmt->list);
+
+               /* sort_list may be linked by setup_sorting() */
+               if (fmt->sort_list.next == NULL)
+                       INIT_LIST_HEAD(&fmt->sort_list);
        }
 
        perf_hpp__column_enable(PERF_HPP__OVERHEAD);
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index b2829f947053..916652af8304 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1028,6 +1028,26 @@ static struct sort_dimension memory_sort_dimensions[] = {
 
 #undef DIM
 
+struct hpp_dimension {
+       const char              *name;
+       struct perf_hpp_fmt     *fmt;
+       int                     taken;
+};
+
+#define DIM(d, n) { .name = n, .fmt = &perf_hpp__format[d], }
+
+static struct hpp_dimension hpp_sort_dimensions[] = {
+       DIM(PERF_HPP__OVERHEAD, "overhead"),
+       DIM(PERF_HPP__OVERHEAD_SYS, "overhead_sys"),
+       DIM(PERF_HPP__OVERHEAD_US, "overhead_us"),
+       DIM(PERF_HPP__OVERHEAD_GUEST_SYS, "overhead_guest_sys"),
+       DIM(PERF_HPP__OVERHEAD_GUEST_US, "overhead_guest_us"),
+       DIM(PERF_HPP__SAMPLES, "sample"),
+       DIM(PERF_HPP__PERIOD, "period"),
+};
+
+#undef DIM
+
 struct hpp_sort_entry {
        struct perf_hpp_fmt hpp;
        struct sort_entry *se;
@@ -1115,6 +1135,16 @@ static int __sort_dimension__add(struct sort_dimension 
*sd, enum sort_type idx)
        return 0;
 }
 
+static int __hpp_dimension__add(struct hpp_dimension *hd)
+{
+       if (!hd->taken) {
+               hd->taken = 1;
+
+               perf_hpp__register_sort_field(hd->fmt);
+       }
+       return 0;
+}
+
 int sort_dimension__add(const char *tok)
 {
        unsigned int i;
@@ -1144,6 +1174,15 @@ int sort_dimension__add(const char *tok)
                return __sort_dimension__add(sd, i);
        }
 
+       for (i = 0; i < ARRAY_SIZE(hpp_sort_dimensions); i++) {
+               struct hpp_dimension *hd = &hpp_sort_dimensions[i];
+
+               if (strncasecmp(tok, hd->name, strlen(tok)))
+                       continue;
+
+               return __hpp_dimension__add(hd);
+       }
+
        for (i = 0; i < ARRAY_SIZE(bstack_sort_dimensions); i++) {
                struct sort_dimension *sd = &bstack_sort_dimensions[i];
 
-- 
1.9.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to