perf hist: Add perf_hpp_fmt->init() callback

In __hists__insert_output_entry(), it calls fmt->sort() for dynamic
entries with NULL to update column width for tracepoint fields.
But it's a hacky abuse of the sort callback, better to have a proper
callback for that.  I'll add more use cases later.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221215192817.2734573-7-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 17a05e943b44b5f7234719e5e3c87f82ff58ec67..b6e4b4edde43b447577c5a30cf9e198e570e47de 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1781,8 +1781,8 @@ static void hierarchy_insert_output_entry(struct rb_root_cached *root,
 
        /* update column width of dynamic entry */
        perf_hpp_list__for_each_sort_list(he->hpp_list, fmt) {
-               if (perf_hpp__is_dynamic_entry(fmt))
-                       fmt->sort(fmt, he, NULL);
+               if (fmt->init)
+                       fmt->init(fmt, he);
        }
 }
 
@@ -1879,10 +1879,10 @@ static void __hists__insert_output_entry(struct rb_root_cached *entries,
        rb_link_node(&he->rb_node, parent, p);
        rb_insert_color_cached(&he->rb_node, entries, leftmost);
 
+       /* update column width of dynamic entries */
        perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
-               if (perf_hpp__is_dynamic_entry(fmt) &&
-                   perf_hpp__defined_dynamic_entry(fmt, he->hists))
-                       fmt->sort(fmt, he, NULL);  /* update column width */
+               if (fmt->init)
+                       fmt->init(fmt, he);
        }
 }
 

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index ebd8a8f783ee6b688aa409d8e26fac8ab117416f..d93a4e510dc776f30d444c7fa121427e6c92a2d9 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -272,6 +272,7 @@ struct perf_hpp_fmt {
                      struct hists *hists, int line, int *span);
        int (*width)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
                     struct hists *hists);
+       void (*init)(struct perf_hpp_fmt *fmt, struct hist_entry *he);
        int (*color)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
                     struct hist_entry *he);
        int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 0ecc2cb137920d2d88e15ac746c4a96c23503b3e..f6333b3dca35b86384b4540a49cb01ff651c47b2 100644 (file)
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2251,6 +2251,19 @@ static void hse_free(struct perf_hpp_fmt *fmt)
        free(hse);
 }
 
+static void hse_init(struct perf_hpp_fmt *fmt, struct hist_entry *he)
+{
+       struct hpp_sort_entry *hse;
+
+       if (!perf_hpp__is_sort_entry(fmt))
+               return;
+
+       hse = container_of(fmt, struct hpp_sort_entry, hpp);
+
+       if (hse->se->se_init)
+               hse->se->se_init(he);
+}
+
 static struct hpp_sort_entry *
 __sort_dimension__alloc_hpp(struct sort_dimension *sd, int level)
 {
@@ -2274,6 +2287,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd, int level)
        hse->hpp.sort = __sort__hpp_sort;
        hse->hpp.equal = __sort__hpp_equal;
        hse->hpp.free = hse_free;
+       hse->hpp.init = hse_init;
 
        INIT_LIST_HEAD(&hse->hpp.list);
        INIT_LIST_HEAD(&hse->hpp.sort_list);
@@ -2556,11 +2570,6 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt,
 
        hde = container_of(fmt, struct hpp_dynamic_entry, hpp);
 
-       if (b == NULL) {
-               update_dynamic_len(hde, a);
-               return 0;
-       }
-
        field = hde->field;
        if (field->flags & TEP_FIELD_IS_DYNAMIC) {
                unsigned long long dyn;
@@ -2610,6 +2619,17 @@ static void hde_free(struct perf_hpp_fmt *fmt)
        free(hde);
 }
 
+static void __sort__hde_init(struct perf_hpp_fmt *fmt, struct hist_entry *he)
+{
+       struct hpp_dynamic_entry *hde;
+
+       if (!perf_hpp__is_dynamic_entry(fmt))
+               return;
+
+       hde = container_of(fmt, struct hpp_dynamic_entry, hpp);
+       update_dynamic_len(hde, he);
+}
+
 static struct hpp_dynamic_entry *
 __alloc_dynamic_entry(struct evsel *evsel, struct tep_format_field *field,
                      int level)
@@ -2632,6 +2652,7 @@ __alloc_dynamic_entry(struct evsel *evsel, struct tep_format_field *field,
        hde->hpp.entry  = __sort__hde_entry;
        hde->hpp.color  = NULL;
 
+       hde->hpp.init = __sort__hde_init;
        hde->hpp.cmp = __sort__hde_cmp;
        hde->hpp.collapse = __sort__hde_cmp;
        hde->hpp.sort = __sort__hde_cmp;

diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 04ff8b61a2a7c75c82be89758d4939fe914fd9d0..921715e6aec4cc19ef96dbca844b5ac49e1fb7c8 100644 (file)
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -282,6 +282,7 @@ struct sort_entry {
        int     (*se_snprintf)(struct hist_entry *he, char *bf, size_t size,
                               unsigned int width);
        int     (*se_filter)(struct hist_entry *he, int type, const void *arg);
+       void    (*se_init)(struct hist_entry *he);
        u8      se_width_idx;
 };