|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r72218 - in sandbox/bloom_filter/trunk: . boost boost/bloom_filter boost/bloom_filter/detail boost/bloom_filter/murmurhash3 doc include include/murmurhash3 libs libs/bloom_filter libs/bloom_filter/doc libs/bloom_filter/example libs/bloom_filter/test test
From: cpp.cabrera_at_[hidden]
Date: 2011-05-27 13:06:54
Author: alejandro
Date: 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
New Revision: 72218
URL: http://svn.boost.org/trac/boost/changeset/72218
Log:
Restructured project to meet Boost standard format. Updated test makefile to
allow tests to continue to compile.
Added:
sandbox/bloom_filter/trunk/boost/
sandbox/bloom_filter/trunk/boost/README (contents, props changed)
- copied, changed from r72216, /sandbox/bloom_filter/trunk/README
sandbox/bloom_filter/trunk/boost/bloom_filter/
sandbox/bloom_filter/trunk/boost/bloom_filter/bloom.hpp (contents, props changed)
- copied, changed from r72216, /sandbox/bloom_filter/trunk/include/bloom.hpp
sandbox/bloom_filter/trunk/boost/bloom_filter/detail/
sandbox/bloom_filter/trunk/boost/bloom_filter/detail/PLACE_HOLDER (contents, props changed)
sandbox/bloom_filter/trunk/boost/bloom_filter/hash.hpp (contents, props changed)
- copied, changed from r72216, /sandbox/bloom_filter/trunk/include/hash.hpp
sandbox/bloom_filter/trunk/boost/bloom_filter/murmurhash3/
sandbox/bloom_filter/trunk/boost/bloom_filter/murmurhash3/murmurhash3.h (contents, props changed)
- copied, changed from r72216, /sandbox/bloom_filter/trunk/include/murmurhash3/murmurhash3.h
sandbox/bloom_filter/trunk/doc/
sandbox/bloom_filter/trunk/doc/PLACE_HOLDER (contents, props changed)
sandbox/bloom_filter/trunk/libs/
sandbox/bloom_filter/trunk/libs/bloom_filter/
sandbox/bloom_filter/trunk/libs/bloom_filter/doc/
sandbox/bloom_filter/trunk/libs/bloom_filter/doc/PLACE_HOLDER (contents, props changed)
sandbox/bloom_filter/trunk/libs/bloom_filter/example/
sandbox/bloom_filter/trunk/libs/bloom_filter/example/PLACE_HOLDER (contents, props changed)
sandbox/bloom_filter/trunk/libs/bloom_filter/test/
sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp (contents, props changed)
- copied, changed from r72216, /sandbox/bloom_filter/trunk/test/boost_test.cpp
sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile
- copied, changed from r72216, /sandbox/bloom_filter/trunk/test/makefile
sandbox/bloom_filter/trunk/libs/bloom_filter/test/murmurhash3.cpp (contents, props changed)
- copied, changed from r72216, /sandbox/bloom_filter/trunk/test/murmurhash3.cpp
Removed:
sandbox/bloom_filter/trunk/README
sandbox/bloom_filter/trunk/include/bloom.hpp
sandbox/bloom_filter/trunk/include/hash.hpp
sandbox/bloom_filter/trunk/include/murmurhash3/murmurhash3.h
sandbox/bloom_filter/trunk/test/boost_test.cpp
sandbox/bloom_filter/trunk/test/makefile
sandbox/bloom_filter/trunk/test/murmurhash3.cpp
Text files modified:
sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Deleted: sandbox/bloom_filter/trunk/README
==============================================================================
--- sandbox/bloom_filter/trunk/README 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,50 +0,0 @@
-This prototype uses the public domain library MurmurHash3 to get its
-work done.
-
-To build:
-$> make
-
-To clean:
-$> make clean
-
-To run:
-$> ./test_bloom
-
-===== Compression =====
-
-(Lossless) Compression policies to investigate:
-- LZ (Lempel-Ziv), e.g., DEFLATE
-- LZR (LZ-Renau), Zip
-- LZX, MSFT Cab format
-- Burrows-Wheeler
-- check wiki page on compression
-
-A compression policy looks as below:
-template <size_t Size>
-struct CompressionPolicy {
- size_t compress(const char *const in, char *out, const size_t insize);
- void decompress(const char *const in, char *out, const size_t insize);
-};
-
-compress() returns the size of the data when compressed.
-
-Since compress and decompress will only ever used in association
-with the bits of a Bloom filter, the Size parameter can be embedded in
-the policy template. This represents the uncompressed size of the Bloom
-filter.
-
-===== Deleting Variants =====
-
-Deletion should not be embedded as a policy. Inherently,
-Bloom filters that use a deletion policy have different data layouts.
-For example, Scalable Bloom filters must be grown to always satisfy
-the desired false positive rate. There are also Counting Bloom filters,
-that instead of storing a bit array, require storing an array of 3-4 bit
-counters.
-
-A few deleting variants:
-- Scalable Counting Bloom filter
-- Counting Bloom filter
-- Bloomier filters
-
--Alejandro Cabrera
Copied: sandbox/bloom_filter/trunk/boost/README (from r72216, /sandbox/bloom_filter/trunk/README)
==============================================================================
Copied: sandbox/bloom_filter/trunk/boost/bloom_filter/bloom.hpp (from r72216, /sandbox/bloom_filter/trunk/include/bloom.hpp)
==============================================================================
Added: sandbox/bloom_filter/trunk/boost/bloom_filter/detail/PLACE_HOLDER
==============================================================================
Copied: sandbox/bloom_filter/trunk/boost/bloom_filter/hash.hpp (from r72216, /sandbox/bloom_filter/trunk/include/hash.hpp)
==============================================================================
Copied: sandbox/bloom_filter/trunk/boost/bloom_filter/murmurhash3/murmurhash3.h (from r72216, /sandbox/bloom_filter/trunk/include/murmurhash3/murmurhash3.h)
==============================================================================
Added: sandbox/bloom_filter/trunk/doc/PLACE_HOLDER
==============================================================================
Deleted: sandbox/bloom_filter/trunk/include/bloom.hpp
==============================================================================
--- sandbox/bloom_filter/trunk/include/bloom.hpp 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,118 +0,0 @@
-#ifndef _BLOOM_HPP
-#define _BLOOM_HPP 1
-/**
- * \author Alejandro Cabrera
- * \brief A generic Bloom filter providing compile-time unrolling
- * of hash function application.
- */
-#include <boost/config.hpp>
-#include <bitset>
-
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/mpl/at.hpp>
-
-#include <hash.hpp>
-
-template <size_t N,
- typename T,
- size_t Size,
- class HashFunctions>
-struct apply_hash
-{
- static void insert(const T& t, std::bitset<Size>& _bits) {
- typedef typename boost::mpl::at_c<HashFunctions, N>::type Hash;
- _bits[Hash::hash(t) % Size] = true;
- apply_hash<N-1, T, Size, HashFunctions>::insert(t, _bits);
- }
-
- static bool contains(const T& t, const std::bitset<Size>& _bits) {
- typedef typename boost::mpl::at_c<HashFunctions, N>::type Hash;
- return (_bits[Hash::hash(t) % Size] &&
- apply_hash<N-1, T, Size, HashFunctions>::contains(t, _bits));
- }
-};
-
-template <typename T,
- size_t Size,
- class HashFunctions>
-struct apply_hash<0, T, Size, HashFunctions>
-{
- static void insert(const T& t, std::bitset<Size>& _bits) {
- typedef typename boost::mpl::at_c<HashFunctions, 0>::type Hash;
- _bits[Hash::hash(t) % Size] = true;
- }
-
- static bool contains(const T& t, const std::bitset<Size>& _bits) {
- typedef typename boost::mpl::at_c<HashFunctions, 0>::type Hash;
- return (_bits[Hash::hash(t) % Size]);
- }
-};
-
-template <typename T,
- size_t Size,
- class HashFunctions = boost::mpl::vector<MurmurHash3<T, 3>,
- MurmurHash3<T, 5>,
- MurmurHash3<T, 7> > >
-class bloom_filter {
- typedef std::bitset<Size> Bitset;
-
-public:
- bloom_filter() {}
-
- BOOST_CONSTEXPR size_t size() const {
- return Size;
- }
-
- void insert(const T& t) {
- static const unsigned N = boost::mpl::size<HashFunctions>::value - 1;
- apply_hash<N, T, Size, HashFunctions>::insert(t, bits);
- }
-
- bool contains(const T& t) const {
- static const unsigned N = boost::mpl::size<HashFunctions>::value - 1;
- return apply_hash<N, T, Size, HashFunctions>::contains(t, bits);
- }
-
- bool operator[](const T& t) const {
- return this->contains(t);
- }
-
- void clear() {
- this->bits.reset();
- }
-
- bloom_filter& operator|=(const bloom_filter& rhs) {
- this->bits |= rhs.bits;
- return *this;
- }
-
- bloom_filter& operator&=(const bloom_filter& rhs) {
- this->bits &= rhs.bits;
- return *this;
- }
-
-private:
- std::bitset<Size> bits;
-};
-
-template<class _T, size_t _Size, class _HashFunctions>
-bloom_filter<_T, _Size, _HashFunctions>
-operator|(const bloom_filter<_T, _Size, _HashFunctions>& lhs,
- const bloom_filter<_T, _Size, _HashFunctions>& rhs)
-{
- bloom_filter<_T, _Size, _HashFunctions> ret = lhs;
- ret |= rhs;
- return ret;
-}
-
-template<class _T, size_t _Size, class _HashFunctions>
-bloom_filter<_T, _Size, _HashFunctions>
-operator&(const bloom_filter<_T, _Size, _HashFunctions>& lhs,
- const bloom_filter<_T, _Size, _HashFunctions>& rhs)
-{
- bloom_filter<_T, _Size, _HashFunctions> ret = lhs;
- ret &= rhs;
- return ret;
-}
-#endif
Deleted: sandbox/bloom_filter/trunk/include/hash.hpp
==============================================================================
--- sandbox/bloom_filter/trunk/include/hash.hpp 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,118 +0,0 @@
-#ifndef _HASH_HPP_
-#define _HASH_HPP_ 1
-/**
- * \author Alejandro Cabrera
- * \brief An alternative implentation of murmurhash3 for users
- * not wishing to rely on the public domain Murmurhash3.
- * \todo Hash many more collisions than public domain version of murmurhash3.
- * \todo Provide 64-bit implementation of murmurhash3.
- */
-#include <cstdint>
-#include <murmurhash3/murmurhash3.h>
-
-template <typename UnsignedIntT>
-inline UnsignedIntT rotl(const UnsignedIntT x, uint8_t r)
-{
- return (x << r) | (x >> (sizeof(UnsignedIntT) * 4 - r));
-}
-
-inline uint32_t rotl32(const uint32_t x, uint8_t r)
-{
- return rotl<uint32_t>(x,r);
-}
-
-inline uint64_t rotl64(const uint64_t x, uint8_t r)
-{
- return rotl<uint64_t>(x,r);
-}
-
-template <typename UnsignedIntT>
-inline UnsignedIntT get_block(const UnsignedIntT * p, const int i)
-{
- return p[i];
-}
-
-inline uint32_t fmix(uint32_t h)
-{
- h ^= h >> 16;
- h *= 0x85ebca6b;
- h ^= h >> 13;
- h *= 0xc2b2ae35;
- h ^= h >> 16;
-
- return h;
-}
-
-void murmurhash3(const void *const key, const int len,
- const uint32_t seed, void *out)
-{
- static const uint32_t c1 = 0xcc9e2d51;
- static const uint32_t c2 = 0x1b873593;
-
- const uint8_t *const data = static_cast<const uint8_t *const>(key);
-
- uint32_t h1 = seed;
- const uint32_t *const blocks =
- reinterpret_cast<const uint32_t *const >(data + len);
-
- for (int i = -(len/4); 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;
- }
-
- const uint8_t *const tail =
- static_cast<const uint8_t *const>(data + len);
-
- 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, 16);
- k1 *= c2;
- h1 ^= k1;
- }
-
- h1 ^= len;
- h1 = fmix(h1);
-
- *static_cast<uint32_t *>(out) = h1;
-}
-
-template <typename T, size_t Seed>
-struct MurmurHash3 {
- static size_t hash(const T& t) {
- size_t out = 0;
- murmurhash3(static_cast<const void *const>(&t),
- sizeof(t),
- Seed,
- &out);
- return out;
- }
-};
-
-// uses public domain implementation of murmurhash3
-template <typename T, size_t Seed>
-struct OHash {
- static size_t hash(const T& t) {
- size_t out = 0;
- MurmurHash3_x86_32(static_cast<const void *const>(&t),
- sizeof(t),
- Seed,
- &out);
- return out;
- }
-};
-#endif
Deleted: sandbox/bloom_filter/trunk/include/murmurhash3/murmurhash3.h
==============================================================================
--- sandbox/bloom_filter/trunk/include/murmurhash3/murmurhash3.h 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,37 +0,0 @@
-//-----------------------------------------------------------------------------
-// MurmurHash3 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
-
-#ifndef _MURMURHASH3_H_
-#define _MURMURHASH3_H_
-
-//-----------------------------------------------------------------------------
-// Platform-specific functions and macros
-
-// Microsoft Visual Studio
-
-#if defined(_MSC_VER)
-
-typedef unsigned char uint8_t;
-typedef unsigned long uint32_t;
-typedef unsigned __int64 uint64_t;
-
-// Other compilers
-
-#else // defined(_MSC_VER)
-
-#include <stdint.h>
-
-#endif // !defined(_MSC_VER)
-
-//-----------------------------------------------------------------------------
-
-void MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed, void * out );
-
-void MurmurHash3_x86_128 ( const void * key, int len, uint32_t seed, void * out );
-
-void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out );
-
-//-----------------------------------------------------------------------------
-
-#endif // _MURMURHASH3_H_
Added: sandbox/bloom_filter/trunk/libs/bloom_filter/doc/PLACE_HOLDER
==============================================================================
Added: sandbox/bloom_filter/trunk/libs/bloom_filter/example/PLACE_HOLDER
==============================================================================
Copied: sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp (from r72216, /sandbox/bloom_filter/trunk/test/boost_test.cpp)
==============================================================================
Copied: sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile (from r72216, /sandbox/bloom_filter/trunk/test/makefile)
==============================================================================
--- /sandbox/bloom_filter/trunk/test/makefile (original)
+++ sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
@@ -1,6 +1,6 @@
CXXFLAGS := -Wall -Wextra -pedantic -std=c++0x -O3 -g
LD_FLAGS := -lpthread -lboost_unit_test_framework
-INCLUDE_DIR := ../include
+INCLUDE_DIR := ../../../boost/bloom_filter
INCLUDES := -I$(INCLUDE_DIR)
EXES := boost_test
all : $(EXES)
Copied: sandbox/bloom_filter/trunk/libs/bloom_filter/test/murmurhash3.cpp (from r72216, /sandbox/bloom_filter/trunk/test/murmurhash3.cpp)
==============================================================================
Deleted: sandbox/bloom_filter/trunk/test/boost_test.cpp
==============================================================================
--- sandbox/bloom_filter/trunk/test/boost_test.cpp 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,174 +0,0 @@
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE "Boost Bloom Filter" 1
-#include <iostream>
-
-#include <bloom.hpp>
-#include <boost/test/unit_test.hpp>
-
-BOOST_AUTO_TEST_CASE(defaultConstructor) {
- typedef boost::mpl::vector<
- OHash <int, 2>,
- OHash<int, 3>,
- OHash<int, 5>,
- OHash<int, 7>,
- OHash<int, 11>,
- OHash<int, 13>,
- OHash<int, 17>,
- OHash<int, 19>> EightHashFunctions_O;
-
- bloom_filter<int, 8> bloom1;
- bloom_filter<int, 8, EightHashFunctions_O> bloom2;
-}
-
-BOOST_AUTO_TEST_CASE(assignment)
-{
- bloom_filter<int, 8> bloom1;
- bloom_filter<int, 8> bloom2;
-
- for (size_t i = 0; i < 200; ++i) {
- bloom1.insert(i);
- BOOST_CHECK_EQUAL(bloom1.contains(i), true);
- }
-
- bloom2 = bloom1;
-
- for (size_t i = 0; i < 200; ++i) {
- BOOST_CHECK_EQUAL(bloom2.contains(i), true);
- }
-}
-
-BOOST_AUTO_TEST_CASE(size) {
- bloom_filter<size_t, 8> bloom_8;
- bloom_filter<size_t, 256> bloom_256;
- bloom_filter<size_t, 2048> bloom_2048;
-
- BOOST_CHECK_EQUAL(bloom_8.size(), 8ul);
- BOOST_CHECK_EQUAL(bloom_256.size(), 256ul);
- BOOST_CHECK_EQUAL(bloom_2048.size(), 2048ul);
-}
-
-BOOST_AUTO_TEST_CASE(contains) {
- bloom_filter<size_t, 8> bloom;
-
- bloom.insert(1);
- BOOST_CHECK_EQUAL(bloom.contains(1), true);
-}
-
-BOOST_AUTO_TEST_CASE(containsOperator) {
- bloom_filter<size_t, 8> bloom;
-
- bloom.insert(1);
- BOOST_CHECK_EQUAL(bloom.contains(1), true);
-}
-
-BOOST_AUTO_TEST_CASE(doesNotContain) {
- bloom_filter<size_t, 8> bloom;
-
- BOOST_CHECK_EQUAL(bloom.contains(1), false);
-}
-
-BOOST_AUTO_TEST_CASE(insertNoFalseNegatives) {
- bloom_filter<size_t, 2048> bloom;
-
- for (size_t i = 0; i < 100; ++i) {
- bloom.insert(i);
- BOOST_CHECK_EQUAL(bloom.contains(i), true);
- }
-}
-
-BOOST_AUTO_TEST_CASE(clear) {
- bloom_filter<size_t, 8> bloom;
-
- for (size_t i = 0; i < 1000; ++i)
- bloom.insert(i);
-
- bloom.clear();
- BOOST_CHECK_EQUAL(bloom.contains(1), false);
-}
-
-BOOST_AUTO_TEST_CASE(testUnion) {
- bloom_filter<size_t, 32> bloom_1;
- bloom_filter<size_t, 32> bloom_2;
- bloom_filter<size_t, 32> bloom_union;
-
- for (size_t i = 0; i < 100; ++i)
- bloom_1.insert(i);
-
- for (size_t i = 100; i < 200; ++i)
- bloom_2.insert(i);
-
- bloom_union = bloom_1 | bloom_2;
-
- for (size_t i = 0; i < 200; ++i)
- BOOST_CHECK_EQUAL(bloom_union.contains(i), true);
-}
-
-BOOST_AUTO_TEST_CASE(testUnionAssign) {
- bloom_filter<size_t, 32> bloom_1;
- bloom_filter<size_t, 32> bloom_2;
-
- for (size_t i = 0; i < 100; ++i)
- bloom_1.insert(i);
-
- bloom_2 |= bloom_1;
-
- for (size_t i = 0; i < 100; ++i)
- BOOST_CHECK_EQUAL(bloom_2.contains(i), true);
-}
-
-BOOST_AUTO_TEST_CASE(testIntersect) {
- bloom_filter<size_t, 8> bloom_1;
- bloom_filter<size_t, 8> bloom_2;
- bloom_filter<size_t, 8> bloom_intersect;
-
- for (size_t i = 0; i < 100; ++i)
- bloom_1.insert(i);
-
- for (size_t i = 100; i < 200; ++i)
- bloom_2.insert(i);
-
- bloom_intersect = bloom_1 & bloom_2;
-
- for (size_t i = 0; i < 200; ++i)
- BOOST_CHECK_EQUAL(bloom_intersect.contains(i), false);
-}
-
-BOOST_AUTO_TEST_CASE(testIntersectAssign) {
- bloom_filter<size_t, 8> bloom_1;
- bloom_filter<size_t, 8> bloom_2;
-
- for (size_t i = 0; i < 100; ++i)
- bloom_1.insert(i);
-
- bloom_2 &= bloom_1;
-
- for (size_t i = 0; i < 100; ++i)
- BOOST_CHECK_EQUAL(bloom_2.contains(i), false);
-}
-
-BOOST_AUTO_TEST_CASE(collisionBenchmark) {
- typedef boost::mpl::vector<
- OHash <size_t, 2>,
- OHash<size_t, 3>,
- OHash<size_t, 5>,
- OHash<size_t, 7>,
- OHash<size_t, 11>,
- OHash<size_t, 13>,
- OHash<size_t, 17>,
- OHash<size_t, 19>> EightHashFunctions_O;
-
- static const size_t INSERT_VAL = 100;
- static const size_t SEARCH_SPACE = 10000000;
- static const size_t FILTER_SIZE = 64;
- size_t collisions = 0;
- bloom_filter<size_t, FILTER_SIZE, EightHashFunctions_O> bloom;
-
- std::cout << "bloom size " << bloom.size() << std::endl;
- bloom.insert(INSERT_VAL);
- for (size_t i = 0; i < SEARCH_SPACE; ++i) {
- if (bloom[i] && i != INSERT_VAL) ++collisions;
- }
-
- std::cout << collisions << " collisions" << std::endl;
- bloom.clear();
-}
Deleted: sandbox/bloom_filter/trunk/test/makefile
==============================================================================
--- sandbox/bloom_filter/trunk/test/makefile 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,15 +0,0 @@
-CXXFLAGS := -Wall -Wextra -pedantic -std=c++0x -O3 -g
-LD_FLAGS := -lpthread -lboost_unit_test_framework
-INCLUDE_DIR := ../include
-INCLUDES := -I$(INCLUDE_DIR)
-EXES := boost_test
-all : $(EXES)
-
-%.o : %.cpp $(INCLUDE_DIR)/bloom.hpp
- $(CXX) $(CXXFLAGS) -c $< $(INCLUDES)
-
-boost_test : boost_test.o murmurhash3.o
- $(CXX) $(CXXFLAGS) -o $@ $^ $(INCLUDES) $(LD_FLAGS)
-
-clean:
- rm -f *.o $(EXES)
Deleted: sandbox/bloom_filter/trunk/test/murmurhash3.cpp
==============================================================================
--- sandbox/bloom_filter/trunk/test/murmurhash3.cpp 2011-05-27 13:06:49 EDT (Fri, 27 May 2011)
+++ (empty file)
@@ -1,335 +0,0 @@
-//-----------------------------------------------------------------------------
-// MurmurHash3 was written by Austin Appleby, and is placed in the public
-// domain. The author hereby disclaims copyright to this source code.
-
-// Note - The x86 and x64 versions do _not_ produce the same results, as the
-// algorithms are optimized for their respective platforms. You can still
-// compile and run any of them on any platform, but your performance with the
-// non-native version will be less than optimal.
-
-#include <murmurhash3/murmurhash3.h>
-
-//-----------------------------------------------------------------------------
-// Platform-specific functions and macros
-
-// Microsoft Visual Studio
-
-#if defined(_MSC_VER)
-
-#define FORCE_INLINE __forceinline
-
-#include <stdlib.h>
-
-#define ROTL32(x,y) _rotl(x,y)
-#define ROTL64(x,y) _rotl64(x,y)
-
-#define BIG_CONSTANT(x) (x)
-
-// Other compilers
-
-#else // defined(_MSC_VER)
-
-#define FORCE_INLINE __attribute__((always_inline))
-
-inline uint32_t rotl32 ( uint32_t x, int8_t r )
-{
- return (x << r) | (x >> (32 - r));
-}
-
-inline uint64_t rotl64 ( uint64_t x, int8_t r )
-{
- return (x << r) | (x >> (64 - r));
-}
-
-#define ROTL32(x,y) rotl32(x,y)
-#define ROTL64(x,y) rotl64(x,y)
-
-#define BIG_CONSTANT(x) (x##LLU)
-
-#endif // !defined(_MSC_VER)
-
-//-----------------------------------------------------------------------------
-// Block read - if your platform needs to do endian-swapping or can only
-// handle aligned reads, do the conversion here
-
-FORCE_INLINE uint32_t getblock ( const uint32_t * p, int i )
-{
- return p[i];
-}
-
-FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i )
-{
- return p[i];
-}
-
-//-----------------------------------------------------------------------------
-// Finalization mix - force all bits of a hash block to avalanche
-
-FORCE_INLINE uint32_t fmix ( uint32_t h )
-{
- h ^= h >> 16;
- h *= 0x85ebca6b;
- h ^= h >> 13;
- h *= 0xc2b2ae35;
- h ^= h >> 16;
-
- return h;
-}
-
-//----------
-
-FORCE_INLINE uint64_t fmix ( uint64_t k )
-{
- k ^= k >> 33;
- k *= BIG_CONSTANT(0xff51afd7ed558ccd);
- k ^= k >> 33;
- k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
- k ^= k >> 33;
-
- return k;
-}
-
-//-----------------------------------------------------------------------------
-
-void MurmurHash3_x86_32 ( const void * key, int len,
- uint32_t seed, void * out )
-{
- const uint8_t * data = (const uint8_t*)key;
- const int nblocks = len / 4;
-
- uint32_t h1 = seed;
-
- uint32_t c1 = 0xcc9e2d51;
- uint32_t c2 = 0x1b873593;
-
- //----------
- // body
-
- const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
-
- for(int i = -nblocks; i; i++)
- {
- uint32_t k1 = getblock(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*)(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,16); k1 *= c2; h1 ^= k1;
- };
-
- //----------
- // finalization
-
- h1 ^= len;
-
- h1 = fmix(h1);
-
- *(uint32_t*)out = h1;
-}
-
-//-----------------------------------------------------------------------------
-
-void MurmurHash3_x86_128 ( const void * key, const int len,
- uint32_t seed, void * out )
-{
- const uint8_t * data = (const uint8_t*)key;
- const int nblocks = len / 16;
-
- uint32_t h1 = seed;
- uint32_t h2 = seed;
- uint32_t h3 = seed;
- uint32_t h4 = seed;
-
- uint32_t c1 = 0x239b961b;
- uint32_t c2 = 0xab0e9789;
- uint32_t c3 = 0x38b34ae5;
- uint32_t c4 = 0xa1e38b93;
-
- //----------
- // body
-
- const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
-
- for(int i = -nblocks; i; i++)
- {
- uint32_t k1 = getblock(blocks,i*4+0);
- uint32_t k2 = getblock(blocks,i*4+1);
- uint32_t k3 = getblock(blocks,i*4+2);
- uint32_t k4 = getblock(blocks,i*4+3);
-
- k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
-
- h1 = ROTL32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b;
-
- k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
-
- h2 = ROTL32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747;
-
- k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
-
- h3 = ROTL32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35;
-
- k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
-
- h4 = ROTL32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17;
- }
-
- //----------
- // tail
-
- const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
-
- uint32_t k1 = 0;
- uint32_t k2 = 0;
- uint32_t k3 = 0;
- uint32_t k4 = 0;
-
- switch(len & 15)
- {
- case 15: k4 ^= tail[14] << 16;
- case 14: k4 ^= tail[13] << 8;
- case 13: k4 ^= tail[12] << 0;
- k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
-
- case 12: k3 ^= tail[11] << 24;
- case 11: k3 ^= tail[10] << 16;
- case 10: k3 ^= tail[ 9] << 8;
- case 9: k3 ^= tail[ 8] << 0;
- k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
-
- case 8: k2 ^= tail[ 7] << 24;
- case 7: k2 ^= tail[ 6] << 16;
- case 6: k2 ^= tail[ 5] << 8;
- case 5: k2 ^= tail[ 4] << 0;
- k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
-
- case 4: k1 ^= tail[ 3] << 24;
- case 3: k1 ^= tail[ 2] << 16;
- case 2: k1 ^= tail[ 1] << 8;
- case 1: k1 ^= tail[ 0] << 0;
- k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
- };
-
- //----------
- // finalization
-
- h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
-
- h1 += h2; h1 += h3; h1 += h4;
- h2 += h1; h3 += h1; h4 += h1;
-
- h1 = fmix(h1);
- h2 = fmix(h2);
- h3 = fmix(h3);
- h4 = fmix(h4);
-
- h1 += h2; h1 += h3; h1 += h4;
- h2 += h1; h3 += h1; h4 += h1;
-
- ((uint32_t*)out)[0] = h1;
- ((uint32_t*)out)[1] = h2;
- ((uint32_t*)out)[2] = h3;
- ((uint32_t*)out)[3] = h4;
-}
-
-//-----------------------------------------------------------------------------
-
-void MurmurHash3_x64_128 ( const void * key, const int len,
- const uint32_t seed, void * out )
-{
- const uint8_t * data = (const uint8_t*)key;
- const int nblocks = len / 16;
-
- uint64_t h1 = seed;
- uint64_t h2 = seed;
-
- uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
- uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
-
- //----------
- // body
-
- const uint64_t * blocks = (const uint64_t *)(data);
-
- for(int i = 0; i < nblocks; i++)
- {
- uint64_t k1 = getblock(blocks,i*2+0);
- uint64_t k2 = getblock(blocks,i*2+1);
-
- k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
-
- h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
-
- k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
-
- h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
- }
-
- //----------
- // tail
-
- const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
-
- uint64_t k1 = 0;
- uint64_t k2 = 0;
-
- switch(len & 15)
- {
- case 15: k2 ^= uint64_t(tail[14]) << 48;
- case 14: k2 ^= uint64_t(tail[13]) << 40;
- case 13: k2 ^= uint64_t(tail[12]) << 32;
- case 12: k2 ^= uint64_t(tail[11]) << 24;
- case 11: k2 ^= uint64_t(tail[10]) << 16;
- case 10: k2 ^= uint64_t(tail[ 9]) << 8;
- case 9: k2 ^= uint64_t(tail[ 8]) << 0;
- k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
-
- case 8: k1 ^= uint64_t(tail[ 7]) << 56;
- case 7: k1 ^= uint64_t(tail[ 6]) << 48;
- case 6: k1 ^= uint64_t(tail[ 5]) << 40;
- case 5: k1 ^= uint64_t(tail[ 4]) << 32;
- case 4: k1 ^= uint64_t(tail[ 3]) << 24;
- case 3: k1 ^= uint64_t(tail[ 2]) << 16;
- case 2: k1 ^= uint64_t(tail[ 1]) << 8;
- case 1: k1 ^= uint64_t(tail[ 0]) << 0;
- k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
- };
-
- //----------
- // finalization
-
- h1 ^= len; h2 ^= len;
-
- h1 += h2;
- h2 += h1;
-
- h1 = fmix(h1);
- h2 = fmix(h2);
-
- h1 += h2;
- h2 += h1;
-
- ((uint64_t*)out)[0] = h1;
- ((uint64_t*)out)[1] = h2;
-}
-
-//-----------------------------------------------------------------------------
-
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk