perf tools: Initialize reference counts in map__clone()
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 18 Aug 2015 18:19:50 +0000 (15:19 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 21 Aug 2015 15:39:30 +0000 (12:39 -0300)
Map clone was written before we introduced reference counts for
maps and dsos, so all that was needed was just a copy and then we
would insert it into the new map_groups instance.

Fix it by, after copying, initializing the map->refcnt, grabbing
a struct dso refcount and resetting pointers that may be used
to determine if a map, when deleted, is in a rb_tree.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-pd4mr80o5b9gvk50iineacec@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/map.c

index ce37e95bc51347cf2e3d0f650a64ca4b405c8d2e..b1c475d9b240393e73614bc249e9e4b3dc2eedfc 100644 (file)
@@ -348,9 +348,18 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name,
        return dso__find_symbol_by_name(map->dso, map->type, name);
 }
 
-struct map *map__clone(struct map *map)
+struct map *map__clone(struct map *from)
 {
-       return memdup(map, sizeof(*map));
+       struct map *map = memdup(from, sizeof(*map));
+
+       if (map != NULL) {
+               atomic_set(&map->refcnt, 1);
+               RB_CLEAR_NODE(&map->rb_node);
+               dso__get(map->dso);
+               map->groups = NULL;
+       }
+
+       return map;
 }
 
 int map__overlap(struct map *l, struct map *r)