[tip:perf/core] Account the nr_entries in rblist properly
From: tip-bot for Suzuki K. Poulose
Date: Thu Oct 25 2012 - 04:00:43 EST
Commit-ID: 03f2f93ae00762eb881424df1c688d034fd341ee
Gitweb: http://git.kernel.org/tip/03f2f93ae00762eb881424df1c688d034fd341ee
Author: Suzuki K. Poulose <suzuki@xxxxxxxxxx>
AuthorDate: Fri, 31 Aug 2012 12:39:18 +0530
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 24 Oct 2012 14:20:11 -0200
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@xxxxxxxxxx>
Acked-by: David S. Ahern <dsahern@xxxxxxxxx>
Cc: David S. Ahern <dsahern@xxxxxxxxx>
Link: http://lkml.kernel.org/r/20120831070834.14806.87398.stgit@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/rblist.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/rblist.c b/tools/perf/util/rblist.c
index 0171fb6..a16cdd2 100644
--- a/tools/perf/util/rblist.c
+++ b/tools/perf/util/rblist.c
@@ -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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/