openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf symbols: Record the domain of DSOs in HEADER_BUILD_ID header table 

So that we can restore them to the right DSO list (either
dsos__kernel or dsos__user).

We do that just like the kernel does for the other events,
encoding PERF_RECORD_MISC_{KERNEL,USER} in perf_event_header.

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: <1262901583-8074-2-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-01-07 19:59:39 -02:00 committed by Ingo Molnar
parent fed5af61dc
commit a89e5abe3e
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/util/header.c
View File

@ -193,7 +193,7 @@ static int write_padded(int fd, const void *bf, size_t count,
continue; \
else
static int __dsos__write_buildid_table(struct list_head *head, int fd)
static int __dsos__write_buildid_table(struct list_head *head, u16 misc, int fd)
{
struct dso *pos;
@ -205,6 +205,7 @@ static int __dsos__write_buildid_table(struct list_head *head, int fd)
len = ALIGN(len, NAME_ALIGN);
memset(&b, 0, sizeof(b));
memcpy(&b.build_id, pos->build_id, sizeof(pos->build_id));
b.header.misc = misc;
b.header.size = sizeof(b) + len;
err = do_write(fd, &b, sizeof(b));
if (err < 0)
@ -220,9 +221,11 @@ static int __dsos__write_buildid_table(struct list_head *head, int fd)
static int dsos__write_buildid_table(int fd)
{
int err = __dsos__write_buildid_table(&dsos__kernel, fd);
int err = __dsos__write_buildid_table(&dsos__kernel,
PERF_RECORD_MISC_KERNEL, fd);
if (err == 0)
err = __dsos__write_buildid_table(&dsos__user, fd);
err = __dsos__write_buildid_table(&dsos__user,
PERF_RECORD_MISC_USER, fd);
return err;
}

6
tools/perf/util/session.c
View File

@ -255,6 +255,7 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
while (offset < limit) {
struct dso *dso;
ssize_t len;
struct list_head *head = &dsos__user;
if (read(input, &bev, sizeof(bev)) != sizeof(bev))
goto out;
@ -263,7 +264,10 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
if (read(input, filename, len) != len)
goto out;
dso = dsos__findnew(filename);
if (bev.header.misc & PERF_RECORD_MISC_KERNEL)
head = &dsos__kernel;
dso = __dsos__findnew(head, filename);
if (dso != NULL)
dso__set_build_id(dso, &bev.build_id);

6
tools/perf/util/symbol.c
View File

@ -1615,14 +1615,14 @@ static struct dso *dsos__find(struct list_head *head, const char *name)
return NULL;
}
struct dso *dsos__findnew(const char *name)
struct dso *__dsos__findnew(struct list_head *head, const char *name)
{
struct dso *dso = dsos__find(&dsos__user, name);
struct dso *dso = dsos__find(head, name);
if (!dso) {
dso = dso__new(name);
if (dso != NULL) {
dsos__add(&dsos__user, dso);
dsos__add(head, dso);
dso__set_basename(dso);
}
}

11
tools/perf/util/symbol.h
View File

@ -115,9 +115,17 @@ bool dso__sorted_by_name(const struct dso *self, enum map_type type);
void dso__sort_by_name(struct dso *self, enum map_type type);
extern struct list_head dsos__user, dsos__kernel;
struct dso *__dsos__findnew(struct list_head *head, const char *name);
static inline struct dso *dsos__findnew(const char *name)
{
return __dsos__findnew(&dsos__user, name);
}
struct perf_session;
struct dso *dsos__findnew(const char *name);
int dso__load(struct dso *self, struct map *map, struct perf_session *session,
symbol_filter_t filter);
void dsos__fprintf(FILE *fp);
@ -143,6 +151,5 @@ bool symbol_type__is_a(char symbol_type, enum map_type map_type);
int perf_session__create_kernel_maps(struct perf_session *self);
extern struct list_head dsos__user, dsos__kernel;
extern struct dso *vdso;
#endif /* __PERF_SYMBOL */