perf tools: Check if a map is still in use when deleting it
I.e. match RB_CLEAR_NODE() with RB_EMPTY_NODE(), to check that it isn't
in a rb tree at the time of its deletion.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.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-vumvhird765id11zbx00d2r8@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 0905b07..4d3a92d 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -225,6 +225,7 @@
void map__delete(struct map *map)
{
+ BUG_ON(!RB_EMPTY_NODE(&map->rb_node));
free(map);
}
@@ -446,7 +447,7 @@
struct map *pos = rb_entry(next, struct map, rb_node);
next = rb_next(&pos->rb_node);
- rb_erase(&pos->rb_node, root);
+ rb_erase_init(&pos->rb_node, root);
map__delete(pos);
}
}
@@ -456,7 +457,7 @@
struct map *pos, *n;
list_for_each_entry_safe(pos, n, &maps->removed_maps, node) {
- list_del(&pos->node);
+ list_del_init(&pos->node);
map__delete(pos);
}
}
@@ -671,7 +672,7 @@
map__fprintf(pos, fp);
}
- rb_erase(&pos->rb_node, root);
+ rb_erase_init(&pos->rb_node, root);
/*
* Now check if we need to create new maps for areas not
* overlapped by the new map:
@@ -782,7 +783,7 @@
static void __maps__remove(struct maps *maps, struct map *map)
{
- rb_erase(&map->rb_node, &maps->entries);
+ rb_erase_init(&map->rb_node, &maps->entries);
}
void maps__remove(struct maps *maps, struct map *map)