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

gtktreemodelfilter: add a debug define and more assertions

Browse Source 
Should be helpful when debugging this thing.  Perhaps this needs to
be properly integrated in G_DEBUG/GTK_DEBUG, but currently I do not see
the need to.
This commit is contained in:
Kristian Rietveld 2011-09-07 09:36:18 +02:00
parent f317dd3831
commit 767b2e2604
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtktreemodelfilter.c
View File

@ -322,6 +322,11 @@ enum
# define GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS(filter) (FALSE) # define GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS(filter) (FALSE)
#endif #endif
/* Defining this constant enables more assertions, which will be
* helpful when debugging the code.
*/
#undef MODEL_FILTER_DEBUG
#define FILTER_ELT(filter_elt) ((FilterElt *)filter_elt) #define FILTER_ELT(filter_elt) ((FilterElt *)filter_elt)
#define FILTER_LEVEL(filter_level) ((FilterLevel *)filter_level) #define FILTER_LEVEL(filter_level) ((FilterLevel *)filter_level)
#define GET_ELT(siter) ((FilterElt*) (siter ? g_sequence_get (siter) : NULL)) #define GET_ELT(siter) ((FilterElt*) (siter ? g_sequence_get (siter) : NULL))
@ -1171,6 +1176,10 @@ gtk_tree_model_filter_clear_cache_helper_iter (gpointer data,
GtkTreeModelFilter *filter = user_data; GtkTreeModelFilter *filter = user_data;
FilterElt *elt = data; FilterElt *elt = data;
#ifdef MODEL_FILTER_DEBUG
g_assert (elt->zero_ref_count >= 0);
#endif
if (elt->zero_ref_count > 0) if (elt->zero_ref_count > 0)
gtk_tree_model_filter_clear_cache_helper (filter, elt->children); gtk_tree_model_filter_clear_cache_helper (filter, elt->children);
} }
@ -3312,8 +3321,18 @@ gtk_tree_model_filter_real_ref_node (GtkTreeModel *model,
if (filter->priv->root != level) if (filter->priv->root != level)
filter->priv->zero_ref_count--; filter->priv->zero_ref_count--;
#ifdef MODEL_FILTER_DEBUG
g_assert (filter->priv->zero_ref_count >= 0);
#endif
} }
} }
#ifdef MODEL_FILTER_DEBUG
g_assert (elt->ref_count >= elt->ext_ref_count);
g_assert (elt->ref_count >= 0);
g_assert (elt->ext_ref_count >= 0);
#endif
} }
static void static void
@ -3348,6 +3367,11 @@ gtk_tree_model_filter_real_unref_node (GtkTreeModel *model,
elt = iter->user_data2; elt = iter->user_data2;
g_return_if_fail (elt->ref_count > 0); g_return_if_fail (elt->ref_count > 0);
#ifdef MODEL_FILTER_DEBUG
g_assert (elt->ref_count >= elt->ext_ref_count);
g_assert (elt->ref_count >= 0);
g_assert (elt->ext_ref_count >= 0);
#endif
elt->ref_count--; elt->ref_count--;
level->ref_count--; level->ref_count--;
@ -3373,8 +3397,18 @@ gtk_tree_model_filter_real_unref_node (GtkTreeModel *model,
if (filter->priv->root != level) if (filter->priv->root != level)
filter->priv->zero_ref_count++; filter->priv->zero_ref_count++;
#ifdef MODEL_FILTER_DEBUG
g_assert (filter->priv->zero_ref_count >= 0);
#endif
} }
} }
#ifdef MODEL_FILTER_DEBUG
g_assert (elt->ref_count >= elt->ext_ref_count);
g_assert (elt->ref_count >= 0);
g_assert (elt->ext_ref_count >= 0);
#endif
} }
/* TreeDragSource interface implementation */ /* TreeDragSource interface implementation */