Commit b8b0d819 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Introduce init_column_widths() method out of TUI code 

More non-TUI stuff goes to the UI-agnostic library

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-hngv7rpqvtta69ouj7ne770q@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7232bf7a

tools/perf/ui/browsers/annotate.c

+1 −13
Original line number Diff line number Diff line
@@ -905,15 +905,6 @@ int hist_entry__tui_annotate(struct hist_entry *he, struct perf_evsel *evsel, 
	return map_symbol__tui_annotate(&he->ms, evsel, hbt);

}



static inline int width_jumps(int n)

{

	if (n >= 100)

		return 5;

	if (n / 10)

		return 2;

	return 1;

}



int symbol__tui_annotate(struct symbol *sym, struct map *map,

			 struct perf_evsel *evsel,

			 struct hist_browser_timer *hbt)
@@ -974,10 +965,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, 
	browser.b.width = notes->max_line_len;

	annotation__mark_jump_targets(notes, sym);

	annotation__compute_ipc(notes, size);



	notes->widths.addr = notes->widths.target = notes->widths.min_addr = hex_width(size);

	notes->widths.max_addr = hex_width(sym->end);

	notes->widths.jumps = width_jumps(notes->max_jump_sources);

	annotation__init_column_widths(notes, sym);

	notes->nr_events = nr_pcnt;

	browser.b.nr_entries = notes->nr_entries;

	browser.b.entries = &notes->src->source,

tools/perf/util/annotate.c

+17 −0
Original line number Diff line number Diff line
@@ -2084,6 +2084,23 @@ void annotation__set_offsets(struct annotation *notes, s64 size) 
	}

}



static inline int width_jumps(int n)

{

	if (n >= 100)

		return 5;

	if (n / 10)

		return 2;

	return 1;

}



void annotation__init_column_widths(struct annotation *notes, struct symbol *sym)

{

	notes->widths.addr = notes->widths.target =

		notes->widths.min_addr = hex_width(symbol__size(sym));

	notes->widths.max_addr = hex_width(sym->end);

	notes->widths.jumps = width_jumps(notes->max_jump_sources);

}



void annotation__update_column_widths(struct annotation *notes)

{

	if (notes->options->use_offset)

tools/perf/util/annotate.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ 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);

void annotation__init_column_widths(struct annotation *notes, struct symbol *sym);



static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE