Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205341
b: refs/heads/master
c: 6e40625
h: refs/heads/master
i:
  205339: 4d4ad11
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed Jul 29, 2010
1 parent dc52985 commit 78d2c7c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 39d17dacb3c25df878b56aa80a170d6088e041f9
refs/heads/master: 6e406257b3794009e3b7a6d48b54beb547719565
1 change: 1 addition & 0 deletions trunk/tools/perf/util/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ static int event__process_kernel_mmap(event_t *self,
goto out_problem;

map->dso->short_name = name;
map->dso->sname_alloc = 1;
map->end = map->start + self->mmap.len;
} else if (is_kernel_mmap) {
const char *symbol_name = (self->mmap.filename +
Expand Down
5 changes: 4 additions & 1 deletion trunk/tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ void dso__delete(struct dso *self)
int i;
for (i = 0; i < MAP__NR_TYPES; ++i)
symbols__delete(&self->symbols[i]);
if (self->long_name != self->name)
if (self->sname_alloc)
free((char *)self->short_name);
if (self->lname_alloc)
free(self->long_name);
free(self);
}
Expand Down Expand Up @@ -1530,6 +1532,7 @@ static int map_groups__set_modules_path_dir(struct map_groups *self,
if (long_name == NULL)
goto failure;
dso__set_long_name(map->dso, long_name);
map->dso->lname_alloc = 1;
dso__kernel_module_get_build_id(map->dso, "");
}
}
Expand Down
4 changes: 3 additions & 1 deletion trunk/tools/perf/util/symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,14 @@ struct dso {
struct list_head node;
struct rb_root symbols[MAP__NR_TYPES];
struct rb_root symbol_names[MAP__NR_TYPES];
enum dso_kernel_type kernel;
u8 adjust_symbols:1;
u8 slen_calculated:1;
u8 has_build_id:1;
enum dso_kernel_type kernel;
u8 hit:1;
u8 annotate_warned:1;
u8 sname_alloc:1;
u8 lname_alloc:1;
unsigned char origin;
u8 sorted_by_name;
u8 loaded;
Expand Down

0 comments on commit 78d2c7c

Please sign in to comment.