#include "gtkrbtree.h"
#include "gtkdebug.h"
-static void _gtk_rbnode_validate_allocator (GAllocator *allocator);
-static GtkRBNode *_gtk_rbnode_new (GtkRBTree *tree,
- gint height);
-static void _gtk_rbnode_free (GtkRBNode *node);
-static void _gtk_rbnode_rotate_left (GtkRBTree *tree,
- GtkRBNode *node);
-static void _gtk_rbnode_rotate_right (GtkRBTree *tree,
- GtkRBNode *node);
-static void _gtk_rbtree_insert_fixup (GtkRBTree *tree,
- GtkRBNode *node);
-static void _gtk_rbtree_remove_node_fixup (GtkRBTree *tree,
- GtkRBNode *node);
-static gint _count_nodes (GtkRBTree *tree,
- GtkRBNode *node);
+static void _gtk_rbnode_validate_allocator (GAllocator *allocator);
+static GtkRBNode * _gtk_rbnode_new (GtkRBTree *tree,
+ gint height);
+static void _gtk_rbnode_free (GtkRBNode *node);
+static void _gtk_rbnode_rotate_left (GtkRBTree *tree,
+ GtkRBNode *node);
+static void _gtk_rbnode_rotate_right (GtkRBTree *tree,
+ GtkRBNode *node);
+static void _gtk_rbtree_insert_fixup (GtkRBTree *tree,
+ GtkRBNode *node);
+static void _gtk_rbtree_remove_node_fixup (GtkRBTree *tree,
+ GtkRBNode *node);
+static gint _count_nodes (GtkRBTree *tree,
+ GtkRBNode *node);
+static inline void _fixup_validation (GtkRBTree *tree,
+ GtkRBNode *node);
+
/* node allocation
G_LOCK_DEFINE_STATIC (current_allocator);
static GAllocator *current_allocator = NULL;
+
/* HOLDS: current_allocator_lock */
static void
_gtk_rbnode_validate_allocator (GAllocator *allocator)
(right->right?right->right->parity:0) +
(right->children?right->children->root->parity:0);
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_DESCENDANTS_INVALID))
- {
- if ((! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID)) &&
- (node->right != tree->nil && ! GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (node->left != tree->nil && ! GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (node->children && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
- }
- if (GTK_RBNODE_FLAG_SET (right, GTK_RBNODE_DESCENDANTS_INVALID))
- {
- if ((! GTK_RBNODE_FLAG_SET (right, GTK_RBNODE_INVALID)) &&
- (right->right != tree->nil && ! GTK_RBNODE_FLAG_SET (right->right, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (right->left != tree->nil && ! GTK_RBNODE_FLAG_SET (right->left, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (right->children && GTK_RBNODE_FLAG_SET (right->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
- GTK_RBNODE_UNSET_FLAG (right, GTK_RBNODE_DESCENDANTS_INVALID);
- }
+ _fixup_validation (tree, node);
+ _fixup_validation (tree, right);
}
static void
(left->right?left->right->parity:0) +
(left->children?left->children->root->parity:0);
- if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_DESCENDANTS_INVALID))
- {
- if ((! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID)) &&
- (node->right != tree->nil && ! GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (node->left != tree->nil && ! GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (node->children && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
- }
- if (GTK_RBNODE_FLAG_SET (left, GTK_RBNODE_DESCENDANTS_INVALID))
- {
- if ((! GTK_RBNODE_FLAG_SET (left, GTK_RBNODE_INVALID)) &&
- (left->right != tree->nil && ! GTK_RBNODE_FLAG_SET (left->right, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (left->left != tree->nil && ! GTK_RBNODE_FLAG_SET (left->left, GTK_RBNODE_DESCENDANTS_INVALID)) &&
- (left->children && GTK_RBNODE_FLAG_SET (left->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
- GTK_RBNODE_UNSET_FLAG (left, GTK_RBNODE_DESCENDANTS_INVALID);
- }
+ _fixup_validation (tree, node);
+ _fixup_validation (tree, left);
}
static void
tmp_tree = tree->parent_tree;
tmp_node = tree->parent_node;
+ /* ugly hack to make _fixup_validation work in the first iteration of the
+ * loop below */
+ GTK_RBNODE_UNSET_FLAG (tree->root, GTK_RBNODE_DESCENDANTS_INVALID);
+
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
{
+ _fixup_validation (tmp_tree, tmp_node);
tmp_node->offset -= height;
/* If the removed tree was odd, flip all parents */
GtkRBNode *tmp_node;
GtkRBTree *tmp_tree;
- if (gtk_debug_flags & GTK_DEBUG_TREE)
- _gtk_rbtree_test (G_STRLOC, tree);
-
if (current != NULL && current->right != tree->nil)
{
current = current->right;
current = current->left;
right = FALSE;
}
-
/* setup new node */
node = _gtk_rbnode_new (tree, height);
node->parent = (current?current:tree->nil);
tmp_tree = tmp_tree->parent_tree;
}
}
- _gtk_rbtree_insert_fixup (tree, node);
-
- if (gtk_debug_flags & GTK_DEBUG_TREE)
- _gtk_rbtree_test (G_STRLOC, tree);
if (valid)
_gtk_rbtree_node_mark_valid (tree, node);
else
_gtk_rbtree_node_mark_invalid (tree, node);
+ _gtk_rbtree_insert_fixup (tree, node);
+
+ if (gtk_debug_flags & GTK_DEBUG_TREE)
+ _gtk_rbtree_test (G_STRLOC, tree);
+
return node;
}
gboolean left = TRUE;
GtkRBNode *tmp_node;
GtkRBTree *tmp_tree;
-
- if (gtk_debug_flags & GTK_DEBUG_TREE)
- _gtk_rbtree_test (G_STRLOC, tree);
if (current != NULL && current->left != tree->nil)
{
tmp_tree = tmp_tree->parent_tree;
}
}
- _gtk_rbtree_insert_fixup (tree, node);
-
- if (gtk_debug_flags & GTK_DEBUG_TREE)
- _gtk_rbtree_test (G_STRLOC, tree);
if (valid)
_gtk_rbtree_node_mark_valid (tree, node);
else
_gtk_rbtree_node_mark_invalid (tree, node);
+ _gtk_rbtree_insert_fixup (tree, node);
+
+ if (gtk_debug_flags & GTK_DEBUG_TREE)
+ _gtk_rbtree_test (G_STRLOC, tree);
+
return node;
}
tmp_tree = tmp_tree->parent_tree;
}
}
+ if (gtk_debug_flags & GTK_DEBUG_TREE)
+ _gtk_rbtree_test (G_STRLOC, tree);
}
void
return;
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
node = node->parent;
- if (node == NULL)
+ if (node == tree->nil)
{
node = tree->parent_node;
tree = tree->parent_tree;
while (node);
}
+#if 0
+/* Draconian version. */
+void
+_gtk_rbtree_node_mark_invalid (GtkRBTree *tree,
+ GtkRBNode *node)
+{
+ GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_INVALID);
+ do
+ {
+ _fixup_validation (tree, node);
+ node = node->parent;
+ if (node == tree->nil)
+ {
+ node = tree->parent_node;
+ tree = tree->parent_tree;
+ }
+ }
+ while (node);
+}
+#endif
+
void
_gtk_rbtree_node_mark_valid (GtkRBTree *tree,
GtkRBNode *node)
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
node = node->parent;
- if (node == NULL)
+ if (node == tree->nil)
{
node = tree->parent_node;
tree = tree->parent_tree;
while (node);
}
+#if 0
+/* Draconian version */
+void
+_gtk_rbtree_node_mark_valid (GtkRBTree *tree,
+ GtkRBNode *node)
+{
+ GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_INVALID);
+ GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_COLUMN_INVALID);
+ do
+ {
+ _fixup_validation (tree, node);
+ node = node->parent;
+ if (node == tree->nil)
+ {
+ node = tree->parent_node;
+ tree = tree->parent_tree;
+ }
+ }
+ while (node);
+}
+#endif
/* Assume tree is the root node as it doesn't set DESCENDANTS_INVALID above.
*/
void
GtkRBTree **new_tree,
GtkRBNode **new_node)
{
- GtkRBNode *tmp_node;
-
g_assert (tree);
if ((height < 0) ||
return 0;
}
- _gtk_rbtree_real_find_offset (tree, height, new_tree, new_node);
+ return _gtk_rbtree_real_find_offset (tree, height, new_tree, new_node);
}
void
g_return_if_fail (tree != NULL);
g_return_if_fail (node != NULL);
-
+
+ if (gtk_debug_flags & GTK_DEBUG_TREE)
+ {
+ _gtk_rbtree_debug_spew (tree);
+ _gtk_rbtree_test (G_STRLOC, tree);
+ }
/* make sure we're deleting a node that's actually in the tree */
for (x = node; x->parent != tree->nil; x = x->parent)
;
/* adjust count only beneath tree */
for (x = y; x != tree->nil; x = x->parent)
- x->count--;
-
- /* y->count = node->count; */
+ {
+ x->count--;
+ }
/* offsets and parity adjust all the way up through parent trees */
y_height = GTK_RBNODE_GET_HEIGHT (y);
node_height = GTK_RBNODE_GET_HEIGHT (node) + (node->children?node->children->root->offset:0);
- /* Do this twice for code clarities sake. */
tmp_tree = tree;
tmp_node = y;
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
{
tmp_node->offset -= (y_height + (y->children?y->children->root->offset:0));
tmp_node->parity -= (1 + (y->children?y->children->root->parity:0));
+ _fixup_validation (tmp_tree, tmp_node);
tmp_node = tmp_node->parent;
if (tmp_node == tmp_tree->nil)
}
}
- /* x is y's only child */
+ /* x is y's only child, or nil */
if (y->left != tree->nil)
x = y->left;
else
/* remove y from the parent chain */
x->parent = y->parent;
if (y->parent != tree->nil)
- if (y == y->parent->left)
- y->parent->left = x;
- else
- y->parent->right = x;
+ {
+ if (y == y->parent->left)
+ y->parent->left = x;
+ else
+ y->parent->right = x;
+ }
else
- tree->root = x;
+ {
+ tree->root = x;
+ }
+
+ /* We need to clean up the validity of the tree.
+ */
+
+ tmp_tree = tree;
+ tmp_node = x;
+ do
+ {
+ if (tmp_node != tmp_tree->nil)
+ {
+ /* We skip the first time, iff x is nil */
+ _fixup_validation (tmp_tree, tmp_node);
+ }
+ tmp_node = tmp_node->parent;
+ if (tmp_node == tmp_tree->nil)
+ {
+ tmp_node = tmp_tree->parent_node;
+ tmp_tree = tmp_tree->parent_tree;
+ }
+ }
+ while (tmp_tree != NULL);
if (y != node)
{
else
node->flags = ((y->flags & (GTK_RBNODE_NON_COLORS)) | GTK_RBNODE_RED);
node->children = y->children;
-
+ if (y->children)
+ {
+ node->children = y->children;
+ node->children->parent_node = node;
+ }
+ else
+ {
+ node->children = NULL;
+ }
+ _fixup_validation (tree, node);
/* We want to see how different our height is from the previous node.
* To do this, we compare our current height with our supposed height.
*/
diff = y_height - GTK_RBNODE_GET_HEIGHT (node);
- if (diff != 0)
- {
- tmp_tree = tree;
- tmp_node = node;
+ tmp_tree = tree;
+ tmp_node = node;
- while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
+ while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
+ {
+ tmp_node->offset += diff;
+ _fixup_validation (tmp_tree, tmp_node);
+ tmp_node = tmp_node->parent;
+ if (tmp_node == tmp_tree->nil)
{
- tmp_node->offset += diff;
- tmp_node = tmp_node->parent;
- if (tmp_node == tmp_tree->nil)
- {
- tmp_node = tmp_tree->parent_node;
- tmp_tree = tmp_tree->parent_tree;
- }
+ tmp_node = tmp_tree->parent_node;
+ tmp_tree = tmp_tree->parent_tree;
}
}
}
if (GTK_RBNODE_GET_COLOR (y) == GTK_RBNODE_BLACK)
_gtk_rbtree_remove_node_fixup (tree, x);
-
_gtk_rbnode_free (y);
if (gtk_debug_flags & GTK_DEBUG_TREE)
- _gtk_rbtree_test (G_STRLOC, tree);
+ {
+ _gtk_rbtree_debug_spew (tree);
+ _gtk_rbtree_test (G_STRLOC, tree);
+ }
}
GtkRBNode *
return res;
}
+static inline
+void _fixup_validation (GtkRBTree *tree,
+ GtkRBNode *node)
+{
+ if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
+ GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) ||
+ (node->left != tree->nil && GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) ||
+ (node->right != tree->nil && GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) ||
+ (node->children != NULL && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
+ {
+ GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
+ }
+ else
+ {
+ GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
+ }
+}
+
static guint
get_parity (GtkRBNode *node)
{
_gtk_rbtree_test_height (node->children, node->children->root);
}
+static void
+_gtk_rbtree_test_dirty (GtkRBTree *tree,
+ GtkRBNode *node,
+ gint expected_dirtyness)
+{
+
+ if (expected_dirtyness)
+ {
+ g_assert (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) ||
+ GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
+ (node->left != tree->nil && GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) ||
+ (node->right != tree->nil && GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) ||
+ (node->children && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)));
+ }
+ else
+ {
+ g_assert (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) &&
+ ! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID));
+ if (node->left != tree->nil)
+ g_assert (! GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID));
+ if (node->right != tree->nil)
+ g_assert (! GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID));
+ if (node->children != NULL)
+ g_assert (! GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID));
+ }
+
+ if (node->left != tree->nil)
+ _gtk_rbtree_test_dirty (tree, node->left, GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID));
+ if (node->right != tree->nil)
+ _gtk_rbtree_test_dirty (tree, node->right, GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID));
+ if (node->children != NULL)
+ _gtk_rbtree_test_dirty (node->children, node->children->root, GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID));
+}
+
+static void _gtk_rbtree_test_structure (GtkRBTree *tree);
+
+static void
+_gtk_rbtree_test_structure_helper (GtkRBTree *tree,
+ GtkRBNode *node)
+{
+ g_assert (node != tree->nil);
+
+ g_assert (node->left != NULL);
+ g_assert (node->right != NULL);
+ g_assert (node->parent != NULL);
+
+ if (node->left != tree->nil)
+ {
+ g_assert (node->left->parent == node);
+ _gtk_rbtree_test_structure_helper (tree, node->left);
+ }
+ if (node->right != tree->nil)
+ {
+ g_assert (node->right->parent == node);
+ _gtk_rbtree_test_structure_helper (tree, node->right);
+ }
+
+ if (node->children != NULL)
+ {
+ g_assert (node->children->parent_tree == tree);
+ g_assert (node->children->parent_node == node);
+
+ _gtk_rbtree_test_structure (node->children);
+ }
+}
+static void
+_gtk_rbtree_test_structure (GtkRBTree *tree)
+{
+ g_assert (tree->root);
+ g_assert (tree->root->parent == tree->nil);
+
+ _gtk_rbtree_test_structure_helper (tree, tree->root);
+}
+
void
_gtk_rbtree_test (const gchar *where,
GtkRBTree *tree)
{
GtkRBTree *tmp_tree;
+ if (tree == NULL)
+ return;
+
/* Test the entire tree */
tmp_tree = tree;
while (tmp_tree->parent_tree)
tmp_tree = tmp_tree->parent_tree;
- g_print ("%s: whole tree offset is %d\n", where, tmp_tree->root->offset);
- if (tmp_tree->root != tmp_tree->nil)
- {
- g_assert ((_count_nodes (tmp_tree, tmp_tree->root->left) +
- _count_nodes (tmp_tree, tmp_tree->root->right) + 1) == tmp_tree->root->count);
+ g_assert (tmp_tree->root && tmp_tree->root != tmp_tree->nil);
+
+ _gtk_rbtree_test_structure (tmp_tree);
+
+ g_assert ((_count_nodes (tmp_tree, tmp_tree->root->left) +
+ _count_nodes (tmp_tree, tmp_tree->root->right) + 1) == tmp_tree->root->count);
- _gtk_rbtree_test_height (tmp_tree, tmp_tree->root);
-
- g_assert (count_parity (tmp_tree, tmp_tree->root) == tmp_tree->root->parity);
- }
+ _gtk_rbtree_test_height (tmp_tree, tmp_tree->root);
+ _gtk_rbtree_test_dirty (tmp_tree, tmp_tree->root, GTK_RBNODE_FLAG_SET (tmp_tree->root, GTK_RBNODE_DESCENDANTS_INVALID));
+ g_assert (count_parity (tmp_tree, tmp_tree->root) == tmp_tree->root->parity);
}
+static void
+_gtk_rbtree_debug_spew_helper (GtkRBTree *tree,
+ GtkRBNode *node,
+ gint depth)
+{
+ gint i;
+ for (i = 0; i < depth; i++)
+ g_print ("\t");
+
+ g_print ("(%x - %s) %d%d%d\n",
+ (gint) node,
+ (GTK_RBNODE_GET_COLOR (node) == GTK_RBNODE_BLACK)?"BLACK":" RED ",
+ (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_DESCENDANTS_INVALID))?1:0,
+ (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID))?1:0,
+ (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))?1:0);
+ if (node->left != tree->nil)
+ _gtk_rbtree_debug_spew_helper (tree, node->left, depth+1);
+ if (node->right != tree->nil)
+ _gtk_rbtree_debug_spew_helper (tree, node->right, depth+1);
+}
+
+void
+_gtk_rbtree_debug_spew (GtkRBTree *tree)
+{
+ g_return_if_fail (tree != NULL);
+
+ g_print ("=====\n");
+ _gtk_rbtree_debug_spew_helper (tree, tree->root, 0);
+ g_print ("=====\n\n\n");
+}
projects / ~andy / gtk / commitdiff