perf annotate: Move update_column_widths() to the generic lib

Previous patch left it where it was to ease review, move it to its
right place.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-ikdjr014p7k5kachgyjrgiey@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 07d0d22680084ad75a5c2de19436a48b0070d0d3..ab4d004fc184a1bdad3559731f6684a3dae4783b 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -698,19 +698,6 @@ bool annotate_browser__continue_search_reverse(struct annotate_browser *browser,
        return __annotate_browser__search_reverse(browser);
 }
 
-static void annotation__update_column_widths(struct annotation *notes)
-{
-       if (notes->options->use_offset)
-               notes->widths.target = notes->widths.min_addr;
-       else
-               notes->widths.target = notes->widths.max_addr;
-
-       notes->widths.addr = notes->widths.target;
-
-       if (notes->options->show_nr_jumps)
-               notes->widths.addr += notes->widths.jumps + 1;
-}
-
 static int annotate_browser__run(struct annotate_browser *browser,
                                 struct perf_evsel *evsel,
                                 struct hist_browser_timer *hbt)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index b976e395166210b03f156817c9816504c47edbfe..8a2fda80a22141e4be47e787ecd841cadfad3109 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2084,6 +2084,19 @@ void annotation__set_offsets(struct annotation *notes, s64 size)
        }
 }
 
+void annotation__update_column_widths(struct annotation *notes)
+{
+       if (notes->options->use_offset)
+               notes->widths.target = notes->widths.min_addr;
+       else
+               notes->widths.target = notes->widths.max_addr;
+
+       notes->widths.addr = notes->widths.target;
+
+       if (notes->options->show_nr_jumps)
+               notes->widths.addr += notes->widths.jumps + 1;
+}
+
 static void annotation__calc_lines(struct annotation *notes, struct map *map,
                                  struct rb_root *root, u64 start)
 {

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 0aa77c154fe31fdfb792d31e2b2500bec452b80c..a8bea758490aa5de444480b03761d50f17777d45 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -203,6 +203,7 @@ static inline int annotation__pcnt_width(struct annotation *notes)
 void annotation__set_offsets(struct annotation *notes, s64 size);
 void annotation__compute_ipc(struct annotation *notes, size_t size);
 void annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym);
+void annotation__update_column_widths(struct annotation *notes);
 
 static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)
 {