Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbtree: Split out a common function

Browse Source 
gtk_rbtree_adjust() will adjust the summed values of a node and all its
parents in the tree. Currently only implemented by splitting out the
function from gtk_rbtree_free().
This commit is contained in:
Benjamin Otte
2011-11-19 12:59:39 +01:00
parent 54f3fbfe26
commit 22a4c15b4f
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gtk/gtkrbtree.c
View File

@@ -383,43 +383,54 @@ _gtk_rbtree_free (GtkRBTree *tree)
g_free (tree); g_free (tree);
} }
static void
gtk_rbnode_adjust (GtkRBTree *tree,
GtkRBNode *node,
int count_diff,
int total_count_diff,
int offset_diff)
{
while (tree && node && node != tree->nil)
{
_fixup_validation (tree, node);
node->offset += offset_diff;
node->count += count_diff;
node->total_count += total_count_diff;
node = node->parent;
if (node == tree->nil)
{
node = tree->parent_node;
tree = tree->parent_tree;
count_diff = 0;
}
}
}
void void
_gtk_rbtree_remove (GtkRBTree *tree) _gtk_rbtree_remove (GtkRBTree *tree)
{ {
GtkRBTree *tmp_tree;
GtkRBNode *tmp_node;
gint height = tree->root->offset;
guint total_count = tree->root->total_count;
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
GtkRBTree *tmp_tree;
if (gtk_get_debug_flags () & GTK_DEBUG_TREE) if (gtk_get_debug_flags () & GTK_DEBUG_TREE)
_gtk_rbtree_test (G_STRLOC, tree); _gtk_rbtree_test (G_STRLOC, tree);
#endif #endif
tmp_tree = tree->parent_tree;
tmp_node = tree->parent_node;
/* ugly hack to make _fixup_validation work in the first iteration of the /* ugly hack to make _fixup_validation work in the first iteration of the
* loop below */ * loop below */
GTK_RBNODE_UNSET_FLAG (tree->root, GTK_RBNODE_DESCENDANTS_INVALID); GTK_RBNODE_UNSET_FLAG (tree->root, GTK_RBNODE_DESCENDANTS_INVALID);
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil) gtk_rbnode_adjust (tree->parent_tree,
{ tree->parent_node,
_fixup_validation (tmp_tree, tmp_node); 0,
tmp_node->offset -= height; - (int) tree->root->total_count,
tmp_node->total_count -= total_count; - tree->root->offset);
tmp_node = tmp_node->parent;
if (tmp_node == tmp_tree->nil)
{
tmp_node = tmp_tree->parent_node;
tmp_tree = tmp_tree->parent_tree;
}
}
#ifdef G_ENABLE_DEBUG
tmp_tree = tree->parent_tree; tmp_tree = tree->parent_tree;
tmp_node = tree->parent_node; #endif
_gtk_rbtree_free (tree); _gtk_rbtree_free (tree);
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG