/*
- * Copyright (C) - Bob Jenkins, May 2006, Public Domain.
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2006 Bob Jenkins
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ */
+
+/*
* These are functions for producing 32-bit hashes for hash table lookup.
* hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() are
* externally useful functions. Routines to test the hash are included if
* byte), but shoehorning those bytes into integers efficiently is messy.
*/
+#define _LGPL_SOURCE
#include <assert.h>
-#include <endian.h> /* attempt to define endianness */
#include <stdint.h> /* defines uint32_t etc */
#include <stdio.h> /* defines printf for tests */
#include <string.h>
#include <urcu/compiler.h>
#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
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;
} 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;
/*
* 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((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.
*/
-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;
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;
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;
+}