X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils_avltree.c;h=786bc38f9d026d3ead7ab973db07ebe45982e239;hb=d4a0ba8ef40bbdd52be4ad73d7064171aeed155e;hp=4763d234716de7705d7a57af3c5490b4a512a4f9;hpb=cb7fed8bf0af2646dfcb32844933398c28e39be5;p=collectd.git

diff --git a/src/utils_avltree.c b/src/utils_avltree.c
index 4763d234..786bc38f 100644
--- a/src/utils_avltree.c
+++ b/src/utils_avltree.c
@@ -21,6 +21,7 @@
  **/
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 
 #include "utils_avltree.h"
@@ -260,21 +261,7 @@ static void rebalance (avl_tree_t *t, avl_node_t *n)
 	} /* while (n != NULL) */
 } /* void rebalance */
 
-static avl_iterator_t *avl_create_iterator (avl_tree_t *t, avl_node_t *n)
-{
-	avl_iterator_t *iter;
-
-	iter = (avl_iterator_t *) malloc (sizeof (avl_iterator_t));
-	if (iter == NULL)
-		return (NULL);
-
-	iter->tree = t;
-	iter->node = n;
-
-	return (iter);
-}
-
-void *avl_node_next (avl_tree_t *t, avl_node_t *n)
+static avl_node_t *avl_node_next (avl_tree_t *t, avl_node_t *n)
 {
 	avl_node_t *r; /* return node */
 
@@ -282,16 +269,31 @@ void *avl_node_next (avl_tree_t *t, avl_node_t *n)
 	{
 		return (NULL);
 	}
-	else if (n->right == NULL)
-	{
 
+	/* If we can't descent any further, we have to backtrack to the first
+	 * parent that's bigger than we, i. e. who's _left_ child we are. */
+	if (n->right == NULL)
+	{
 		r = n->parent;
-		while (r != NULL)
+		while ((r != NULL) && (r->parent != NULL))
 		{
-			/* stop if a bigger node is found */
-			if (t->compare (n, r) < 0) /* n < r */
+			if (r->left == n)
 				break;
-			r = r->parent;
+			n = r;
+			r = n->parent;
+		}
+
+		/* n->right == NULL && r == NULL => t is root and has no next
+		 * r->left != n => r->right = n => r->parent == NULL */
+		if ((r == NULL) || (r->left != n))
+		{
+			assert ((r == NULL) || (r->parent == NULL));
+			return (NULL);
+		}
+		else
+		{
+			assert (r->left == n);
+			return (r);
 		}
 	}
 	else
@@ -302,9 +304,9 @@ void *avl_node_next (avl_tree_t *t, avl_node_t *n)
 	}
 
 	return (r);
-}
+} /* avl_node_t *avl_node_next */
 
-void *avl_node_prev (avl_tree_t *t, avl_node_t *n)
+static avl_node_t *avl_node_prev (avl_tree_t *t, avl_node_t *n)
 {
 	avl_node_t *r; /* return node */
 
@@ -312,16 +314,31 @@ void *avl_node_prev (avl_tree_t *t, avl_node_t *n)
 	{
 		return (NULL);
 	}
-	else if (n->left == NULL)
-	{
 
+	/* If we can't descent any further, we have to backtrack to the first
+	 * parent that's smaller than we, i. e. who's _right_ child we are. */
+	if (n->left == NULL)
+	{
 		r = n->parent;
-		while (r != NULL)
+		while ((r != NULL) && (r->parent != NULL))
 		{
-			/* stop if a smaller node is found */
-			if (t->compare (n, r) > 0) /* n > r */
+			if (r->right == n)
 				break;
-			r = r->parent;
+			n = r;
+			r = n->parent;
+		}
+
+		/* n->left == NULL && r == NULL => t is root and has no next
+		 * r->right != n => r->left = n => r->parent == NULL */
+		if ((r == NULL) || (r->right != n))
+		{
+			assert ((r == NULL) || (r->parent == NULL));
+			return (NULL);
+		}
+		else
+		{
+			assert (r->right == n);
+			return (r);
 		}
 	}
 	else
@@ -332,7 +349,7 @@ void *avl_node_prev (avl_tree_t *t, avl_node_t *n)
 	}
 
 	return (r);
-} /* void *avl_node_prev */
+} /* avl_node_t *avl_node_prev */
 
 static int _remove (avl_tree_t *t, avl_node_t *n)
 {
@@ -451,6 +468,9 @@ avl_tree_t *avl_create (int (*compare) (const void *, const void *))
 {
 	avl_tree_t *t;
 
+	if (compare == NULL)
+		return (NULL);
+
 	if ((t = (avl_tree_t *) malloc (sizeof (avl_tree_t))) == NULL)
 		return (NULL);
 
@@ -533,7 +553,7 @@ int avl_insert (avl_tree_t *t, void *key, void *value)
 	return (0);
 } /* int avl_insert */
 
-int avl_remove (avl_tree_t *t, void *key, void **rkey, void **rvalue)
+int avl_remove (avl_tree_t *t, const void *key, void **rkey, void **rvalue)
 {
 	avl_node_t *n;
 	int status;
@@ -569,34 +589,21 @@ int avl_get (avl_tree_t *t, const void *key, void **value)
 	return (0);
 }
 
-avl_iterator_t *avl_get_iterator (avl_tree_t *t)
-{
-	avl_node_t *n;
-
-	if (t == NULL)
-		return (NULL);
-
-	for (n = t->root; n != NULL; n = n->left)
-		if (n->left == NULL)
-			break;
-
-	return (avl_create_iterator (t, n));
-} /* avl_iterator_t *avl_get_iterator */
-
-int avl_pick (avl_tree_t *, void **key, void **value)
+int avl_pick (avl_tree_t *t, void **key, void **value)
 {
 	avl_node_t *n;
 	avl_node_t *p;
 
-	assert ((key != NULL) && (value != NULL));
+	if ((key == NULL) || (value == NULL))
+		return (-1);
 	if (t->root == NULL)
 		return (-1);
 
 	n = t->root;
 	while ((n->left != NULL) || (n->right != NULL))
 	{
-		int height_left  = (n->left  == NULL) ? 0 : n->left->traffic;
-		int height_right = (n->right == NULL) ? 0 : n->right->traffic;
+		int height_left  = (n->left  == NULL) ? 0 : n->left->height;
+		int height_right = (n->right == NULL) ? 0 : n->right->height;
 
 		if (height_left > height_right)
 			n = n->left;
@@ -616,44 +623,84 @@ int avl_pick (avl_tree_t *, void **key, void **value)
 	*value = n->value;
 
 	free_node (n);
-	rebalance (p);
+	rebalance (t, p);
 
 	return (0);
 } /* int avl_pick */
 
-void *avl_iterator_next (avl_iterator_t *iter)
+avl_iterator_t *avl_get_iterator (avl_tree_t *t)
 {
-	avl_node_t *n;
+	avl_iterator_t *iter;
 
-	if ((iter == NULL) || (iter->node == NULL))
+	if (t == NULL)
 		return (NULL);
 
-	n = avl_node_next (iter->tree, iter->node);
+	iter = (avl_iterator_t *) malloc (sizeof (avl_iterator_t));
+	if (iter == NULL)
+		return (NULL);
+	memset (iter, '\0', sizeof (avl_iterator_t));
+	iter->tree = t;
+
+	return (iter);
+} /* avl_iterator_t *avl_get_iterator */
+
+int avl_iterator_next (avl_iterator_t *iter, void **key, void **value)
+{
+	avl_node_t *n;
+
+	if ((iter == NULL) || (key == NULL) || (value == NULL))
+		return (-1);
+
+	if (iter->node == NULL)
+	{
+		for (n = iter->tree->root; n != NULL; n = n->left)
+			if (n->left == NULL)
+				break;
+		iter->node = n;
+	}
+	else
+	{
+		n = avl_node_next (iter->tree, iter->node);
+	}
 
 	if (n == NULL)
-		return (NULL);
+		return (-1);
 
 	iter->node = n;
-	return (n);
+	*key = n->key;
+	*value = n->value;
 
-}
+	return (0);
+} /* int avl_iterator_next */
 
-void *avl_iterator_prev (avl_iterator_t *iter)
+int avl_iterator_prev (avl_iterator_t *iter, void **key, void **value)
 {
 	avl_node_t *n;
 
-	if ((iter == NULL) || (iter->node == NULL))
-		return (NULL);
+	if ((iter == NULL) || (key == NULL) || (value == NULL))
+		return (-1);
 
-	n = avl_node_prev (iter->tree, iter->node);
+	if (iter->node == NULL)
+	{
+		for (n = iter->tree->root; n != NULL; n = n->left)
+			if (n->right == NULL)
+				break;
+		iter->node = n;
+	}
+	else
+	{
+		n = avl_node_prev (iter->tree, iter->node);
+	}
 
 	if (n == NULL)
-		return (NULL);
+		return (-1);
 
 	iter->node = n;
-	return (n);
+	*key = n->key;
+	*value = n->value;
 
-}
+	return (0);
+} /* int avl_iterator_prev */
 
 void avl_iterator_destroy (avl_iterator_t *iter)
 {