X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Futils.c;h=c9d75e289a0cf6f4d39a85b3f98378ff717d6141;hb=239f61af8ea0b97cec0543220a9bfa1184c7ede2;hp=8d0e515aecafbb94a347c418f23bf341f719f71c;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32;p=lttng-tools.git

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index 8d0e515ae..c9d75e289 100644
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -48,7 +48,8 @@
  * with 12*3 instructions on 3 integers than you can with 3 instructions on 1
  * 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
@@ -447,7 +449,7 @@ static uint32_t __attribute__((unused)) hashlittle(const void *key,
 }
 
 LTTNG_HIDDEN
-unsigned long hash_key_u64(void *_key, unsigned long seed)
+unsigned long hash_key_u64(const void *_key, unsigned long seed)
 {
 	union {
 		uint64_t v64;
@@ -459,7 +461,7 @@ unsigned long hash_key_u64(void *_key, unsigned long seed)
 	} key;
 
 	v.v64 = (uint64_t) seed;
-	key.v64 = *(uint64_t *) _key;
+	key.v64 = *(const uint64_t *) _key;
 	hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
 	return v.v64;
 }
@@ -469,7 +471,7 @@ unsigned long hash_key_u64(void *_key, unsigned long seed)
  * Hash function for number value.
  */
 LTTNG_HIDDEN
-unsigned long hash_key_ulong(void *_key, unsigned long seed)
+unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 {
 	uint64_t __key = (uint64_t) _key;
 	return (unsigned long) hash_key_u64(&__key, seed);
@@ -479,7 +481,7 @@ unsigned long hash_key_ulong(void *_key, unsigned long seed)
  * Hash function for number value.
  */
 LTTNG_HIDDEN
-unsigned long hash_key_ulong(void *_key, unsigned long seed)
+unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 {
 	uint32_t key = (uint32_t) _key;
 
@@ -491,16 +493,28 @@ unsigned long hash_key_ulong(void *_key, unsigned long seed)
  * Hash function for string.
  */
 LTTNG_HIDDEN
-unsigned long hash_key_str(void *key, unsigned long seed)
+unsigned long hash_key_str(const void *key, unsigned long seed)
+{
+	return hashlittle(key, strlen((const char *) key), seed);
+}
+
+/*
+ * Hash function for two uint64_t.
+ */
+LTTNG_HIDDEN
+unsigned long hash_key_two_u64(const void *key, unsigned long seed)
 {
-	return hashlittle(key, strlen((char *) key), seed);
+	const struct lttng_ht_two_u64 *k =
+		(const 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.
  */
 LTTNG_HIDDEN
-int hash_match_key_ulong(void *key1, void *key2)
+int hash_match_key_ulong(const void *key1, const void *key2)
 {
 	if (key1 == key2) {
 		return 1;
@@ -513,9 +527,9 @@ int hash_match_key_ulong(void *key1, void *key2)
  * Hash function compare for number value.
  */
 LTTNG_HIDDEN
-int hash_match_key_u64(void *key1, void *key2)
+int hash_match_key_u64(const void *key1, const void *key2)
 {
-	if (*(uint64_t *) key1 == *(uint64_t *) key2) {
+	if (*(const uint64_t *) key1 == *(const uint64_t *) key2) {
 		return 1;
 	}
 
@@ -526,7 +540,7 @@ int hash_match_key_u64(void *key1, void *key2)
  * Hash compare function for string.
  */
 LTTNG_HIDDEN
-int hash_match_key_str(void *key1, void *key2)
+int hash_match_key_str(const void *key1, const void *key2)
 {
 	if (strcmp(key1, key2) == 0) {
 		return 1;
@@ -534,3 +548,22 @@ 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(const void *key1, const void *key2)
+{
+	const struct lttng_ht_two_u64 *k1 =
+		(const struct lttng_ht_two_u64 *) key1;
+	const struct lttng_ht_two_u64 *k2 =
+		(const 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;
+}