luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-05 13:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '#0434_GSequenceSlowsDown_counter' into 'main'

Browse Source 
gsequence: make treap priorities more random to avoid worst-case scenarios

Closes #2468

See merge request GNOME/glib!2236
This commit is contained in:
Philip Withnall
2021-09-21 10:40:48 +00:00
parent 6483808df6 59e5612339
commit bbd1350beb
2 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
glib/tests/sequence.c
View File

@@ -15,7 +15,8 @@ struct _GSequence
struct _GSequenceNode
{
guint n_nodes;
gint n_nodes;
guint32 priority;
GSequenceNode * parent;
GSequenceNode * left;
GSequenceNode * right;
@@ -25,15 +26,9 @@ struct _GSequenceNode
static guint
get_priority (GSequenceNode *node)
{
guint key = GPOINTER_TO_UINT (node);
key = (key << 15) - key - 1;
key = key ^ (key >> 12);
key = key + (key << 2);
key = key ^ (key >> 4);
key = key + (key << 3) + (key << 11);
key = key ^ (key >> 16);
guint key = node->priority;
/* We rely on 0 being less than all other priorities */
return key? key : 1;
}