Move murmur3 hash to crc/

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/Makefile b/Makefile
index d7cc1d4c9b4d59a4547aa3de250ef20897866af5..b02bb13851b036c3f407b3dfb2576f6e571c6995 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
                lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c \
                lib/hweight.c lib/getrusage.c idletime.c td_error.c \
                profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
                lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c \
                lib/hweight.c lib/getrusage.c idletime.c td_error.c \
                profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \

-               lib/tp.c lib/bloom.c lib/murmur3.c
+               lib/tp.c lib/bloom.c

 
 ifdef CONFIG_LIBHDFS
   HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
 
 ifdef CONFIG_LIBHDFS
   HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)


@@ -192,7 +192,7 @@ endif
 ifeq ($(CONFIG_TARGET_OS), Linux)
 T_DEDUPE_OBJS = t/dedupe.o
 T_DEDUPE_OBJS += lib/rbtree.o t/log.o mutex.o smalloc.o gettime.o crc/md5.o \
 ifeq ($(CONFIG_TARGET_OS), Linux)
 T_DEDUPE_OBJS = t/dedupe.o
 T_DEDUPE_OBJS += lib/rbtree.o t/log.o mutex.o smalloc.o gettime.o crc/md5.o \

-               memalign.o lib/bloom.o t/debug.o crc/xxhash.o
+               memalign.o lib/bloom.o t/debug.o crc/xxhash.o crc/murmur3.o

 T_DEDUPE_PROGS = t/dedupe
 endif
 
 T_DEDUPE_PROGS = t/dedupe
 endif
 

diff --git a/crc/murmur3.c b/crc/murmur3.c
new file mode 100644 (file)
index 0000000..e316f59
--- /dev/null
+++ b/crc/murmur3.c
@@ -0,0 +1,68 @@
+#include "murmur3.h"
+
+static inline uint32_t rotl32(uint32_t x, int8_t r)
+{
+       return (x << r) | (x >> (32 - r));
+}
+
+//-----------------------------------------------------------------------------
+// Finalization mix - force all bits of a hash block to avalanche
+
+static inline uint32_t fmix32(uint32_t h)
+{
+       h ^= h >> 16;
+       h *= 0x85ebca6b;
+       h ^= h >> 13;
+       h *= 0xc2b2ae35;
+       h ^= h >> 16;
+
+       return h;
+}
+
+static uint32_t murmur3_tail(const uint8_t *data, const int nblocks,
+                            uint32_t len, const uint32_t c1,
+                            const uint32_t c2, uint32_t h1)
+{
+       const uint8_t *tail = (const uint8_t *)(data + nblocks * 4);
+
+       uint32_t k1 = 0;
+       switch (len & 3) {
+       case 3:
+               k1 ^= tail[2] << 16;
+       case 2:
+               k1 ^= tail[1] << 8;
+       case 1:
+               k1 ^= tail[0];
+               k1 *= c1;
+               k1 = rotl32(k1, 15);
+               k1 *= c2;
+               h1 ^= k1;
+       };
+
+       return fmix32(h1 ^ len);
+}
+
+uint32_t murmurhash3(const void *key, uint32_t len, uint32_t seed)
+{
+       const uint8_t *data = (const uint8_t *)key;
+       const int nblocks = len / 4;
+       uint32_t h1 = seed;
+       const uint32_t c1 = 0xcc9e2d51;
+       const uint32_t c2 = 0x1b873593;
+       const uint32_t *blocks = (const uint32_t *)(data + nblocks * 4);
+       int i;
+
+       for (i = -nblocks; i; i++) {
+               uint32_t k1 = blocks[i];
+
+               k1 *= c1;
+               k1 = rotl32(k1, 15);
+               k1 *= c2;
+
+               h1 ^= k1;
+               h1 = rotl32(h1, 13);
+               h1 = h1 * 5 + 0xe6546b64;
+       }
+
+       return murmur3_tail(data, nblocks, len, c1, c2, h1);
+}

diff --git a/crc/murmur3.h b/crc/murmur3.h
new file mode 100644 (file)
index 0000000..89f6500
--- /dev/null
+++ b/crc/murmur3.h
@@ -0,0 +1,8 @@
+#ifndef FIO_MURMUR3_H
+#define FIO_MURMUR3_H
+
+#include <inttypes.h>
+
+uint32_t murmurhash3(const void *key, uint32_t len, uint32_t seed);
+
+#endif

diff --git a/crc/test.c b/crc/test.c
index b2708a84e8c2c6b73446c6d3f13b420e14e145dd..39ffac0baaaad0d5a378cf373aeaccb34a869092 100644 (file)
--- a/crc/test.c
+++ b/crc/test.c
@@ -17,7 +17,7 @@
 #include "../crc/sha256.h"
 #include "../crc/sha512.h"
 #include "../crc/xxhash.h"
 #include "../crc/sha256.h"
 #include "../crc/sha512.h"
 #include "../crc/xxhash.h"

-#include "../lib/murmur3.h"
+#include "../crc/murmur3.h"

 #include "../hash.h"
 
 #include "test.h"
 #include "../hash.h"
 
 #include "test.h"

diff --git a/lib/bloom.c b/lib/bloom.c
index eb6deebe533ee701e907f6c92458eb0535305857..8059a65b29a5915c6eeee11ef3096566e19a6107 100644 (file)
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -5,7 +5,7 @@
 #include "../hash.h"
 #include "../minmax.h"
 #include "../crc/xxhash.h"
 #include "../hash.h"
 #include "../minmax.h"
 #include "../crc/xxhash.h"

-#include "../lib/murmur3.h"
+#include "../crc/murmur3.h"

 
 struct bloom {
        uint64_t nentries;
 
 struct bloom {
        uint64_t nentries;

diff --git a/lib/murmur3.c b/lib/murmur3.c
deleted file mode 100644 (file)
index e316f59..0000000
--- a/lib/murmur3.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "murmur3.h"
-
-static inline uint32_t rotl32(uint32_t x, int8_t r)
-{
-       return (x << r) | (x >> (32 - r));
-}
-
-//-----------------------------------------------------------------------------
-// Finalization mix - force all bits of a hash block to avalanche
-
-static inline uint32_t fmix32(uint32_t h)
-{
-       h ^= h >> 16;
-       h *= 0x85ebca6b;
-       h ^= h >> 13;
-       h *= 0xc2b2ae35;
-       h ^= h >> 16;
-
-       return h;
-}
-
-static uint32_t murmur3_tail(const uint8_t *data, const int nblocks,
-                            uint32_t len, const uint32_t c1,
-                            const uint32_t c2, uint32_t h1)
-{
-       const uint8_t *tail = (const uint8_t *)(data + nblocks * 4);
-
-       uint32_t k1 = 0;
-       switch (len & 3) {
-       case 3:
-               k1 ^= tail[2] << 16;
-       case 2:
-               k1 ^= tail[1] << 8;
-       case 1:
-               k1 ^= tail[0];
-               k1 *= c1;
-               k1 = rotl32(k1, 15);
-               k1 *= c2;
-               h1 ^= k1;
-       };
-
-       return fmix32(h1 ^ len);
-}
-
-uint32_t murmurhash3(const void *key, uint32_t len, uint32_t seed)
-{
-       const uint8_t *data = (const uint8_t *)key;
-       const int nblocks = len / 4;
-       uint32_t h1 = seed;
-       const uint32_t c1 = 0xcc9e2d51;
-       const uint32_t c2 = 0x1b873593;
-       const uint32_t *blocks = (const uint32_t *)(data + nblocks * 4);
-       int i;
-
-       for (i = -nblocks; i; i++) {
-               uint32_t k1 = blocks[i];
-
-               k1 *= c1;
-               k1 = rotl32(k1, 15);
-               k1 *= c2;
-
-               h1 ^= k1;
-               h1 = rotl32(h1, 13);
-               h1 = h1 * 5 + 0xe6546b64;
-       }
-
-       return murmur3_tail(data, nblocks, len, c1, c2, h1);
-}

diff --git a/lib/murmur3.h b/lib/murmur3.h
deleted file mode 100644 (file)
index 89f6500..0000000
--- a/lib/murmur3.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FIO_MURMUR3_H
-#define FIO_MURMUR3_H
-
-#include <inttypes.h>
-
-uint32_t murmurhash3(const void *key, uint32_t len, uint32_t seed);
-
-#endif