Use TCP_CORK/TCP_NOFLUSH socket options where available to coalesce writes for multi...

[awesomized/libmemcached] / libmemcached / murmur_hash.c

diff --git a/libmemcached/murmur_hash.c b/libmemcached/murmur_hash.c
index abb2deda3e5340f68cc04e7dc4b6dd8f4da8b930..f1c3267c53844ee903889d913fba3e0f8b95797d 100644 (file)
--- a/libmemcached/murmur_hash.c
+++ b/libmemcached/murmur_hash.c
@@ -1,48 +1,76 @@
-#include "common.h"\r
-\r
-/* \r
-  "Murmur"hash provided by Austin, tanjent@gmail.com\r
-#define MURMUR_POSTMIX\r
-*/\r
-\r
-uint32_t murmur_hash(char *key, size_t length)\r
-{\r
-  const unsigned int m= 0x7fd652ad;\r
-  const int r= 16;\r
-\r
-  uint32_t h= 0xdeadbeef;\r
-\r
-  while(length >= 4)\r
-  {\r
-    h += *(unsigned int *)key;\r
-    h *= m;\r
-    h ^= h >> r;\r
-\r
-    key += 4;\r
-    length -= 4;\r
-  }\r
-\r
-  switch(length)\r
-  {\r
-  case 3:\r
-    h += key[2] << 16;\r
-  case 2:\r
-    h += key[1] << 8;\r
-  case 1:\r
-  default:\r
-    h += key[0];\r
-    h *= m;\r
-    h ^= h >> r;\r
-  };\r
-\r
-#ifdef MURMUR_POSTMIX\r
-\r
-  h *= m;\r
-  h ^= h >> 10;\r
-  h *= m;\r
-  h ^= h >> 17;\r
-\r
-#endif\r
-\r
-  return h;\r
-}\r
+/* 
+  "Murmur" hash provided by Austin, tanjent@gmail.com
+  http://murmurhash.googlepages.com/
+
+  Note - This code makes a few assumptions about how your machine behaves -
+
+  1. We can read a 4-byte value from any address without crashing
+  2. sizeof(int) == 4
+
+  And it has a few limitations -
+  1. It will not work incrementally.
+  2. It will not produce the same results on little-endian and big-endian
+  machines.
+
+  Updated to murmur2 hash - BP
+*/
+
+#include "common.h"
+
+uint32_t murmur_hash(const char *key, size_t length)
+{
+  /* 
+    'm' and 'r' are mixing constants generated offline.  They're not
+    really 'magic', they just happen to work well.
+  */
+
+  const unsigned int m= 0x5bd1e995;
+  const uint32_t seed= (0xdeadbeef * (uint32_t)length);
+  const int r= 24;
+
+
+  // Initialize the hash to a 'random' value
+
+  uint32_t h= seed ^ (uint32_t)length;
+
+  // Mix 4 bytes at a time into the hash
+
+  const unsigned char * data= (const unsigned char *)key;
+
+  while(length >= 4)
+  {
+    unsigned int k = *(unsigned int *)data;
+
+    k *= m; 
+    k ^= k >> r; 
+    k *= m; 
+
+    h *= m; 
+    h ^= k;
+
+    data += 4;
+    length -= 4;
+  }
+
+  // Handle the last few bytes of the input array
+
+  switch(length)
+  {
+  case 3: h ^= ((uint32_t)data[2]) << 16;
+  case 2: h ^= ((uint32_t)data[1]) << 8;
+  case 1: h ^= data[0];
+          h *= m;
+  default: break;
+  };
+
+  /* 
+    Do a few final mixes of the hash to ensure the last few bytes are
+    well-incorporated.  
+  */
+
+  h ^= h >> 13;
+  h *= m;
+  h ^= h >> 15;
+
+  return (uint32_t) h;
+}