callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed up gtk_allocated_bit_mask_invert_range

Browse Source 
It was showing up on profiles and has a comment asking for speed.
This commit is contained in:
Matthias Clasen 2015-09-07 01:55:16 -04:00
parent 4dc47c3714
commit 7da1f8a1ce
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkallocatedbitmask.c
View File

@ -25,6 +25,7 @@
#define VALUE_SIZE_BITS (sizeof (VALUE_TYPE) * 8) #define VALUE_SIZE_BITS (sizeof (VALUE_TYPE) * 8)
#define VALUE_BIT(idx) (((VALUE_TYPE) 1) << (idx)) #define VALUE_BIT(idx) (((VALUE_TYPE) 1) << (idx))
#define ALL_BITS G_MAXSIZE
struct _GtkBitmask { struct _GtkBitmask {
gsize len; gsize len;
@ -224,7 +225,7 @@ _gtk_allocated_bitmask_subtract (GtkBitmask *mask,
return gtk_allocated_bitmask_shrink (mask); return gtk_allocated_bitmask_shrink (mask);
} }
static void static inline void
gtk_allocated_bitmask_indexes (guint index_, gtk_allocated_bitmask_indexes (guint index_,
guint *array_index, guint *array_index,
guint *bit_index) guint *bit_index)
@ -286,17 +287,33 @@ _gtk_allocated_bitmask_invert_range (GtkBitmask *mask,
guint end) guint end)
{ {
guint i; guint i;
guint start_word, start_bit;
guint end_word, end_bit;
g_return_val_if_fail (mask != NULL, NULL); g_return_val_if_fail (mask != NULL, NULL);
g_return_val_if_fail (start < end, NULL); g_return_val_if_fail (start < end, NULL);
mask = gtk_bitmask_ensure_allocated (mask); mask = gtk_bitmask_ensure_allocated (mask);
/* I CAN HAS SPEEDUP? */ gtk_allocated_bitmask_indexes (start, &start_word, &start_bit);
for (i = start; i < end; i++) gtk_allocated_bitmask_indexes (end - 1, &end_word, &end_bit);
mask = _gtk_allocated_bitmask_set (mask, i, !_gtk_allocated_bitmask_get (mask, i));
return mask; if (end_word >= mask->len)
mask = gtk_allocated_bitmask_resize (mask, end_word + 1);
if (start_word == end_word)
{
mask->data[start_word] ^= (ALL_BITS >> (end_bit - start_bit)) << start_bit;
}
else
{
mask->data[start_word] ^= ALL_BITS << start_bit;
for (i = start_word + 1; i < end_word; i++)
mask->data[i] ^= ALL_BITS;
mask->data[end_word] ^= ALL_BITS >> (VALUE_SIZE_BITS - end_bit);
}
return gtk_allocated_bitmask_shrink (mask);
} }
gboolean gboolean