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

Commit f7d87444 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf session: Move full_paths config to symbol_conf 



Now perf_event_ops has just that, event handlers.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1261957026-15580-8-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 31d337c4

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static const struct option options[] = { 
	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),

	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,

		    "load module symbols - WARNING: use only with -k and LIVE kernel"),

	OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths,

	OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths,

		    "Don't shorten the pathnames taking into account the cwd"),

	OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",

		   "only consider symbols in these dsos"),

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static const struct option options[] = { 
		   "pretty printing style key: normal raw"),

	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",

		   "sort by key(s): pid, comm, dso, symbol, parent"),

	OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths,

	OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths,

		    "Don't shorten the pathnames taking into account the cwd"),

	OPT_STRING('p', "parent", &parent_pattern, "regex",

		   "regex filter to identify parent, see: '--sort parent'"),

tools/perf/util/session.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int perf_session__process_events(struct perf_session *self, 


	head = self->header.data_offset;



	if (!ops->full_paths) {

	if (!symbol_conf.full_paths) {

		char bf[PATH_MAX];



		if (getcwd(bf, sizeof(bf)) == NULL) {

tools/perf/util/session.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ struct perf_event_ops { 
	event_op	process_read_event;

	event_op	process_throttle_event;

	event_op	process_unthrottle_event;

	bool		full_paths;

};



struct perf_session *perf_session__new(const char *filename, int mode, bool force);

tools/perf/util/symbol.h

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ struct symbol_conf { 
			sort_by_name,

			show_nr_samples,

			use_callchain,

			exclude_other;

			exclude_other,

			full_paths;

	const char	*vmlinux_name,

			*field_sep;

	char            *dso_list_str,