Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf annotate: Rename objdump_line to disasm_line 

We want to move away from using 'objdump -dS' as the only disassembler
supported.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-lsn9pjuxxm5ezsubyhkmprw7@git.kernel.org


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

tools/perf/ui/browsers/annotate.c

+88 −91
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ struct annotate_browser { 
	struct ui_browser b;

	struct ui_browser b;

	struct rb_root	  entries;

	struct rb_root	  entries;

	struct rb_node	  *curr_hot;

	struct rb_node	  *curr_hot;

	struct objdump_line *selection;

	struct disasm_line	  *selection;

	u64		    start;

	u64		    start;

	int		    nr_asm_entries;

	int		    nr_asm_entries;

	int		    nr_entries;

	int		    nr_entries;
@@ -25,26 +25,25 @@ struct annotate_browser { 
	char		    search_bf[128];

	char		    search_bf[128];

};

};





struct objdump_line_rb_node {

struct disasm_line_rb_node {

	struct rb_node	rb_node;

	struct rb_node	rb_node;

	double		percent;

	double		percent;

	u32		idx;

	u32		idx;

	int		idx_asm;

	int		idx_asm;

};

};





static inline

static inline struct disasm_line_rb_node *disasm_line__rb(struct disasm_line *dl)

struct objdump_line_rb_node *objdump_line__rb(struct objdump_line *self)

{

{

	return (struct objdump_line_rb_node *)(self + 1);

	return (struct disasm_line_rb_node *)(dl + 1);

}

}





static bool objdump_line__filter(struct ui_browser *browser, void *entry)

static bool disasm_line__filter(struct ui_browser *browser, void *entry)

{

{

	struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);

	struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);





	if (ab->hide_src_code) {

	if (ab->hide_src_code) {

		struct objdump_line *ol = list_entry(entry, struct objdump_line, node);

		struct disasm_line *dl = list_entry(entry, struct disasm_line, node);

		return ol->offset == -1;

		return dl->offset == -1;

	}

	}





	return false;

	return false;
@@ -53,17 +52,17 @@ static bool objdump_line__filter(struct ui_browser *browser, void *entry) 
static void annotate_browser__write(struct ui_browser *self, void *entry, int row)

static void annotate_browser__write(struct ui_browser *self, void *entry, int row)

{

{

	struct annotate_browser *ab = container_of(self, struct annotate_browser, b);

	struct annotate_browser *ab = container_of(self, struct annotate_browser, b);

	struct objdump_line *ol = list_entry(entry, struct objdump_line, node);

	struct disasm_line *dl = list_entry(entry, struct disasm_line, node);

	bool current_entry = ui_browser__is_current_entry(self, row);

	bool current_entry = ui_browser__is_current_entry(self, row);

	bool change_color = (!ab->hide_src_code &&

	bool change_color = (!ab->hide_src_code &&

			     (!current_entry || (self->use_navkeypressed &&

			     (!current_entry || (self->use_navkeypressed &&

					         !self->navkeypressed)));

					         !self->navkeypressed)));

	int width = self->width;

	int width = self->width;





	if (ol->offset != -1) {

	if (dl->offset != -1) {

		struct objdump_line_rb_node *olrb = objdump_line__rb(ol);

		struct disasm_line_rb_node *dlrb = disasm_line__rb(dl);

		ui_browser__set_percent_color(self, olrb->percent, current_entry);

		ui_browser__set_percent_color(self, dlrb->percent, current_entry);

		slsmg_printf(" %7.2f ", olrb->percent);

		slsmg_printf(" %7.2f ", dlrb->percent);

	} else {

	} else {

		ui_browser__set_percent_color(self, 0, current_entry);

		ui_browser__set_percent_color(self, 0, current_entry);

		slsmg_write_nstring(" ", 9);

		slsmg_write_nstring(" ", 9);
@@ -76,16 +75,16 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro 
	if (!self->navkeypressed)

	if (!self->navkeypressed)

		width += 1;

		width += 1;





	if (ol->offset != -1 && change_color)

	if (dl->offset != -1 && change_color)

		ui_browser__set_color(self, HE_COLORSET_CODE);

		ui_browser__set_color(self, HE_COLORSET_CODE);





	if (!*ol->line)

	if (!*dl->line)

		slsmg_write_nstring(" ", width - 18);

		slsmg_write_nstring(" ", width - 18);

	else if (ol->offset == -1)

	else if (dl->offset == -1)

		slsmg_write_nstring(ol->line, width - 18);

		slsmg_write_nstring(dl->line, width - 18);

	else {

	else {

		char bf[64];

		char bf[64];

		u64 addr = ol->offset;

		u64 addr = dl->offset;

		int printed, color = -1;

		int printed, color = -1;





		if (!ab->use_offset)

		if (!ab->use_offset)
@@ -97,28 +96,27 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro 
		slsmg_write_nstring(bf, printed);

		slsmg_write_nstring(bf, printed);

		if (change_color)

		if (change_color)

			ui_browser__set_color(self, color);

			ui_browser__set_color(self, color);

		slsmg_write_nstring(ol->line, width - 18 - printed);

		slsmg_write_nstring(dl->line, width - 18 - printed);

	}

	}





	if (current_entry)

	if (current_entry)

		ab->selection = ol;

		ab->selection = dl;

}

}





static double objdump_line__calc_percent(struct objdump_line *self,

static double disasm_line__calc_percent(struct disasm_line *dl, struct symbol *sym, int evidx)

					 struct symbol *sym, int evidx)

{

{

	double percent = 0.0;

	double percent = 0.0;





	if (self->offset != -1) {

	if (dl->offset != -1) {

		int len = sym->end - sym->start;

		int len = sym->end - sym->start;

		unsigned int hits = 0;

		unsigned int hits = 0;

		struct annotation *notes = symbol__annotation(sym);

		struct annotation *notes = symbol__annotation(sym);

		struct source_line *src_line = notes->src->lines;

		struct source_line *src_line = notes->src->lines;

		struct sym_hist *h = annotation__histogram(notes, evidx);

		struct sym_hist *h = annotation__histogram(notes, evidx);

		s64 offset = self->offset;

		s64 offset = dl->offset;

		struct objdump_line *next;

		struct disasm_line *next;





		next = objdump__get_next_ip_line(&notes->src->source, self);

		next = disasm__get_next_ip_line(&notes->src->source, dl);

		while (offset < (s64)len &&

		while (offset < (s64)len &&

		       (next == NULL || offset < next->offset)) {

		       (next == NULL || offset < next->offset)) {

			if (src_line) {

			if (src_line) {
@@ -139,27 +137,26 @@ static double objdump_line__calc_percent(struct objdump_line *self, 
	return percent;

	return percent;

}

}





static void objdump__insert_line(struct rb_root *self,

static void disasm_rb_tree__insert(struct rb_root *root, struct disasm_line_rb_node *dlrb)

				 struct objdump_line_rb_node *line)

{

{

	struct rb_node **p = &self->rb_node;

	struct rb_node **p = &root->rb_node;

	struct rb_node *parent = NULL;

	struct rb_node *parent = NULL;

	struct objdump_line_rb_node *l;

	struct disasm_line_rb_node *l;





	while (*p != NULL) {

	while (*p != NULL) {

		parent = *p;

		parent = *p;

		l = rb_entry(parent, struct objdump_line_rb_node, rb_node);

		l = rb_entry(parent, struct disasm_line_rb_node, rb_node);

		if (line->percent < l->percent)

		if (dlrb->percent < l->percent)

			p = &(*p)->rb_left;

			p = &(*p)->rb_left;

		else

		else

			p = &(*p)->rb_right;

			p = &(*p)->rb_right;

	}

	}

	rb_link_node(&line->rb_node, parent, p);

	rb_link_node(&dlrb->rb_node, parent, p);

	rb_insert_color(&line->rb_node, self);

	rb_insert_color(&dlrb->rb_node, root);

}

}





static void annotate_browser__set_top(struct annotate_browser *self,

static void annotate_browser__set_top(struct annotate_browser *self,

				      struct objdump_line *pos, u32 idx)

				      struct disasm_line *pos, u32 idx)

{

{

	unsigned back;

	unsigned back;
@@ -168,9 +165,9 @@ static void annotate_browser__set_top(struct annotate_browser *self, 
	self->b.top_idx = self->b.index = idx;

	self->b.top_idx = self->b.index = idx;





	while (self->b.top_idx != 0 && back != 0) {

	while (self->b.top_idx != 0 && back != 0) {

		pos = list_entry(pos->node.prev, struct objdump_line, node);

		pos = list_entry(pos->node.prev, struct disasm_line, node);





		if (objdump_line__filter(&self->b, &pos->node))

		if (disasm_line__filter(&self->b, &pos->node))

			continue;

			continue;





		--self->b.top_idx;

		--self->b.top_idx;
@@ -184,11 +181,11 @@ static void annotate_browser__set_top(struct annotate_browser *self, 
static void annotate_browser__set_rb_top(struct annotate_browser *browser,

static void annotate_browser__set_rb_top(struct annotate_browser *browser,

					 struct rb_node *nd)

					 struct rb_node *nd)

{

{

	struct objdump_line_rb_node *rbpos;

	struct disasm_line_rb_node *rbpos;

	struct objdump_line *pos;

	struct disasm_line *pos;





	rbpos = rb_entry(nd, struct objdump_line_rb_node, rb_node);

	rbpos = rb_entry(nd, struct disasm_line_rb_node, rb_node);

	pos = ((struct objdump_line *)rbpos) - 1;

	pos = ((struct disasm_line *)rbpos) - 1;

	annotate_browser__set_top(browser, pos, rbpos->idx);

	annotate_browser__set_top(browser, pos, rbpos->idx);

	browser->curr_hot = nd;

	browser->curr_hot = nd;

}

}
@@ -199,20 +196,20 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, 
	struct map_symbol *ms = browser->b.priv;

	struct map_symbol *ms = browser->b.priv;

	struct symbol *sym = ms->sym;

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *pos;

	struct disasm_line *pos;





	browser->entries = RB_ROOT;

	browser->entries = RB_ROOT;





	pthread_mutex_lock(&notes->lock);

	pthread_mutex_lock(&notes->lock);





	list_for_each_entry(pos, &notes->src->source, node) {

	list_for_each_entry(pos, &notes->src->source, node) {

		struct objdump_line_rb_node *rbpos = objdump_line__rb(pos);

		struct disasm_line_rb_node *rbpos = disasm_line__rb(pos);

		rbpos->percent = objdump_line__calc_percent(pos, sym, evidx);

		rbpos->percent = disasm_line__calc_percent(pos, sym, evidx);

		if (rbpos->percent < 0.01) {

		if (rbpos->percent < 0.01) {

			RB_CLEAR_NODE(&rbpos->rb_node);

			RB_CLEAR_NODE(&rbpos->rb_node);

			continue;

			continue;

		}

		}

		objdump__insert_line(&browser->entries, rbpos);

		disasm_rb_tree__insert(&browser->entries, rbpos);

	}

	}

	pthread_mutex_unlock(&notes->lock);

	pthread_mutex_unlock(&notes->lock);
@@ -221,38 +218,38 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, 




static bool annotate_browser__toggle_source(struct annotate_browser *browser)

static bool annotate_browser__toggle_source(struct annotate_browser *browser)

{

{

	struct objdump_line *ol;

	struct disasm_line *dl;

	struct objdump_line_rb_node *olrb;

	struct disasm_line_rb_node *dlrb;

	off_t offset = browser->b.index - browser->b.top_idx;

	off_t offset = browser->b.index - browser->b.top_idx;





	browser->b.seek(&browser->b, offset, SEEK_CUR);

	browser->b.seek(&browser->b, offset, SEEK_CUR);

	ol = list_entry(browser->b.top, struct objdump_line, node);

	dl = list_entry(browser->b.top, struct disasm_line, node);

	olrb = objdump_line__rb(ol);

	dlrb = disasm_line__rb(dl);





	if (browser->hide_src_code) {

	if (browser->hide_src_code) {

		if (olrb->idx_asm < offset)

		if (dlrb->idx_asm < offset)

			offset = olrb->idx;

			offset = dlrb->idx;





		browser->b.nr_entries = browser->nr_entries;

		browser->b.nr_entries = browser->nr_entries;

		browser->hide_src_code = false;

		browser->hide_src_code = false;

		browser->b.seek(&browser->b, -offset, SEEK_CUR);

		browser->b.seek(&browser->b, -offset, SEEK_CUR);

		browser->b.top_idx = olrb->idx - offset;

		browser->b.top_idx = dlrb->idx - offset;

		browser->b.index = olrb->idx;

		browser->b.index = dlrb->idx;

	} else {

	} else {

		if (olrb->idx_asm < 0) {

		if (dlrb->idx_asm < 0) {

			ui_helpline__puts("Only available for assembly lines.");

			ui_helpline__puts("Only available for assembly lines.");

			browser->b.seek(&browser->b, -offset, SEEK_CUR);

			browser->b.seek(&browser->b, -offset, SEEK_CUR);

			return false;

			return false;

		}

		}





		if (olrb->idx_asm < offset)

		if (dlrb->idx_asm < offset)

			offset = olrb->idx_asm;

			offset = dlrb->idx_asm;





		browser->b.nr_entries = browser->nr_asm_entries;

		browser->b.nr_entries = browser->nr_asm_entries;

		browser->hide_src_code = true;

		browser->hide_src_code = true;

		browser->b.seek(&browser->b, -offset, SEEK_CUR);

		browser->b.seek(&browser->b, -offset, SEEK_CUR);

		browser->b.top_idx = olrb->idx_asm - offset;

		browser->b.top_idx = dlrb->idx_asm - offset;

		browser->b.index = olrb->idx_asm;

		browser->b.index = dlrb->idx_asm;

	}

	}





	return true;

	return true;
@@ -302,20 +299,20 @@ static bool annotate_browser__callq(struct annotate_browser *browser, 
	return true;

	return true;

}

}





static struct objdump_line *

static

	annotate_browser__find_offset(struct annotate_browser *browser,

struct disasm_line *annotate_browser__find_offset(struct annotate_browser *browser,

					  s64 offset, s64 *idx)

					  s64 offset, s64 *idx)

{

{

	struct map_symbol *ms = browser->b.priv;

	struct map_symbol *ms = browser->b.priv;

	struct symbol *sym = ms->sym;

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *pos;

	struct disasm_line *pos;





	*idx = 0;

	*idx = 0;

	list_for_each_entry(pos, &notes->src->source, node) {

	list_for_each_entry(pos, &notes->src->source, node) {

		if (pos->offset == offset)

		if (pos->offset == offset)

			return pos;

			return pos;

		if (!objdump_line__filter(&browser->b, &pos->node))

		if (!disasm_line__filter(&browser->b, &pos->node))

			++*idx;

			++*idx;

	}

	}
@@ -325,7 +322,7 @@ static struct objdump_line * 
static bool annotate_browser__jump(struct annotate_browser *browser)

static bool annotate_browser__jump(struct annotate_browser *browser)

{

{

	const char *jumps[] = { "je ", "jne ", "ja ", "jmpq ", "js ", "jmp ", NULL };

	const char *jumps[] = { "je ", "jne ", "ja ", "jmpq ", "js ", "jmp ", NULL };

	struct objdump_line *line;

	struct disasm_line *dl;

	s64 idx, offset;

	s64 idx, offset;

	char *s = NULL;

	char *s = NULL;

	int i = 0;

	int i = 0;
@@ -346,29 +343,29 @@ static bool annotate_browser__jump(struct annotate_browser *browser) 
	}

	}





	offset = strtoll(s, NULL, 16);

	offset = strtoll(s, NULL, 16);

	line = annotate_browser__find_offset(browser, offset, &idx);

	dl = annotate_browser__find_offset(browser, offset, &idx);

	if (line == NULL) {

	if (dl == NULL) {

		ui_helpline__puts("Invallid jump offset");

		ui_helpline__puts("Invallid jump offset");

		return true;

		return true;

	}

	}





	annotate_browser__set_top(browser, line, idx);

	annotate_browser__set_top(browser, dl, idx);

	

	

	return true;

	return true;

}

}





static struct objdump_line *

static

	annotate_browser__find_string(struct annotate_browser *browser,

struct disasm_line *annotate_browser__find_string(struct annotate_browser *browser,

					  char *s, s64 *idx)

					  char *s, s64 *idx)

{

{

	struct map_symbol *ms = browser->b.priv;

	struct map_symbol *ms = browser->b.priv;

	struct symbol *sym = ms->sym;

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *pos = browser->selection;

	struct disasm_line *pos = browser->selection;





	*idx = browser->b.index;

	*idx = browser->b.index;

	list_for_each_entry_continue(pos, &notes->src->source, node) {

	list_for_each_entry_continue(pos, &notes->src->source, node) {

		if (objdump_line__filter(&browser->b, &pos->node))

		if (disasm_line__filter(&browser->b, &pos->node))

			continue;

			continue;





		++*idx;

		++*idx;
@@ -382,32 +379,32 @@ static struct objdump_line * 




static bool __annotate_browser__search(struct annotate_browser *browser)

static bool __annotate_browser__search(struct annotate_browser *browser)

{

{

	struct objdump_line *line;

	struct disasm_line *dl;

	s64 idx;

	s64 idx;





	line = annotate_browser__find_string(browser, browser->search_bf, &idx);

	dl = annotate_browser__find_string(browser, browser->search_bf, &idx);

	if (line == NULL) {

	if (dl == NULL) {

		ui_helpline__puts("String not found!");

		ui_helpline__puts("String not found!");

		return false;

		return false;

	}

	}





	annotate_browser__set_top(browser, line, idx);

	annotate_browser__set_top(browser, dl, idx);

	browser->searching_backwards = false;

	browser->searching_backwards = false;

	return true;

	return true;

}

}





static struct objdump_line *

static

	annotate_browser__find_string_reverse(struct annotate_browser *browser,

struct disasm_line *annotate_browser__find_string_reverse(struct annotate_browser *browser,

						  char *s, s64 *idx)

						  char *s, s64 *idx)

{

{

	struct map_symbol *ms = browser->b.priv;

	struct map_symbol *ms = browser->b.priv;

	struct symbol *sym = ms->sym;

	struct symbol *sym = ms->sym;

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *pos = browser->selection;

	struct disasm_line *pos = browser->selection;





	*idx = browser->b.index;

	*idx = browser->b.index;

	list_for_each_entry_continue_reverse(pos, &notes->src->source, node) {

	list_for_each_entry_continue_reverse(pos, &notes->src->source, node) {

		if (objdump_line__filter(&browser->b, &pos->node))

		if (disasm_line__filter(&browser->b, &pos->node))

			continue;

			continue;





		--*idx;

		--*idx;
@@ -421,16 +418,16 @@ static struct objdump_line * 




static bool __annotate_browser__search_reverse(struct annotate_browser *browser)

static bool __annotate_browser__search_reverse(struct annotate_browser *browser)

{

{

	struct objdump_line *line;

	struct disasm_line *dl;

	s64 idx;

	s64 idx;





	line = annotate_browser__find_string_reverse(browser, browser->search_bf, &idx);

	dl = annotate_browser__find_string_reverse(browser, browser->search_bf, &idx);

	if (line == NULL) {

	if (dl == NULL) {

		ui_helpline__puts("String not found!");

		ui_helpline__puts("String not found!");

		return false;

		return false;

	}

	}





	annotate_browser__set_top(browser, line, idx);

	annotate_browser__set_top(browser, dl, idx);

	browser->searching_backwards = true;

	browser->searching_backwards = true;

	return true;

	return true;

}

}
@@ -613,7 +610,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, 
			 void(*timer)(void *arg), void *arg,

			 void(*timer)(void *arg), void *arg,

			 int delay_secs)

			 int delay_secs)

{

{

	struct objdump_line *pos, *n;

	struct disasm_line *pos, *n;

	struct annotation *notes;

	struct annotation *notes;

	struct map_symbol ms = {

	struct map_symbol ms = {

		.map = map,

		.map = map,
@@ -624,7 +621,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, 
			.refresh = ui_browser__list_head_refresh,

			.refresh = ui_browser__list_head_refresh,

			.seek	 = ui_browser__list_head_seek,

			.seek	 = ui_browser__list_head_seek,

			.write	 = annotate_browser__write,

			.write	 = annotate_browser__write,

			.filter  = objdump_line__filter,

			.filter  = disasm_line__filter,

			.priv	 = &ms,

			.priv	 = &ms,

			.use_navkeypressed = true,

			.use_navkeypressed = true,

		},

		},
@@ -637,7 +634,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, 
	if (map->dso->annotate_warned)

	if (map->dso->annotate_warned)

		return -1;

		return -1;





	if (symbol__annotate(sym, map, sizeof(struct objdump_line_rb_node)) < 0) {

	if (symbol__annotate(sym, map, sizeof(struct disasm_line_rb_node)) < 0) {

		ui__error("%s", ui_helpline__last_msg);

		ui__error("%s", ui_helpline__last_msg);

		return -1;

		return -1;

	}

	}
@@ -648,12 +645,12 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, 
	browser.start = map__rip_2objdump(map, sym->start);

	browser.start = map__rip_2objdump(map, sym->start);





	list_for_each_entry(pos, &notes->src->source, node) {

	list_for_each_entry(pos, &notes->src->source, node) {

		struct objdump_line_rb_node *rbpos;

		struct disasm_line_rb_node *rbpos;

		size_t line_len = strlen(pos->line);

		size_t line_len = strlen(pos->line);





		if (browser.b.width < line_len)

		if (browser.b.width < line_len)

			browser.b.width = line_len;

			browser.b.width = line_len;

		rbpos = objdump_line__rb(pos);

		rbpos = disasm_line__rb(pos);

		rbpos->idx = browser.nr_entries++;

		rbpos->idx = browser.nr_entries++;

		if (pos->offset != -1)

		if (pos->offset != -1)

			rbpos->idx_asm = browser.nr_asm_entries++;

			rbpos->idx_asm = browser.nr_asm_entries++;
@@ -667,7 +664,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, 
	ret = annotate_browser__run(&browser, evidx, timer, arg, delay_secs);

	ret = annotate_browser__run(&browser, evidx, timer, arg, delay_secs);

	list_for_each_entry_safe(pos, n, &notes->src->source, node) {

	list_for_each_entry_safe(pos, n, &notes->src->source, node) {

		list_del(&pos->node);

		list_del(&pos->node);

		objdump_line__free(pos);

		disasm_line__free(pos);

	}

	}

	return ret;

	return ret;

}
 
}

tools/perf/util/annotate.c

+35 −37
Original line number Original line Diff line number Diff line
@@ -78,36 +78,35 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map, 
	return 0;

	return 0;

}

}





static struct objdump_line *objdump_line__new(s64 offset, char *line, size_t privsize)

static struct disasm_line *disasm_line__new(s64 offset, char *line, size_t privsize)

{

{

	struct objdump_line *self = malloc(sizeof(*self) + privsize);

	struct disasm_line *dl = malloc(sizeof(*dl) + privsize);





	if (self != NULL) {

	if (dl != NULL) {

		self->offset = offset;

		dl->offset = offset;

		self->line = strdup(line);

		dl->line = strdup(line);

		if (self->line == NULL)

		if (dl->line == NULL)

			goto out_delete;

			goto out_delete;

	}

	}





	return self;

	return dl;

out_delete:

out_delete:

	free(self);

	free(dl);

	return NULL;

	return NULL;

}

}





void objdump_line__free(struct objdump_line *self)

void disasm_line__free(struct disasm_line *dl)

{

{

	free(self->line);

	free(dl->line);

	free(self);

	free(dl);

}

}





static void objdump__add_line(struct list_head *head, struct objdump_line *line)

static void disasm__add(struct list_head *head, struct disasm_line *line)

{

{

	list_add_tail(&line->node, head);

	list_add_tail(&line->node, head);

}

}





struct objdump_line *objdump__get_next_ip_line(struct list_head *head,

struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disasm_line *pos)

					       struct objdump_line *pos)

{

{

	list_for_each_entry_continue(pos, head, node)

	list_for_each_entry_continue(pos, head, node)

		if (pos->offset >= 0)

		if (pos->offset >= 0)
@@ -116,15 +115,14 @@ struct objdump_line *objdump__get_next_ip_line(struct list_head *head, 
	return NULL;

	return NULL;

}

}





static int objdump_line__print(struct objdump_line *oline, struct symbol *sym,

static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 start,

			       u64 start, int evidx, u64 len, int min_pcnt,

		      int evidx, u64 len, int min_pcnt, int printed,

			       int printed, int max_lines,

		      int max_lines, struct disasm_line *queue)

			       struct objdump_line *queue)

{

{

	static const char *prev_line;

	static const char *prev_line;

	static const char *prev_color;

	static const char *prev_color;





	if (oline->offset != -1) {

	if (dl->offset != -1) {

		const char *path = NULL;

		const char *path = NULL;

		unsigned int hits = 0;

		unsigned int hits = 0;

		double percent = 0.0;

		double percent = 0.0;
@@ -132,11 +130,11 @@ static int objdump_line__print(struct objdump_line *oline, struct symbol *sym, 
		struct annotation *notes = symbol__annotation(sym);

		struct annotation *notes = symbol__annotation(sym);

		struct source_line *src_line = notes->src->lines;

		struct source_line *src_line = notes->src->lines;

		struct sym_hist *h = annotation__histogram(notes, evidx);

		struct sym_hist *h = annotation__histogram(notes, evidx);

		s64 offset = oline->offset;

		s64 offset = dl->offset;

		const u64 addr = start + offset;

		const u64 addr = start + offset;

		struct objdump_line *next;

		struct disasm_line *next;





		next = objdump__get_next_ip_line(&notes->src->source, oline);

		next = disasm__get_next_ip_line(&notes->src->source, dl);





		while (offset < (s64)len &&

		while (offset < (s64)len &&

		       (next == NULL || offset < next->offset)) {

		       (next == NULL || offset < next->offset)) {
@@ -161,9 +159,9 @@ static int objdump_line__print(struct objdump_line *oline, struct symbol *sym, 




		if (queue != NULL) {

		if (queue != NULL) {

			list_for_each_entry_from(queue, &notes->src->source, node) {

			list_for_each_entry_from(queue, &notes->src->source, node) {

				if (queue == oline)

				if (queue == dl)

					break;

					break;

				objdump_line__print(queue, sym, start, evidx, len,

				disasm_line__print(queue, sym, start, evidx, len,

						    0, 0, 1, NULL);

						    0, 0, 1, NULL);

			}

			}

		}

		}
@@ -187,17 +185,17 @@ static int objdump_line__print(struct objdump_line *oline, struct symbol *sym, 
		color_fprintf(stdout, color, " %7.2f", percent);

		color_fprintf(stdout, color, " %7.2f", percent);

		printf(" :	");

		printf(" :	");

		color_fprintf(stdout, PERF_COLOR_MAGENTA, "  %" PRIx64 ":", addr);

		color_fprintf(stdout, PERF_COLOR_MAGENTA, "  %" PRIx64 ":", addr);

		color_fprintf(stdout, PERF_COLOR_BLUE, "%s\n", oline->line);

		color_fprintf(stdout, PERF_COLOR_BLUE, "%s\n", dl->line);

	} else if (max_lines && printed >= max_lines)

	} else if (max_lines && printed >= max_lines)

		return 1;

		return 1;

	else {

	else {

		if (queue)

		if (queue)

			return -1;

			return -1;





		if (!*oline->line)

		if (!*dl->line)

			printf("         :\n");

			printf("         :\n");

		else

		else

			printf("         :	%s\n", oline->line);

			printf("         :	%s\n", dl->line);

	}

	}





	return 0;

	return 0;
@@ -207,7 +205,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, 
				      FILE *file, size_t privsize)

				      FILE *file, size_t privsize)

{

{

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *objdump_line;

	struct disasm_line *dl;

	char *line = NULL, *parsed_line, *tmp, *tmp2, *c;

	char *line = NULL, *parsed_line, *tmp, *tmp2, *c;

	size_t line_len;

	size_t line_len;

	s64 line_ip, offset = -1;

	s64 line_ip, offset = -1;
@@ -258,13 +256,13 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, 
			parsed_line = tmp2 + 1;

			parsed_line = tmp2 + 1;

	}

	}





	objdump_line = objdump_line__new(offset, parsed_line, privsize);

	dl = disasm_line__new(offset, parsed_line, privsize);

	free(line);

	free(line);





	if (objdump_line == NULL)

	if (dl == NULL)

		return -1;

		return -1;





	objdump__add_line(&notes->src->source, objdump_line);

	disasm__add(&notes->src->source, dl);





	return 0;

	return 0;

}

}
@@ -503,7 +501,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx, 
	struct dso *dso = map->dso;

	struct dso *dso = map->dso;

	const char *filename = dso->long_name, *d_filename;

	const char *filename = dso->long_name, *d_filename;

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *pos, *queue = NULL;

	struct disasm_line *pos, *queue = NULL;

	u64 start = map__rip_2objdump(map, sym->start);

	u64 start = map__rip_2objdump(map, sym->start);

	int printed = 2, queue_len = 0;

	int printed = 2, queue_len = 0;

	int more = 0;

	int more = 0;
@@ -528,7 +526,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx, 
			queue_len = 0;

			queue_len = 0;

		}

		}





		switch (objdump_line__print(pos, sym, start, evidx, len,

		switch (disasm_line__print(pos, sym, start, evidx, len,

					    min_pcnt, printed, max_lines,

					    min_pcnt, printed, max_lines,

					    queue)) {

					    queue)) {

		case 0:

		case 0:
@@ -583,13 +581,13 @@ void symbol__annotate_decay_histogram(struct symbol *sym, int evidx) 
	}

	}

}

}





void objdump_line_list__purge(struct list_head *head)

void disasm__purge(struct list_head *head)

{

{

	struct objdump_line *pos, *n;

	struct disasm_line *pos, *n;





	list_for_each_entry_safe(pos, n, head, node) {

	list_for_each_entry_safe(pos, n, head, node) {

		list_del(&pos->node);

		list_del(&pos->node);

		objdump_line__free(pos);

		disasm_line__free(pos);

	}

	}

}

}
@@ -618,7 +616,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx, 
	if (print_lines)

	if (print_lines)

		symbol__free_source_line(sym, len);

		symbol__free_source_line(sym, len);





	objdump_line_list__purge(&symbol__annotation(sym)->src->source);

	disasm__purge(&symbol__annotation(sym)->src->source);





	return 0;

	return 0;

}
 
}

tools/perf/util/annotate.h

+5 −6
Original line number Original line Diff line number Diff line
@@ -7,15 +7,14 @@ 
#include <linux/list.h>

#include <linux/list.h>

#include <linux/rbtree.h>

#include <linux/rbtree.h>





struct objdump_line {

struct disasm_line {

	struct list_head node;

	struct list_head node;

	s64		 offset;

	s64		 offset;

	char		 *line;

	char		 *line;

};

};





void objdump_line__free(struct objdump_line *self);

void disasm_line__free(struct disasm_line *dl);

struct objdump_line *objdump__get_next_ip_line(struct list_head *head,

struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disasm_line *pos);

					       struct objdump_line *pos);





struct sym_hist {

struct sym_hist {

	u64		sum;

	u64		sum;
@@ -32,7 +31,7 @@ struct source_line { 
 *

 *

 * @histogram: Array of addr hit histograms per event being monitored

 * @histogram: Array of addr hit histograms per event being monitored

 * @lines: If 'print_lines' is specified, per source code line percentages

 * @lines: If 'print_lines' is specified, per source code line percentages

 * @source: source parsed from objdump -dS

 * @source: source parsed from a disassembler like objdump -dS

 *

 *

 * lines is allocated, percentages calculated and all sorted by percentage

 * lines is allocated, percentages calculated and all sorted by percentage

 * when the annotation is about to be presented, so the percentages are for

 * when the annotation is about to be presented, so the percentages are for
@@ -82,7 +81,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx, 
			    int context);

			    int context);

void symbol__annotate_zero_histogram(struct symbol *sym, int evidx);

void symbol__annotate_zero_histogram(struct symbol *sym, int evidx);

void symbol__annotate_decay_histogram(struct symbol *sym, int evidx);

void symbol__annotate_decay_histogram(struct symbol *sym, int evidx);

void objdump_line_list__purge(struct list_head *head);

void disasm__purge(struct list_head *head);





int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,

int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx,

			 bool print_lines, bool full_paths, int min_pcnt,

			 bool print_lines, bool full_paths, int min_pcnt,