Cleanup: remove duplicated implementation of rculfhash

[lttng-tools.git] / src / common / hashtable / utils.c

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index 8d0e515aecafbb94a347c418f23bf341f719f71c..3c6994b1d0a98c0a9da5c5905c5de9a3b1e87e7d 100644 (file)
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -49,6 +49,7 @@
  * byte), but shoehorning those bytes into integers efficiently is messy.
  */
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdint.h>     /* defines uint32_t etc */
 #include <stdio.h>      /* defines printf for tests */
@@ -60,6 +61,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
@@ -496,6 +498,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.
  */
@@ -534,3 +547,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;
+}