AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 611922 - gtk_tree_model_sort_ref_node() is too slow

Browse Source 
Referencing a parent node for each referenced node is overdone.  Instead,
we now reference the parent from build_level and unreference in free_level.
Each level keeps a single reference on its immediate parent.  This both
alleviates the performence problems and should perfectly serve the purpose.
This commit is contained in:
Kristian Rietveld 2011-06-02 21:51:51 +02:00
parent d241323b08
commit 7677e2d4e3
1 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gtk/gtktreemodelsort.c
View File

@ -1373,9 +1373,8 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
GtkTreeIter child_iter;
SortLevel *level, *parent_level;
SortLevel *level;
SortElt *elt;
gint parent_elt_index;
g_return_if_fail (priv->child_model != NULL);
g_return_if_fail (VALID_ITER (iter, tree_model_sort));
@ -1392,24 +1391,6 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
elt->ref_count++;
level->ref_count++;
/* Increase the reference count of all parent elements */
parent_level = level->parent_level;
parent_elt_index = level->parent_elt_index;
while (parent_level)
{
GtkTreeIter tmp_iter;
tmp_iter.stamp = priv->stamp;
tmp_iter.user_data = parent_level;
tmp_iter.user_data2 = &g_array_index (parent_level->array, SortElt, parent_elt_index);
gtk_tree_model_sort_ref_node (tree_model, &tmp_iter);
parent_elt_index = parent_level->parent_elt_index;
parent_level = parent_level->parent_level;
}
if (level->ref_count == 1)
{
SortLevel *parent_level = level->parent_level;
@ -1436,9 +1417,8 @@ gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
SortLevel *level, *parent_level;
SortLevel *level;
SortElt *elt;
gint parent_elt_index;
g_return_if_fail (priv->child_model != NULL);
g_return_if_fail (VALID_ITER (iter, tree_model_sort));
@ -1459,24 +1439,6 @@ gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
elt->ref_count--;
level->ref_count--;
/* Decrease the reference count of all parent elements */
parent_level = level->parent_level;
parent_elt_index = level->parent_elt_index;
while (parent_level)
{
GtkTreeIter tmp_iter;
tmp_iter.stamp = priv->stamp;
tmp_iter.user_data = parent_level;
tmp_iter.user_data2 = &g_array_index (parent_level->array, SortElt, parent_elt_index);
gtk_tree_model_sort_real_unref_node (tree_model, &tmp_iter, FALSE);
parent_elt_index = parent_level->parent_elt_index;
parent_level = parent_level->parent_level;
}
if (level->ref_count == 0)
{
SortLevel *parent_level = level->parent_level;
@ -2478,6 +2440,9 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
&parent_iter);
length = gtk_tree_model_iter_n_children (priv->child_model, &child_parent_iter);
gtk_tree_model_sort_ref_node (GTK_TREE_MODEL (tree_model_sort),
&parent_iter);
}
g_return_if_fail (length > 0);
@ -2588,7 +2553,18 @@ gtk_tree_model_sort_free_level (GtkTreeModelSort *tree_model_sort,
}
if (sort_level->parent_elt_index >= 0)
{
GtkTreeIter parent_iter;
parent_iter.stamp = tree_model_sort->priv->stamp;
parent_iter.user_data = sort_level->parent_level;
parent_iter.user_data2 = SORT_LEVEL_PARENT_ELT (sort_level);
gtk_tree_model_sort_unref_node (GTK_TREE_MODEL (tree_model_sort),
&parent_iter);
SORT_LEVEL_PARENT_ELT (sort_level)->children = NULL;
}
else
priv->root = NULL;