Browse Source

Add MurmurHash3 implementation to hash.h/add hash.cpp.

pull/1/head
Matt Corallo 10 years ago
parent
commit
7ab026f449
  1. 1
      bitcoin-qt.pro
  2. 58
      src/hash.cpp
  3. 3
      src/hash.h
  4. 1
      src/makefile.linux-mingw
  5. 1
      src/makefile.mingw
  6. 1
      src/makefile.osx
  7. 1
      src/makefile.unix

1
bitcoin-qt.pro

@ -215,6 +215,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ @@ -215,6 +215,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/version.cpp \
src/sync.cpp \
src/util.cpp \
src/hash.cpp \
src/netbase.cpp \
src/key.cpp \
src/script.cpp \

58
src/hash.cpp

@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@
#include "hash.h"
inline uint32_t ROTL32 ( uint32_t x, int8_t r )
{
return (x << r) | (x >> (32 - r));
}
unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash)
{
// The following is MurmurHash3 (x86_32), see http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
uint32_t h1 = nHashSeed;
const uint32_t c1 = 0xcc9e2d51;
const uint32_t c2 = 0x1b873593;
const int nblocks = vDataToHash.size() / 4;
//----------
// body
const uint32_t * blocks = (const uint32_t *)(&vDataToHash[0] + nblocks*4);
for(int 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;
}
//----------
// tail
const uint8_t * tail = (const uint8_t*)(&vDataToHash[0] + nblocks*4);
uint32_t k1 = 0;
switch(vDataToHash.size() & 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;
};
//----------
// finalization
h1 ^= vDataToHash.size();
h1 ^= h1 >> 16;
h1 *= 0x85ebca6b;
h1 ^= h1 >> 13;
h1 *= 0xc2b2ae35;
h1 ^= h1 >> 16;
return h1;
}

3
src/hash.h

@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <openssl/sha.h>
#include <openssl/ripemd.h>
#include <vector>
template<typename T1>
inline uint256 Hash(const T1 pbegin, const T1 pend)
@ -113,4 +114,6 @@ inline uint160 Hash160(const std::vector<unsigned char>& vch) @@ -113,4 +114,6 @@ inline uint160 Hash160(const std::vector<unsigned char>& vch)
return hash2;
}
unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash);
#endif

1
src/makefile.linux-mingw

@ -83,6 +83,7 @@ OBJS= \ @@ -83,6 +83,7 @@ OBJS= \
obj/wallet.o \
obj/walletdb.o \
obj/noui.o \
obj/hash.o \
obj/leveldb.o \
obj/txdb.o

1
src/makefile.mingw

@ -78,6 +78,7 @@ OBJS= \ @@ -78,6 +78,7 @@ OBJS= \
obj/util.o \
obj/wallet.o \
obj/walletdb.o \
obj/hash.o \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o

1
src/makefile.osx vendored

@ -96,6 +96,7 @@ OBJS= \ @@ -96,6 +96,7 @@ OBJS= \
obj/util.o \
obj/wallet.o \
obj/walletdb.o \
obj/hash.o \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o

1
src/makefile.unix

@ -127,6 +127,7 @@ OBJS= \ @@ -127,6 +127,7 @@ OBJS= \
obj/util.o \
obj/wallet.o \
obj/walletdb.o \
obj/hash.o \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o

Loading…
Cancel
Save