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

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

perf annotate: Adopt anotation options from symbol_conf 

Continuing to group annotation options in an annotation specific struct.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.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-astei92tzxp4yccag5pxb2h7@git.kernel.org


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

tools/perf/builtin-annotate.c

+2 −2
Original line number Diff line number Diff line
@@ -515,9 +515,9 @@ int cmd_annotate(int argc, const char **argv) 
	OPT_CALLBACK(0, "symfs", NULL, "directory",

		     "Look for files with symbols relative to this directory",

		     symbol__config_symfs),

	OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,

	OPT_BOOLEAN(0, "source", &annotate.opts.annotate_src,

		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,

	OPT_BOOLEAN(0, "asm-raw", &annotate.opts.show_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

tools/perf/builtin-report.c

+4 −2
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct report { 
	bool			group_set;

	int			max_stack;

	struct perf_read_values	show_threads_values;

	struct annotation_options annotation_opts;

	const char		*pretty_printing_style;

	const char		*cpu_list;

	const char		*symbol_filter_str;
@@ -988,6 +989,7 @@ int cmd_report(int argc, const char **argv) 
		.max_stack		 = PERF_MAX_STACK_DEPTH,

		.pretty_printing_style	 = "normal",

		.socket_filter		 = -1,

		.annotation_opts	 = annotation__default_options,

	};

	const struct option options[] = {

	OPT_STRING('i', "input", &input_name, "file",
@@ -1077,9 +1079,9 @@ int cmd_report(int argc, const char **argv) 
		   "list of cpus to profile"),

	OPT_BOOLEAN('I', "show-info", &report.show_full_info,

		    "Display extended information about perf.data file"),

	OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,

	OPT_BOOLEAN(0, "source", &report.annotation_opts.annotate_src,

		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,

	OPT_BOOLEAN(0, "asm-raw", &report.annotation_opts.show_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

tools/perf/builtin-top.c

+2 −2
Original line number Diff line number Diff line
@@ -1340,9 +1340,9 @@ int cmd_top(int argc, const char **argv) 
		   "only consider symbols in these comms"),

	OPT_STRING(0, "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",

		   "only consider these symbols"),

	OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,

	OPT_BOOLEAN(0, "source", &top.annotation_opts.annotate_src,

		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,

	OPT_BOOLEAN(0, "asm-raw", &top.annotation_opts.show_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel,

		    "Enable kernel symbol demangling"),

tools/perf/util/annotate.c

+4 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
struct annotation_options annotation__default_options = {

	.use_offset     = true,

	.jump_arrows    = true,

	.annotate_src	= true,

	.offset_level	= ANNOTATION__OFFSET_JUMP_TARGETS,

};
@@ -1609,6 +1610,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil 


static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)

{

	struct annotation_options *opts = args->options;

	struct map *map = args->ms.map;

	struct dso *dso = map->dso;

	char *command;
@@ -1661,8 +1663,8 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) 
		 disassembler_style ? disassembler_style : "",

		 map__rip_2objdump(map, sym->start),

		 map__rip_2objdump(map, sym->end),

		 symbol_conf.annotate_asm_raw ? "" : "--no-show-raw",

		 symbol_conf.annotate_src ? "-S" : "",

		 opts->show_asm_raw ? "" : "--no-show-raw",

		 opts->annotate_src ? "-S" : "",

		 symfs_filename, symfs_filename);



	if (err < 0) {

tools/perf/util/annotate.h

+3 −1
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ struct annotation_options { 
	     show_nr_jumps,

	     show_nr_samples,

	     show_total_period,

	     show_minmax_cycle;

	     show_minmax_cycle,

	     show_asm_raw,

	     annotate_src;

	u8   offset_level;

	int  min_pcnt;

	int  max_lines;