adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf tools: Factor out the map initialization

Browse source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1256927305-4628-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-10-30 16:28:23 -02:00 committed by Ingo Molnar
parent 3ed67776fc
commit afb7b4f08e
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/util/event.h
View file

@ -105,6 +105,8 @@ struct symbol;
typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym); typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);
void map__init(struct map *self, u64 start, u64 end, u64 pgoff,
struct dso *dso);
struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen, struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen,
unsigned int sym_priv_size); unsigned int sym_priv_size);
struct map *map__clone(struct map *self); struct map *map__clone(struct map *self);

28
tools/perf/util/map.c
View file

@ -20,6 +20,18 @@ static int strcommon(const char *pathname, char *cwd, int cwdlen)
return n; return n;
} }
void map__init(struct map *self, u64 start, u64 end, u64 pgoff,
struct dso *dso)
{
self->start = start;
self->end = end;
self->pgoff = pgoff;
self->dso = dso;
self->map_ip = map__map_ip;
self->unmap_ip = map__unmap_ip;
RB_CLEAR_NODE(&self->rb_node);
}
struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen, struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen,
unsigned int sym_priv_size) unsigned int sym_priv_size)
{ {
@ -28,6 +40,7 @@ struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen,
if (self != NULL) { if (self != NULL) {
const char *filename = event->filename; const char *filename = event->filename;
char newfilename[PATH_MAX]; char newfilename[PATH_MAX];
struct dso *dso;
int anon; int anon;
if (cwd) { if (cwd) {
@ -47,20 +60,15 @@ struct map *map__new(struct mmap_event *event, char *cwd, int cwdlen,
filename = newfilename; filename = newfilename;
} }
self->start = event->start; dso = dsos__findnew(filename, sym_priv_size);
self->end = event->start + event->len; if (dso == NULL)
self->pgoff = event->pgoff;
self->dso = dsos__findnew(filename, sym_priv_size);
if (self->dso == NULL)
goto out_delete; goto out_delete;
map__init(self, event->start, event->start + event->len,
event->pgoff, dso);
if (self->dso == vdso || anon) if (self->dso == vdso || anon)
self->map_ip = self->unmap_ip = identity__map_ip; self->map_ip = self->unmap_ip = identity__map_ip;
else {
self->map_ip = map__map_ip;
self->unmap_ip = map__unmap_ip;
}
} }
return self; return self;
out_delete: out_delete:

12
tools/perf/util/symbol.c
View file

@ -1132,18 +1132,12 @@ static struct map *map__new2(u64 start, struct dso *dso)
struct map *self = malloc(sizeof(*self)); struct map *self = malloc(sizeof(*self));
if (self != NULL) { if (self != NULL) {
self->start = start;
/* /*
* Will be filled after we load all the symbols * ->end will be filled after we load all the symbols
*/ */
self->end = 0; map__init(self, start, 0, 0, dso);
self->pgoff = 0;
self->dso = dso;
self->map_ip = map__map_ip;
self->unmap_ip = map__unmap_ip;
RB_CLEAR_NODE(&self->rb_node);
} }
return self; return self;
} }