perf symbols: Move more map_groups methods to map.c
While writing a standalone test app that uses the symbol system to find kernel space symbols I noticed these also need to be moved. 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> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
Родитель
11164cd4f6
Коммит
c6e718ff8c
|
|
@ -658,7 +658,7 @@ print_entries:
|
|||
|
||||
if (h->ms.map == NULL && verbose > 1) {
|
||||
__map_groups__fprintf_maps(&h->thread->mg,
|
||||
MAP__FUNCTION, fp);
|
||||
MAP__FUNCTION, verbose, fp);
|
||||
fprintf(fp, "%.10s end\n", graph_dotted_line);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "symbol.h"
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
@ -234,6 +235,37 @@ u64 map__objdump_2ip(struct map *map, u64 addr)
|
|||
return ip;
|
||||
}
|
||||
|
||||
void map_groups__init(struct map_groups *self)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < MAP__NR_TYPES; ++i) {
|
||||
self->maps[i] = RB_ROOT;
|
||||
INIT_LIST_HEAD(&self->removed_maps[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void map_groups__flush(struct map_groups *self)
|
||||
{
|
||||
int type;
|
||||
|
||||
for (type = 0; type < MAP__NR_TYPES; type++) {
|
||||
struct rb_root *root = &self->maps[type];
|
||||
struct rb_node *next = rb_first(root);
|
||||
|
||||
while (next) {
|
||||
struct map *pos = rb_entry(next, struct map, rb_node);
|
||||
next = rb_next(&pos->rb_node);
|
||||
rb_erase(&pos->rb_node, root);
|
||||
/*
|
||||
* We may have references to this map, for
|
||||
* instance in some hist_entry instances, so
|
||||
* just move them to a separate list.
|
||||
*/
|
||||
list_add_tail(&pos->node, &self->removed_maps[pos->type]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct symbol *map_groups__find_symbol(struct map_groups *self,
|
||||
enum map_type type, u64 addr,
|
||||
symbol_filter_t filter)
|
||||
|
|
@ -246,6 +278,142 @@ struct symbol *map_groups__find_symbol(struct map_groups *self,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
size_t __map_groups__fprintf_maps(struct map_groups *self,
|
||||
enum map_type type, int verbose, FILE *fp)
|
||||
{
|
||||
size_t printed = fprintf(fp, "%s:\n", map_type__name[type]);
|
||||
struct rb_node *nd;
|
||||
|
||||
for (nd = rb_first(&self->maps[type]); nd; nd = rb_next(nd)) {
|
||||
struct map *pos = rb_entry(nd, struct map, rb_node);
|
||||
printed += fprintf(fp, "Map:");
|
||||
printed += map__fprintf(pos, fp);
|
||||
if (verbose > 2) {
|
||||
printed += dso__fprintf(pos->dso, type, fp);
|
||||
printed += fprintf(fp, "--\n");
|
||||
}
|
||||
}
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
size_t map_groups__fprintf_maps(struct map_groups *self, int verbose, FILE *fp)
|
||||
{
|
||||
size_t printed = 0, i;
|
||||
for (i = 0; i < MAP__NR_TYPES; ++i)
|
||||
printed += __map_groups__fprintf_maps(self, i, verbose, fp);
|
||||
return printed;
|
||||
}
|
||||
|
||||
static size_t __map_groups__fprintf_removed_maps(struct map_groups *self,
|
||||
enum map_type type,
|
||||
int verbose, FILE *fp)
|
||||
{
|
||||
struct map *pos;
|
||||
size_t printed = 0;
|
||||
|
||||
list_for_each_entry(pos, &self->removed_maps[type], node) {
|
||||
printed += fprintf(fp, "Map:");
|
||||
printed += map__fprintf(pos, fp);
|
||||
if (verbose > 1) {
|
||||
printed += dso__fprintf(pos->dso, type, fp);
|
||||
printed += fprintf(fp, "--\n");
|
||||
}
|
||||
}
|
||||
return printed;
|
||||
}
|
||||
|
||||
static size_t map_groups__fprintf_removed_maps(struct map_groups *self,
|
||||
int verbose, FILE *fp)
|
||||
{
|
||||
size_t printed = 0, i;
|
||||
for (i = 0; i < MAP__NR_TYPES; ++i)
|
||||
printed += __map_groups__fprintf_removed_maps(self, i, verbose, fp);
|
||||
return printed;
|
||||
}
|
||||
|
||||
size_t map_groups__fprintf(struct map_groups *self, int verbose, FILE *fp)
|
||||
{
|
||||
size_t printed = map_groups__fprintf_maps(self, verbose, fp);
|
||||
printed += fprintf(fp, "Removed maps:\n");
|
||||
return printed + map_groups__fprintf_removed_maps(self, verbose, fp);
|
||||
}
|
||||
|
||||
int map_groups__fixup_overlappings(struct map_groups *self, struct map *map,
|
||||
int verbose, FILE *fp)
|
||||
{
|
||||
struct rb_root *root = &self->maps[map->type];
|
||||
struct rb_node *next = rb_first(root);
|
||||
|
||||
while (next) {
|
||||
struct map *pos = rb_entry(next, struct map, rb_node);
|
||||
next = rb_next(&pos->rb_node);
|
||||
|
||||
if (!map__overlap(pos, map))
|
||||
continue;
|
||||
|
||||
if (verbose >= 2) {
|
||||
fputs("overlapping maps:\n", fp);
|
||||
map__fprintf(map, fp);
|
||||
map__fprintf(pos, fp);
|
||||
}
|
||||
|
||||
rb_erase(&pos->rb_node, root);
|
||||
/*
|
||||
* We may have references to this map, for instance in some
|
||||
* hist_entry instances, so just move them to a separate
|
||||
* list.
|
||||
*/
|
||||
list_add_tail(&pos->node, &self->removed_maps[map->type]);
|
||||
/*
|
||||
* Now check if we need to create new maps for areas not
|
||||
* overlapped by the new map:
|
||||
*/
|
||||
if (map->start > pos->start) {
|
||||
struct map *before = map__clone(pos);
|
||||
|
||||
if (before == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
before->end = map->start - 1;
|
||||
map_groups__insert(self, before);
|
||||
if (verbose >= 2)
|
||||
map__fprintf(before, fp);
|
||||
}
|
||||
|
||||
if (map->end < pos->end) {
|
||||
struct map *after = map__clone(pos);
|
||||
|
||||
if (after == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
after->start = map->end + 1;
|
||||
map_groups__insert(self, after);
|
||||
if (verbose >= 2)
|
||||
map__fprintf(after, fp);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* XXX This should not really _copy_ te maps, but refcount them.
|
||||
*/
|
||||
int map_groups__clone(struct map_groups *self,
|
||||
struct map_groups *parent, enum map_type type)
|
||||
{
|
||||
struct rb_node *nd;
|
||||
for (nd = rb_first(&parent->maps[type]); nd; nd = rb_next(nd)) {
|
||||
struct map *map = rb_entry(nd, struct map, rb_node);
|
||||
struct map *new = map__clone(map);
|
||||
if (new == NULL)
|
||||
return -ENOMEM;
|
||||
map_groups__insert(self, new);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static u64 map__reloc_map_ip(struct map *map, u64 ip)
|
||||
{
|
||||
return ip + (s64)map->pgoff;
|
||||
|
|
|
|||
|
|
@ -97,11 +97,14 @@ struct map_groups {
|
|||
};
|
||||
|
||||
size_t __map_groups__fprintf_maps(struct map_groups *self,
|
||||
enum map_type type, FILE *fp);
|
||||
enum map_type type, int verbose, FILE *fp);
|
||||
void maps__insert(struct rb_root *maps, struct map *map);
|
||||
struct map *maps__find(struct rb_root *maps, u64 addr);
|
||||
void map_groups__init(struct map_groups *self);
|
||||
size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp);
|
||||
int map_groups__clone(struct map_groups *self,
|
||||
struct map_groups *parent, enum map_type type);
|
||||
size_t map_groups__fprintf(struct map_groups *self, int verbose, FILE *fp);
|
||||
size_t map_groups__fprintf_maps(struct map_groups *self, int verbose, FILE *fp);
|
||||
|
||||
static inline void map_groups__insert(struct map_groups *self, struct map *map)
|
||||
{
|
||||
|
|
@ -125,6 +128,9 @@ static inline struct symbol *map_groups__find_function(struct map_groups *self,
|
|||
return map_groups__find_symbol(self, MAP__FUNCTION, addr, filter);
|
||||
}
|
||||
|
||||
int map_groups__fixup_overlappings(struct map_groups *self, struct map *map,
|
||||
int verbose, FILE *fp);
|
||||
|
||||
struct map *map_groups__find_by_name(struct map_groups *self,
|
||||
enum map_type type, const char *name);
|
||||
int __map_groups__create_kernel_maps(struct map_groups *self,
|
||||
|
|
@ -134,5 +140,6 @@ int map_groups__create_kernel_maps(struct map_groups *self,
|
|||
struct map *vmlinux_maps[MAP__NR_TYPES]);
|
||||
struct map *map_groups__new_module(struct map_groups *self, u64 start,
|
||||
const char *filename);
|
||||
void map_groups__flush(struct map_groups *self);
|
||||
|
||||
#endif /* __PERF_MAP_H */
|
||||
|
|
|
|||
|
|
@ -38,15 +38,6 @@ failure:
|
|||
return ret;
|
||||
}
|
||||
|
||||
void map_groups__init(struct map_groups *self)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < MAP__NR_TYPES; ++i) {
|
||||
self->maps[i] = RB_ROOT;
|
||||
INIT_LIST_HEAD(&self->removed_maps[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static struct thread *thread__new(pid_t pid)
|
||||
{
|
||||
struct thread *self = zalloc(sizeof(*self));
|
||||
|
|
@ -62,28 +53,6 @@ static struct thread *thread__new(pid_t pid)
|
|||
return self;
|
||||
}
|
||||
|
||||
static void map_groups__flush(struct map_groups *self)
|
||||
{
|
||||
int type;
|
||||
|
||||
for (type = 0; type < MAP__NR_TYPES; type++) {
|
||||
struct rb_root *root = &self->maps[type];
|
||||
struct rb_node *next = rb_first(root);
|
||||
|
||||
while (next) {
|
||||
struct map *pos = rb_entry(next, struct map, rb_node);
|
||||
next = rb_next(&pos->rb_node);
|
||||
rb_erase(&pos->rb_node, root);
|
||||
/*
|
||||
* We may have references to this map, for
|
||||
* instance in some hist_entry instances, so
|
||||
* just move them to a separate list.
|
||||
*/
|
||||
list_add_tail(&pos->node, &self->removed_maps[pos->type]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int thread__set_comm(struct thread *self, const char *comm)
|
||||
{
|
||||
int err;
|
||||
|
|
@ -110,69 +79,10 @@ int thread__comm_len(struct thread *self)
|
|||
return self->comm_len;
|
||||
}
|
||||
|
||||
size_t __map_groups__fprintf_maps(struct map_groups *self,
|
||||
enum map_type type, FILE *fp)
|
||||
{
|
||||
size_t printed = fprintf(fp, "%s:\n", map_type__name[type]);
|
||||
struct rb_node *nd;
|
||||
|
||||
for (nd = rb_first(&self->maps[type]); nd; nd = rb_next(nd)) {
|
||||
struct map *pos = rb_entry(nd, struct map, rb_node);
|
||||
printed += fprintf(fp, "Map:");
|
||||
printed += map__fprintf(pos, fp);
|
||||
if (verbose > 2) {
|
||||
printed += dso__fprintf(pos->dso, type, fp);
|
||||
printed += fprintf(fp, "--\n");
|
||||
}
|
||||
}
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp)
|
||||
{
|
||||
size_t printed = 0, i;
|
||||
for (i = 0; i < MAP__NR_TYPES; ++i)
|
||||
printed += __map_groups__fprintf_maps(self, i, fp);
|
||||
return printed;
|
||||
}
|
||||
|
||||
static size_t __map_groups__fprintf_removed_maps(struct map_groups *self,
|
||||
enum map_type type, FILE *fp)
|
||||
{
|
||||
struct map *pos;
|
||||
size_t printed = 0;
|
||||
|
||||
list_for_each_entry(pos, &self->removed_maps[type], node) {
|
||||
printed += fprintf(fp, "Map:");
|
||||
printed += map__fprintf(pos, fp);
|
||||
if (verbose > 1) {
|
||||
printed += dso__fprintf(pos->dso, type, fp);
|
||||
printed += fprintf(fp, "--\n");
|
||||
}
|
||||
}
|
||||
return printed;
|
||||
}
|
||||
|
||||
static size_t map_groups__fprintf_removed_maps(struct map_groups *self, FILE *fp)
|
||||
{
|
||||
size_t printed = 0, i;
|
||||
for (i = 0; i < MAP__NR_TYPES; ++i)
|
||||
printed += __map_groups__fprintf_removed_maps(self, i, fp);
|
||||
return printed;
|
||||
}
|
||||
|
||||
static size_t map_groups__fprintf(struct map_groups *self, FILE *fp)
|
||||
{
|
||||
size_t printed = map_groups__fprintf_maps(self, fp);
|
||||
printed += fprintf(fp, "Removed maps:\n");
|
||||
return printed + map_groups__fprintf_removed_maps(self, fp);
|
||||
}
|
||||
|
||||
static size_t thread__fprintf(struct thread *self, FILE *fp)
|
||||
{
|
||||
return fprintf(fp, "Thread %d %s\n", self->pid, self->comm) +
|
||||
map_groups__fprintf(&self->mg, fp);
|
||||
map_groups__fprintf(&self->mg, verbose, fp);
|
||||
}
|
||||
|
||||
struct thread *perf_session__findnew(struct perf_session *self, pid_t pid)
|
||||
|
|
@ -214,87 +124,12 @@ struct thread *perf_session__findnew(struct perf_session *self, pid_t pid)
|
|||
return th;
|
||||
}
|
||||
|
||||
static int map_groups__fixup_overlappings(struct map_groups *self,
|
||||
struct map *map)
|
||||
{
|
||||
struct rb_root *root = &self->maps[map->type];
|
||||
struct rb_node *next = rb_first(root);
|
||||
|
||||
while (next) {
|
||||
struct map *pos = rb_entry(next, struct map, rb_node);
|
||||
next = rb_next(&pos->rb_node);
|
||||
|
||||
if (!map__overlap(pos, map))
|
||||
continue;
|
||||
|
||||
if (verbose >= 2) {
|
||||
fputs("overlapping maps:\n", stderr);
|
||||
map__fprintf(map, stderr);
|
||||
map__fprintf(pos, stderr);
|
||||
}
|
||||
|
||||
rb_erase(&pos->rb_node, root);
|
||||
/*
|
||||
* We may have references to this map, for instance in some
|
||||
* hist_entry instances, so just move them to a separate
|
||||
* list.
|
||||
*/
|
||||
list_add_tail(&pos->node, &self->removed_maps[map->type]);
|
||||
/*
|
||||
* Now check if we need to create new maps for areas not
|
||||
* overlapped by the new map:
|
||||
*/
|
||||
if (map->start > pos->start) {
|
||||
struct map *before = map__clone(pos);
|
||||
|
||||
if (before == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
before->end = map->start - 1;
|
||||
map_groups__insert(self, before);
|
||||
if (verbose >= 2)
|
||||
map__fprintf(before, stderr);
|
||||
}
|
||||
|
||||
if (map->end < pos->end) {
|
||||
struct map *after = map__clone(pos);
|
||||
|
||||
if (after == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
after->start = map->end + 1;
|
||||
map_groups__insert(self, after);
|
||||
if (verbose >= 2)
|
||||
map__fprintf(after, stderr);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void thread__insert_map(struct thread *self, struct map *map)
|
||||
{
|
||||
map_groups__fixup_overlappings(&self->mg, map);
|
||||
map_groups__fixup_overlappings(&self->mg, map, verbose, stderr);
|
||||
map_groups__insert(&self->mg, map);
|
||||
}
|
||||
|
||||
/*
|
||||
* XXX This should not really _copy_ te maps, but refcount them.
|
||||
*/
|
||||
static int map_groups__clone(struct map_groups *self,
|
||||
struct map_groups *parent, enum map_type type)
|
||||
{
|
||||
struct rb_node *nd;
|
||||
for (nd = rb_first(&parent->maps[type]); nd; nd = rb_next(nd)) {
|
||||
struct map *map = rb_entry(nd, struct map, rb_node);
|
||||
struct map *new = map__clone(map);
|
||||
if (new == NULL)
|
||||
return -ENOMEM;
|
||||
map_groups__insert(self, new);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int thread__fork(struct thread *self, struct thread *parent)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче