projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer_add_relayd_socket() report errors to sessiond
[lttng-tools.git]
/
src
/
common
/
hashtable
/
utils.c
diff --git
a/src/common/hashtable/utils.c
b/src/common/hashtable/utils.c
index 850f9e5db3d905be2f83da28221fc18ab6e589cb..8d0e515aecafbb94a347c418f23bf341f719f71c 100644
(file)
--- a/
src/common/hashtable/utils.c
+++ b/
src/common/hashtable/utils.c
@@
-446,12
+446,8
@@
static uint32_t __attribute__((unused)) hashlittle(const void *key,
return c;
}
return c;
}
-#if (CAA_BITS_PER_LONG == 64)
-/*
- * Hash function for number value.
- */
LTTNG_HIDDEN
LTTNG_HIDDEN
-unsigned long hash_key_u
long
(void *_key, unsigned long seed)
+unsigned long hash_key_u
64
(void *_key, unsigned long seed)
{
union {
uint64_t v64;
{
union {
uint64_t v64;
@@
-463,10
+459,21
@@
unsigned long hash_key_ulong(void *_key, unsigned long seed)
} key;
v.v64 = (uint64_t) seed;
} key;
v.v64 = (uint64_t) seed;
- key.v64 =
(uint64_t
) _key;
+ key.v64 =
*(uint64_t *
) _key;
hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
return v.v64;
}
hashword2(key.v32, 2, &v.v32[0], &v.v32[1]);
return v.v64;
}
+
+#if (CAA_BITS_PER_LONG == 64)
+/*
+ * Hash function for number value.
+ */
+LTTNG_HIDDEN
+unsigned long hash_key_ulong(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.
#else
/*
* Hash function for number value.
@@
-502,6
+509,19
@@
int hash_match_key_ulong(void *key1, void *key2)
return 0;
}
return 0;
}
+/*
+ * Hash function compare for number value.
+ */
+LTTNG_HIDDEN
+int hash_match_key_u64(void *key1, void *key2)
+{
+ if (*(uint64_t *) key1 == *(uint64_t *) key2) {
+ return 1;
+ }
+
+ return 0;
+}
+
/*
* Hash compare function for string.
*/
/*
* Hash compare function for string.
*/
This page took
0.023861 seconds
and
4
git commands to generate.