perf symbols: Precisely specify if dso->{long,short}_name should be freed
Commit-ID: 6e406257b3794009e3b7a6d48b54beb547719565 Gitweb: http://git.kernel.org/tip/6e406257b3794009e3b7a6d48b54beb547719565 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 29 Jul 2010 15:11:30 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 29 Jul 2010 15:11:30 -0300
perf symbols: Precisely specify if dso->{long,short}_name should be freed
Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/event.c | 1 + tools/perf/util/symbol.c | 5 ++++- tools/perf/util/symbol.h | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-)
tools/perf/util/event.c +1 -0
@@ -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 +
tools/perf/util/symbol.c +4 -1
@@ -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); }
@@ -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,"" ); } }
tools/perf/util/symbol.h +3 -1
@@ -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;