perf report: Add -F option to specify output fields

The -F/--fields option is to allow user setup output field in any
order.  It can receive any sort keys and following (hpp) fields:

  overhead, overhead_sys, overhead_us, sample and period

If guest profiling is enabled, overhead_guest_{sys,us} will be
available too.

The output fields also affect sort order unless you give -s/--sort
option.  And any keys specified on -s option, will also be added to
the output field list automatically.

  $ perf report -F sym,sample,overhead
  ...
  #                     Symbol       Samples  Overhead
  # ..........................  ............  ........
  #
    [.] __cxa_atexit                       2     2.50%
    [.] __libc_csu_init                    4     5.00%
    [.] __new_exitfn                       3     3.75%
    [.] _dl_check_map_versions             1     1.25%
    [.] _dl_name_match_p                   4     5.00%
    [.] _dl_setup_hash                     1     1.25%
    [.] _dl_sysdep_start                   1     1.25%
    [.] _init                              5     6.25%
    [.] _setjmp                            6     7.50%
    [.] a                                  8    10.00%
    [.] b                                  8    10.00%
    [.] brk                                1     1.25%
    [.] c                                  8    10.00%

Note that, the example output above is captured after applying next
patch which fixes sort/comparing behavior.

Requested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-12-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

1 files changed, 55 insertions, 4 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 24116a48298f..b114c6668865 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -355,6 +355,12 @@ void perf_hpp__init(void)
                         INIT_LIST_HEAD(&fmt->sort_list);
         }
 
+        /*
+         * If user specified field order, no need to setup default fields.
+         */
+        if (field_order)
+                return;
+
         perf_hpp__column_enable(PERF_HPP__OVERHEAD);
 
         if (symbol_conf.show_cpu_utilization) {
@@ -377,8 +383,6 @@ void perf_hpp__init(void)
         list = &perf_hpp__format[PERF_HPP__OVERHEAD].sort_list;
         if (list_empty(list))
                 list_add(list, &perf_hpp__sort_list);
-
-        perf_hpp__setup_output_field();
 }
 
 void perf_hpp__column_register(struct perf_hpp_fmt *format)
@@ -403,8 +407,55 @@ void perf_hpp__setup_output_field(void)
 
         /* append sort keys to output field */
         perf_hpp__for_each_sort_list(fmt) {
-                if (list_empty(&fmt->list))
-                        perf_hpp__column_register(fmt);
+                if (!list_empty(&fmt->list))
+                        continue;
+
+                /*
+                 * sort entry fields are dynamically created,
+                 * so they can share a same sort key even though
+                 * the list is empty.
+                 */
+                if (perf_hpp__is_sort_entry(fmt)) {
+                        struct perf_hpp_fmt *pos;
+
+                        perf_hpp__for_each_format(pos) {
+                                if (perf_hpp__same_sort_entry(pos, fmt))
+                                        goto next;
+                        }
+                }
+
+                perf_hpp__column_register(fmt);
+next:
+                continue;
+        }
+}
+
+void perf_hpp__append_sort_keys(void)
+{
+        struct perf_hpp_fmt *fmt;
+
+        /* append output fields to sort keys */
+        perf_hpp__for_each_format(fmt) {
+                if (!list_empty(&fmt->sort_list))
+                        continue;
+
+                /*
+                 * sort entry fields are dynamically created,
+                 * so they can share a same sort key even though
+                 * the list is empty.
+                 */
+                if (perf_hpp__is_sort_entry(fmt)) {
+                        struct perf_hpp_fmt *pos;
+
+                        perf_hpp__for_each_sort_list(pos) {
+                                if (perf_hpp__same_sort_entry(pos, fmt))
+                                        goto next;
+                        }
+                }
+
+                perf_hpp__register_sort_field(fmt);
+next:
+                continue;
         }
 }