fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-23 18:00:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: use siphash24() for nm_hash_ptr()

Browse source 
siphash24() mixes the bits much better then our naive xor.
Don't bypass siphash24(). We supposedly use it for the
better hashing properties, so use it also for pointers.
This commit is contained in:
Thomas Haller 2017-11-15 15:33:32 +01:00
parent c3d98a3df6
commit ecd106101b
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnm-core/tests/test-general.c
View file

@ -175,6 +175,10 @@ test_nm_hash (void)
g_assert (nm_hash_str (""));
g_assert (nm_hash_str ("a"));
g_assert (nm_hash_ptr (NULL));
g_assert (nm_hash_ptr (""));
g_assert (nm_hash_ptr ("a"));
_test_hash_str ("");
_test_hash_str ("a");
_test_hash_str ("aa");

15
shared/nm-utils/nm-hash-utils.c
View file

@ -143,16 +143,13 @@ nm_str_hash (gconstpointer str)
guint
nm_hash_ptr (gconstpointer ptr)
{
guint h;
NMHashState h;
h = ((const guint *) _get_hash_key ())[0];
if (sizeof (ptr) <= sizeof (guint))
h = h ^ ((guint) ((uintptr_t) ptr));
else
h = h ^ ((guint) (((guint64) (uintptr_t) ptr) >> 32)) ^ ((guint) ((uintptr_t) ptr));
return h ?: 2907677551u;
if (!ptr)
return nm_hash_static (2907677551u);
nm_hash_init (&h, 2907677551u);
nm_hash_update (&h, &ptr, sizeof (ptr));
return nm_hash_complete (&h);
}
guint