Commit 361d1346 authored by Dave Martin's avatar Dave Martin Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Don't abbreviate file paths relative to the cwd 



This avoids around some problems where the full path is executables and DSOs it
needed for finding debug symbols on platforms with separated debug symbol files
such as Ubuntu.  This is simpler than tracking an extra name for each image.

The only impact should be that paths in verbose output from the perf tools
become absolute, instead of relative to .

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 0f0cbf7a

tools/perf/util/event.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ int event__process_mmap(event_t *self, struct perf_session *session) 
	map = map__new(&machine->user_dsos, self->mmap.start,

			self->mmap.len, self->mmap.pgoff,

			self->mmap.pid, self->mmap.filename,

			MAP__FUNCTION, session->cwd, session->cwdlen);

			MAP__FUNCTION);



	if (thread == NULL || map == NULL)

		goto out_problem;

tools/perf/util/map.c

+1 −21
Original line number Diff line number Diff line
@@ -17,16 +17,6 @@ static inline int is_anon_memory(const char *filename) 
	return strcmp(filename, "//anon") == 0;

}



static int strcommon(const char *pathname, char *cwd, int cwdlen)

{

	int n = 0;



	while (n < cwdlen && pathname[n] == cwd[n])

		++n;



	return n;

}



void map__init(struct map *self, enum map_type type,

	       u64 start, u64 end, u64 pgoff, struct dso *dso)

{
@@ -43,7 +33,7 @@ void map__init(struct map *self, enum map_type type, 


struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,

		     u64 pgoff, u32 pid, char *filename,

		     enum map_type type, char *cwd, int cwdlen)

		     enum map_type type)

{

	struct map *self = malloc(sizeof(*self));
@@ -52,16 +42,6 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, 
		struct dso *dso;

		int anon;



		if (cwd) {

			int n = strcommon(filename, cwd, cwdlen);



			if (n == cwdlen) {

				snprintf(newfilename, sizeof(newfilename),

					 ".%s", filename + n);

				filename = newfilename;

			}

		}



		anon = is_anon_memory(filename);



		if (anon) {

tools/perf/util/map.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void map__init(struct map *self, enum map_type type, 
	       u64 start, u64 end, u64 pgoff, struct dso *dso);

struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,

		     u64 pgoff, u32 pid, char *filename,

		     enum map_type type, char *cwd, int cwdlen);

		     enum map_type type);

void map__delete(struct map *self);

struct map *map__clone(struct map *self);

int map__overlap(struct map *l, struct map *r);

CRA Git | Maintained and supported by SUSTech CRA and CCSE