projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixup run_str[] condensing with client/server
[fio.git]
/
hash.h
diff --git
a/hash.h
b/hash.h
index 4b8c6bf0bcc49bd9b1f1b56c38c6e6b6243df22e..02b06140146b469abd05772406102fec845747fc 100644
(file)
--- a/
hash.h
+++ b/
hash.h
@@
-28,7
+28,9
@@
#error Define GOLDEN_RATIO_PRIME for your wordsize.
#endif
#error Define GOLDEN_RATIO_PRIME for your wordsize.
#endif
-static inline unsigned long hash_long(unsigned long val, unsigned int bits)
+#define GR_PRIME_64 0x9e37fffffffc0001ULL
+
+static inline unsigned long __hash_long(unsigned long val)
{
unsigned long hash = val;
{
unsigned long hash = val;
@@
-52,8
+54,18
@@
static inline unsigned long hash_long(unsigned long val, unsigned int bits)
hash *= GOLDEN_RATIO_PRIME;
#endif
hash *= GOLDEN_RATIO_PRIME;
#endif
+ return hash;
+}
+
+static inline unsigned long hash_long(unsigned long val, unsigned int bits)
+{
/* High bits are more random, so use them. */
/* High bits are more random, so use them. */
- return hash >> (BITS_PER_LONG - bits);
+ return __hash_long(val) >> (BITS_PER_LONG - bits);
+}
+
+static inline uint64_t __hash_u64(uint64_t val)
+{
+ return val * GR_PRIME_64;
}
static inline unsigned long hash_ptr(void *ptr, unsigned int bits)
}
static inline unsigned long hash_ptr(void *ptr, unsigned int bits)