X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fhashtable%2Futils.c;h=9a84265a0b324b587470c350abd9fc989476b8d7;hb=9a2746aaa1cddad6737cbba2bcae739cb3b84617;hp=01cc72b3b4f8e5151a815e7461724160331ba82a;hpb=1af0e2e4d4a770e32f4fc169122b0c338bd799f6;p=lttng-tools.git

diff --git a/src/common/hashtable/utils.c b/src/common/hashtable/utils.c
index 01cc72b3b..9a84265a0 100644
--- a/src/common/hashtable/utils.c
+++ b/src/common/hashtable/utils.c
@@ -3,18 +3,18 @@
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /*
@@ -49,6 +49,7 @@
  * byte), but shoehorning those bytes into integers efficiently is messy.
  */
 
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdint.h>     /* defines uint32_t etc */
 #include <stdio.h>      /* defines printf for tests */
@@ -59,6 +60,8 @@
 
 #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
@@ -445,11 +448,8 @@ static uint32_t __attribute__((unused)) hashlittle(const void *key,
 	return c;
 }
 
-#if (CAA_BITS_PER_LONG == 64)
-/*
- * Hash function for number value.
- */
-unsigned long hash_key_ulong(void *_key, unsigned long seed)
+LTTNG_HIDDEN
+unsigned long hash_key_u64(const void *_key, unsigned long seed)
 {
 	union {
 		uint64_t v64;
@@ -461,15 +461,29 @@ unsigned long hash_key_ulong(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;
 }
+
+#if (CAA_BITS_PER_LONG == 64)
+/*
+ * Hash function for number value.
+ * Pass the value itself as the key, not its address.
+ */
+LTTNG_HIDDEN
+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);
+}
 #else
 /*
  * Hash function for number value.
+ * Pass the value itself as the key, not its address.
  */
-unsigned long hash_key_ulong(void *_key, unsigned long seed)
+LTTNG_HIDDEN
+unsigned long hash_key_ulong(const void *_key, unsigned long seed)
 {
 	uint32_t key = (uint32_t) _key;
 
@@ -480,15 +494,29 @@ unsigned long hash_key_ulong(void *_key, unsigned long seed)
 /*
  * Hash function for string.
  */
-unsigned long hash_key_str(void *key, unsigned long seed)
+LTTNG_HIDDEN
+unsigned long hash_key_str(const void *key, unsigned long seed)
 {
-	return hashlittle(key, strlen((char *) key), 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)
+{
+	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.
  */
-int hash_match_key_ulong(void *key1, void *key2)
+LTTNG_HIDDEN
+int hash_match_key_ulong(const void *key1, const void *key2)
 {
 	if (key1 == key2) {
 		return 1;
@@ -497,10 +525,24 @@ int hash_match_key_ulong(void *key1, void *key2)
 	return 0;
 }
 
+/*
+ * Hash function compare for number value.
+ */
+LTTNG_HIDDEN
+int hash_match_key_u64(const void *key1, const void *key2)
+{
+	if (*(const uint64_t *) key1 == *(const uint64_t *) key2) {
+		return 1;
+	}
+
+	return 0;
+}
+
 /*
  * Hash compare function for string.
  */
-int hash_match_key_str(void *key1, void *key2)
+LTTNG_HIDDEN
+int hash_match_key_str(const void *key1, const void *key2)
 {
 	if (strcmp(key1, key2) == 0) {
 		return 1;
@@ -508,3 +550,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;
+}