Commit 03f2f93a authored Aug 31, 2012 by Suzuki K. Poulose Committed by Arnaldo Carvalho de Melo Oct 24, 2012

Account the nr_entries in rblist properly



The nr_entries in rblist is never decremented when an element
is deleted. Also, use rblist__remove_node to delete a node in
rblist__delete(). This would keep the nr_entries sane.

Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
Acked-by: David S. Ahern <dsahern@gmail.com>
Cc: David S. Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/r/20120831070834.14806.87398.stgit@suzukikp.in.ibm.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 68e94f4e

tools/perf/util/rblist.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ int rblist__add_node(struct rblist rblist, const void new_entry)
		void rblist__remove_node(struct rblist rblist, struct rb_node rb_node)
		{
		rb_erase(rb_node, &rblist->entries);
		--rblist->nr_entries;
		rblist->node_delete(rblist, rb_node);
		}

		@@ -87,8 +88,7 @@ void rblist__delete(struct rblist *rblist)
		while (next) {
		pos = next;
		next = rb_next(pos);
		rb_erase(pos, &rblist->entries);
		rblist->node_delete(rblist, pos);
		rblist__remove_node(rblist, pos);
		}
		free(rblist);
		}