diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-15 22:19:59 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-03-20 19:19:29 +0300 |
| commit | 7232bf7a8954e4f6558e6b74fb6a2403e7a3b7be (patch) | |
| tree | bd31c57c1635f990cea5a83ad4a12da6578e68a0 /tools | |
| parent | 9761e86e36c0957e76c1b7c328953687a1a38655 (diff) | |
| download | linux-7232bf7a8954e4f6558e6b74fb6a2403e7a3b7be.tar.xz | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/ui/browsers/annotate.c | 13 | ||||
| -rw-r--r-- | tools/perf/util/annotate.c | 13 | ||||
| -rw-r--r-- | tools/perf/util/annotate.h | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 07d0d2268008..ab4d004fc184 100644 --- 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 b976e3951662..8a2fda80a221 100644 --- 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 0aa77c154fe3..a8bea758490a 100644 --- 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) { |