X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Futils.c;h=1ea699d6edb921364a30d3c92e31e9ee538571b4;hb=994ab360b3264e19fdf590178601fa1f9f6489d0;hp=850f9e5db3d905be2f83da28221fc18ab6e589cb;hpb=90e535ef0d0433d31e805775f85e4d187b1cf82c;p=lttng-tools.git

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index 850f9e5db..1ea699d6e 100644
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -60,6 +60,7 @@
 #include "utils.h"
 #include <common/compat/endian.h>    /* attempt to define endianness */
 #include <common/common.h>
+#include <common/hashtable/hashtable.h>
 
 /*
  * My best guess at if you are big-endian or little-endian.  This may
@@ -446,12 +447,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 +460,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.
@@ -489,6 +497,17 @@ unsigned long hash_key_str(void *key, unsigned long seed)
 	return hashlittle(key, strlen((char *) key), seed);
 }
 
+/*
+ * Hash function for two uint64_t.
+ */
+LTTNG_HIDDEN
+unsigned long hash_key_two_u64(void *key, unsigned long seed)
+{
+	struct lttng_ht_two_u64 *k = (struct lttng_ht_two_u64 *) key;
+
+	return hash_key_u64(&k->key1, seed) ^ hash_key_u64(&k->key2, seed);
+}
+
 /*
  * Hash function compare for number value.
  */
@@ -502,6 +521,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.
  */
@@ -514,3 +546,20 @@ int hash_match_key_str(void *key1, void *key2)
 
 	return 0;
 }
+
+/*
+ * Hash function compare two uint64_t.
+ */
+LTTNG_HIDDEN
+int hash_match_key_two_u64(void *key1, void *key2)
+{
+	struct lttng_ht_two_u64 *k1 = (struct lttng_ht_two_u64 *) key1;
+	struct lttng_ht_two_u64 *k2 = (struct lttng_ht_two_u64 *) key2;
+
+	if (hash_match_key_u64(&k1->key1, &k2->key1) &&
+			hash_match_key_u64(&k1->key2, &k2->key2)) {
+		return 1;
+	}
+
+	return 0;
+}