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

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

perf annotate: Move objdump_path to struct annotation_options 

One more step in grouping annotation options.

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


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

tools/perf/arch/common.c

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int perf_env__lookup_binutils_path(struct perf_env *env, 
	return -1;

}



int perf_env__lookup_objdump(struct perf_env *env)

int perf_env__lookup_objdump(struct perf_env *env, const char **path)

{

	/*

	 * For live mode, env->arch will be NULL and we can use
@@ -198,5 +198,5 @@ int perf_env__lookup_objdump(struct perf_env *env) 
	if (env->arch == NULL)

		return 0;



	return perf_env__lookup_binutils_path(env, "objdump", &objdump_path);

	return perf_env__lookup_binutils_path(env, "objdump", path);

}

tools/perf/arch/common.h

+1 −3
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


#include "../util/env.h"



extern const char *objdump_path;



int perf_env__lookup_objdump(struct perf_env *env);

int perf_env__lookup_objdump(struct perf_env *env, const char **path);



#endif /* ARCH_PERF_COMMON_H */

tools/perf/builtin-annotate.c

+4 −3
Original line number Diff line number Diff line
@@ -388,8 +388,9 @@ static int __cmd_annotate(struct perf_annotate *ann) 
			goto out;

	}



	if (!objdump_path) {

		ret = perf_env__lookup_objdump(&session->header.env);

	if (!ann->opts.objdump_path) {

		ret = perf_env__lookup_objdump(&session->header.env,

					       &ann->opts.objdump_path);

		if (ret)

			goto out;

	}
@@ -521,7 +522,7 @@ int cmd_annotate(int argc, const char **argv) 
		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &annotate.opts.disassembler_style, "disassembler style",

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

	OPT_STRING(0, "objdump", &objdump_path, "path",

	OPT_STRING(0, "objdump", &annotate.opts.objdump_path, "path",

		   "objdump binary to use for disassembly and annotations"),

	OPT_BOOLEAN(0, "group", &symbol_conf.event_group,

		    "Show event group information together"),

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ int cmd_report(int argc, const char **argv) 
		    parse_branch_mode),

	OPT_BOOLEAN(0, "branch-history", &branch_call_mode,

		    "add last branch records to call history"),

	OPT_STRING(0, "objdump", &objdump_path, "path",

	OPT_STRING(0, "objdump", &report.annotation_opts.objdump_path, "path",

		   "objdump binary to use for disassembly and annotations"),

	OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,

		    "Disable symbol demangling"),

tools/perf/builtin-top.c

+4 −3
Original line number Diff line number Diff line
@@ -1077,8 +1077,9 @@ static int __cmd_top(struct perf_top *top) 
	if (top->session == NULL)

		return -1;



	if (!objdump_path) {

		ret = perf_env__lookup_objdump(&top->session->header.env);

	if (!top->annotation_opts.objdump_path) {

		ret = perf_env__lookup_objdump(&top->session->header.env,

					       &top->annotation_opts.objdump_path);

		if (ret)

			goto out_delete;

	}
@@ -1347,7 +1348,7 @@ int cmd_top(int argc, const char **argv) 
		    "Display raw encoding of assembly instructions (default)"),

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

		    "Enable kernel symbol demangling"),

	OPT_STRING(0, "objdump", &objdump_path, "path",

	OPT_STRING(0, "objdump", &top.annotation_opts.objdump_path, "path",

		    "objdump binary to use for disassembly and annotations"),

	OPT_STRING('M', "disassembler-style", &top.annotation_opts.disassembler_style, "disassembler style",

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