* 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 */
#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
}
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;
} 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(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);
#else
/*
* Hash function for number value.
+ * Pass the value itself as the key, not its address.
*/
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;
* 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;
* 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;
}
* 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;
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;
+}