#include <stdint.h>
#include <string.h>
+#include <limits.h>
+
+#include <rte_config.h>
+#include <rte_log.h>
#include <rte_byteorder.h>
/* jhash.h: Jenkins hash support.
* If check_align is not set, first case will be used
*/
#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686) || defined(RTE_ARCH_X86_X32)
- const uint32_t *k = key;
+ const uint32_t *k = (const uint32_t *)key;
const uint32_t s = 0;
#else
- const uint32_t *k = (uint32_t *)(uintptr_t)key & (uintptr_t)~3);
+ const uint32_t *k = (uint32_t *)((uintptr_t)key & (uintptr_t)~3);
const uint32_t s = ((uintptr_t)key & 3) * CHAR_BIT;
#endif
if (!check_align || s == 0) {
}
/**
- * Same as rte_jhash2, but takes two seeds and return two uint32_ts.
+ * Same as rte_jhash_32b, but takes two seeds and return two uint32_ts.
* pc and pb must be non-null, and *pc and *pb must both be initialized
* with seeds. If you pass in (*pb)=0, the output (*pc) will be
- * the same as the return value from rte_jhash2.
+ * the same as the return value from rte_jhash_32b.
*
* @param k
* Key to calculate hash of.
* IN: second seed OUT: secondary hash value.
*/
static inline void
-rte_jhash2_2hashes(const uint32_t *k, uint32_t length, uint32_t *pc, uint32_t *pb)
+rte_jhash_32b_2hashes(const uint32_t *k, uint32_t length, uint32_t *pc, uint32_t *pb)
{
__rte_jhash_2hashes((const void *) k, (length << 2), pc, pb, 0);
}
/**
* The most generic version, hashes an arbitrary sequence
* of bytes. No alignment or length assumptions are made about
- * the input key.
+ * the input key. For keys not aligned to four byte boundaries
+ * or a multiple of four bytes in length, the memory region
+ * just after may be read (but not used in the computation).
+ * This may cross a page boundary.
*
* @param key
* Key to calculate hash of.
* Calculated hash value.
*/
static inline uint32_t
-rte_jhash2(const uint32_t *k, uint32_t length, uint32_t initval)
+rte_jhash_32b(const uint32_t *k, uint32_t length, uint32_t initval)
{
uint32_t initval2 = 0;
- rte_jhash2_2hashes(k, length, &initval, &initval2);
+ rte_jhash_32b_2hashes(k, length, &initval, &initval2);
return initval;
}
* 3 words.
*
* @param a
- * First word to calcuate hash of.
+ * First word to calculate hash of.
* @param b
- * Second word to calcuate hash of.
+ * Second word to calculate hash of.
* @param c
- * Third word to calcuate hash of.
+ * Third word to calculate hash of.
* @param initval
* Initialising value of hash.
* @return
* 2 words.
*
* @param a
- * First word to calcuate hash of.
+ * First word to calculate hash of.
* @param b
- * Second word to calcuate hash of.
+ * Second word to calculate hash of.
* @param initval
* Initialising value of hash.
* @return
* 1 word.
*
* @param a
- * Word to calcuate hash of.
+ * Word to calculate hash of.
* @param initval
* Initialising value of hash.
* @return