perf symbols: Pass the mmap parameters instead of using mmap_event
To reduce the coupling of the symbol system with the rest of perf. Signed-off-by: Arnaldo 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: <1269557941-15617-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
d5679ae4d2
commit
b177f63f52
|
@ -393,7 +393,8 @@ int event__process_mmap(event_t *self, struct perf_session *session)
|
|||
}
|
||||
|
||||
thread = perf_session__findnew(session, self->mmap.pid);
|
||||
map = map__new(&self->mmap, MAP__FUNCTION,
|
||||
map = map__new(self->mmap.start, self->mmap.len, self->mmap.pgoff,
|
||||
self->mmap.pid, self->mmap.filename, MAP__FUNCTION,
|
||||
session->cwd, session->cwdlen);
|
||||
|
||||
if (thread == NULL || map == NULL)
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
#include "event.h"
|
||||
#include "symbol.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -38,13 +37,12 @@ void map__init(struct map *self, enum map_type type,
|
|||
RB_CLEAR_NODE(&self->rb_node);
|
||||
}
|
||||
|
||||
struct map *map__new(struct mmap_event *event, enum map_type type,
|
||||
char *cwd, int cwdlen)
|
||||
struct map *map__new(u64 start, u64 len, u64 pgoff, u32 pid, char *filename,
|
||||
enum map_type type, char *cwd, int cwdlen)
|
||||
{
|
||||
struct map *self = malloc(sizeof(*self));
|
||||
|
||||
if (self != NULL) {
|
||||
const char *filename = event->filename;
|
||||
char newfilename[PATH_MAX];
|
||||
struct dso *dso;
|
||||
int anon;
|
||||
|
@ -62,7 +60,7 @@ struct map *map__new(struct mmap_event *event, enum map_type type,
|
|||
anon = is_anon_memory(filename);
|
||||
|
||||
if (anon) {
|
||||
snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", event->pid);
|
||||
snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", pid);
|
||||
filename = newfilename;
|
||||
}
|
||||
|
||||
|
@ -70,8 +68,7 @@ struct map *map__new(struct mmap_event *event, enum map_type type,
|
|||
if (dso == NULL)
|
||||
goto out_delete;
|
||||
|
||||
map__init(self, type, event->start, event->start + event->len,
|
||||
event->pgoff, dso);
|
||||
map__init(self, type, start, start + len, pgoff, dso);
|
||||
|
||||
if (anon) {
|
||||
set_identity:
|
||||
|
|
|
@ -68,14 +68,13 @@ u64 map__rip_2objdump(struct map *map, u64 rip);
|
|||
u64 map__objdump_2ip(struct map *map, u64 addr);
|
||||
|
||||
struct symbol;
|
||||
struct mmap_event;
|
||||
|
||||
typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);
|
||||
|
||||
void map__init(struct map *self, enum map_type type,
|
||||
u64 start, u64 end, u64 pgoff, struct dso *dso);
|
||||
struct map *map__new(struct mmap_event *event, enum map_type,
|
||||
char *cwd, int cwdlen);
|
||||
struct map *map__new(u64 start, u64 len, u64 pgoff, u32 pid, char *filename,
|
||||
enum map_type type, char *cwd, int cwdlen);
|
||||
void map__delete(struct map *self);
|
||||
struct map *map__clone(struct map *self);
|
||||
int map__overlap(struct map *l, struct map *r);
|
||||
|
|
Loading…
Reference in New Issue