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

Commit 88ca895d authored by Dave Martin's avatar Dave Martin Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove unneeded code for tracking the cwd in perf sessions 



Tidy-up patch to remove some code and struct perf_session data members
which are no longer needed due to the previous patch: "perf tools: Don't
abbreviate file paths relative to the cwd".

LKML-Reference: <new-submission>
Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 361d1346

tools/perf/builtin-buildid-list.c

+1 −3
Original line number Diff line number Diff line
@@ -43,10 +43,8 @@ static int __cmd_buildid_list(void) 
	if (session == NULL)

		return -1;



	if (with_hits) {

		symbol_conf.full_paths = true;

	if (with_hits)

		perf_session__process_events(session, &build_id__mark_dso_hit_ops);

	}



	perf_session__fprintf_dsos_buildid(session, stdout, with_hits);

tools/perf/builtin-diff.c

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ 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", &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"),

	OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",

tools/perf/builtin-report.c

+0 −2
Original line number Diff line number Diff line
@@ -441,8 +441,6 @@ 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", &symbol_conf.full_paths,

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

	OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,

		    "Show sample percentage for different cpu modes"),

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

tools/perf/util/session.c

+1 −21
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc 
	self->hists_tree = RB_ROOT;

	self->last_match = NULL;

	self->mmap_window = 32;

	self->cwd = NULL;

	self->cwdlen = 0;

	self->machines = RB_ROOT;

	self->repipe = repipe;

	INIT_LIST_HEAD(&self->ordered_samples.samples_head);
@@ -130,7 +128,6 @@ void perf_session__delete(struct perf_session *self) 
{

	perf_header__exit(&self->header);

	close(self->fd);

	free(self->cwd);

	free(self);

}
@@ -832,23 +829,6 @@ int perf_session__process_events(struct perf_session *self, 
	if (perf_session__register_idle_thread(self) == NULL)

		return -ENOMEM;



	if (!symbol_conf.full_paths) {

		char bf[PATH_MAX];



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

			err = -errno;

out_getcwd_err:

			pr_err("failed to get the current directory\n");

			goto out_err;

		}

		self->cwd = strdup(bf);

		if (self->cwd == NULL) {

			err = -ENOMEM;

			goto out_getcwd_err;

		}

		self->cwdlen = strlen(self->cwd);

	}



	if (!self->fd_pipe)

		err = __perf_session__process_events(self,

						     self->header.data_offset,
@@ -856,7 +836,7 @@ int perf_session__process_events(struct perf_session *self, 
						     self->size, ops);

	else

		err = __perf_session__process_pipe_events(self, ops);

out_err:



	return err;

}

tools/perf/util/symbol.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ struct symbol_conf { 
			show_nr_samples,

			use_callchain,

			exclude_other,

			full_paths,

			show_cpu_utilization;

	const char	*vmlinux_name,

			*source_prefix,