Commit 87ffef79 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf symbols: Treat all memory maps without dso file as loaded

The stack/vdso/heap memory maps dont have any dso file.  Setting the
perf dso objects as 'loaded' for these maps, we avoid unnecessary
warnings like:

  "Failed to open [stack], continuing without symbols"

All map__find_* functions still return NULL when searching for symbols
in these maps.

Link: http://lkml.kernel.org/r/20110824131834.GA2007@jolsa.brq.redhat.com
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e78cb362
...@@ -18,6 +18,13 @@ static inline int is_anon_memory(const char *filename) ...@@ -18,6 +18,13 @@ static inline int is_anon_memory(const char *filename)
return strcmp(filename, "//anon") == 0; return strcmp(filename, "//anon") == 0;
} }
static inline int is_no_dso_memory(const char *filename)
{
return !strcmp(filename, "[stack]") ||
!strcmp(filename, "[vdso]") ||
!strcmp(filename, "[heap]");
}
void map__init(struct map *self, enum map_type type, void map__init(struct map *self, enum map_type type,
u64 start, u64 end, u64 pgoff, struct dso *dso) u64 start, u64 end, u64 pgoff, struct dso *dso)
{ {
...@@ -42,9 +49,10 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, ...@@ -42,9 +49,10 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
if (self != NULL) { if (self != NULL) {
char newfilename[PATH_MAX]; char newfilename[PATH_MAX];
struct dso *dso; struct dso *dso;
int anon; int anon, no_dso;
anon = is_anon_memory(filename); anon = is_anon_memory(filename);
no_dso = is_no_dso_memory(filename);
if (anon) { if (anon) {
snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", pid); snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", pid);
...@@ -57,12 +65,16 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, ...@@ -57,12 +65,16 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
map__init(self, type, start, start + len, pgoff, dso); map__init(self, type, start, start + len, pgoff, dso);
if (anon) { if (anon || no_dso) {
set_identity:
self->map_ip = self->unmap_ip = identity__map_ip; self->map_ip = self->unmap_ip = identity__map_ip;
} else if (strcmp(filename, "[vdso]") == 0) {
/*
* Set memory without DSO as loaded. All map__find_*
* functions still return NULL, and we avoid the
* unnecessary map__load warning.
*/
if (no_dso)
dso__set_loaded(dso, self->type); dso__set_loaded(dso, self->type);
goto set_identity;
} }
} }
return self; return self;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment