X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Futils.c;fp=src%2Fcommon%2Fhashtable%2Futils.c;h=8d0e515aecafbb94a347c418f23bf341f719f71c;hp=850f9e5db3d905be2f83da28221fc18ab6e589cb;hb=d88aee689d5bd0067f362a323cb69c37717df59f;hpb=d0b96690836f4b876096f3dc14801f8e25281a77

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index 850f9e5db..8d0e515ae 100644
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -446,12 +446,8 @@ static uint32_t __attribute__((unused)) hashlittle(const void *key,
 	return c;
 }
 
-#if (CAA_BITS_PER_LONG == 64)
-/*
- * Hash function for number value.
- */
 LTTNG_HIDDEN
-unsigned long hash_key_ulong(void *_key, unsigned long seed)
+unsigned long hash_key_u64(void *_key, unsigned long seed)
 {
 	union {
 		uint64_t v64;
@@ -463,10 +459,21 @@ unsigned long hash_key_ulong(void *_key, unsigned long seed)
 	} key;
 
 	v.v64 = (uint64_t) seed;
-	key.v64 = (uint64_t) _key;
+	key.v64 = *(uint64_t *) _key;
 	hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
 	return v.v64;
 }
+
+#if (CAA_BITS_PER_LONG == 64)
+/*
+ * Hash function for number value.
+ */
+LTTNG_HIDDEN
+unsigned long hash_key_ulong(void *_key, unsigned long seed)
+{
+	uint64_t __key = (uint64_t) _key;
+	return (unsigned long) hash_key_u64(&__key, seed);
+}
 #else
 /*
  * Hash function for number value.
@@ -502,6 +509,19 @@ int hash_match_key_ulong(void *key1, void *key2)
 	return 0;
 }
 
+/*
+ * Hash function compare for number value.
+ */
+LTTNG_HIDDEN
+int hash_match_key_u64(void *key1, void *key2)
+{
+	if (*(uint64_t *) key1 == *(uint64_t *) key2) {
+		return 1;
+	}
+
+	return 0;
+}
+
 /*
  * Hash compare function for string.
  */