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

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

perf annotate: Introduce scnprintf ins_ops method 



And implement the jump one, where if the operands string is not passed,
a compact form that uses just the target address is used.

Right now this is toggled via the 'o' option in the annotate browser,
switching from:

    0.00 :         ffffffff811661e8:       je     ffffffff81166204 <mem_cgroup_count_vm_event+0x44>
    0.00 :         ffffffff811661ea:       cmp    $0xb,%esi
    0.00 :         ffffffff811661ed:       je     ffffffff811661f8 <mem_cgroup_count_vm_event+0x38>

To:

    0.00 :         28:       je     44
    0.00 :         2a:       cmp    $0xb,%esi
    0.00 :         2d:       je     38

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
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-o88q46yh4kxgpd1chk5gvjl5@git.kernel.org


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

tools/perf/ui/browsers/annotate.c

+11 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro 
	else if (dl->offset == -1)

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

	else {

		char bf[64];

		char bf[256], *line = dl->line;

		u64 addr = dl->offset;

		int printed, color = -1;
@@ -96,7 +96,16 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro 
		slsmg_write_nstring(bf, printed);

		if (change_color)

			ui_browser__set_color(self, color);

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

		if (dl->ins && dl->ins->ops->scnprintf) {

			dl->ins->ops->scnprintf(dl->ins, bf, sizeof(bf),

						!ab->use_offset ? dl->operands : NULL,

						dl->target);

			line = bf;

			slsmg_write_nstring(" ", 7);

			printed += 7;

		}



		slsmg_write_nstring(line, width - 18 - printed);

	}



	if (current_entry)

tools/perf/util/annotate.c

+10 −0
Original line number Diff line number Diff line
@@ -44,8 +44,18 @@ static int jump_ops__parse_target(const char *operands, u64 *target) 
	return 0;

}



static int jump_ops__scnprintf(struct ins *ins, char *bf, size_t size,

			       const char *operands, u64 target)

{

	if (operands)

		return scnprintf(bf, size, "%-6.6s %s", ins->name, operands);



	return scnprintf(bf, size, "%-6.6s %" PRIx64, ins->name, target);

}



static struct ins_ops jump_ops = {

	.parse_target = jump_ops__parse_target,

	.scnprintf = jump_ops__scnprintf,

};



bool ins__is_jump(const struct ins *ins)

tools/perf/util/annotate.h

+4 −0
Original line number Diff line number Diff line
@@ -7,8 +7,12 @@ 
#include <linux/list.h>

#include <linux/rbtree.h>



struct ins;



struct ins_ops {

	int (*parse_target)(const char *operands, u64 *target);

	int (*scnprintf)(struct ins *ins, char *bf, size_t size,

			 const char *operands, u64 target);

};



struct ins {