diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:55:34 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-14 19:55:34 +0000 |
commit | e722ad99d5b0e6a9bb0249ff3d9c8cce28d3204e (patch) | |
tree | 704a4bf758367e8c8b7100dd0cb2c5e8dd26c6b9 /string.c | |
parent | a48f90b05b654cc98727a91c5fd9952c5a86221c (diff) | |
download | ruby-e722ad99d5b0e6a9bb0249ff3d9c8cce28d3204e.tar.gz |
* string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784]
* complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash),
string.c (rb_str_hsah), object.c (rb_obj_hash), range.c
(range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash),
rational.c (nurat_hash): use Murmurhash. [ruby-dev:37784]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 58 |
1 files changed, 55 insertions, 3 deletions
@@ -1912,6 +1912,7 @@ murmur(unsigned int h, unsigned int k, int r) #endif return h; } +#define murmur16(h) murmur_step(h, 16) static inline unsigned int murmur_finish(unsigned int h) @@ -2053,8 +2054,53 @@ hash(const unsigned char * data, int len, unsigned int h) return murmur_finish(h); } -int -rb_memhash(const void *ptr, long len) +unsigned int +rb_hash_uint32(unsigned int h, unsigned int i) +{ + return murmur_step(h + i, 16); +} + +unsigned int +rb_hash_uint(unsigned int h, unsigned int i) +{ + unsigned int v = 0; + h += i; +#ifdef WORDS_BIGENDIAN +#if SIZEOF_INT*CHAR_BIT > 12*8 + v = murmur16(v + (h >> 12*8)); +#endif +#if SIZEOF_INT*CHAR_BIT > 8*8 + v = murmur16(v + (h >> 8*8)); +#endif +#if SIZEOF_INT*CHAR_BIT > 4*8 + v = murmur16(v + (h >> 4*8)); +#endif +#endif + v = murmur16(v + h); +#ifndef WORDS_BIGENDIAN +#if SIZEOF_INT*CHAR_BIT > 4*8 + v = murmur16(v + (h >> 4*8)); +#endif +#if SIZEOF_INT*CHAR_BIT > 8*8 + v = murmur16(v + (h >> 8*8)); +#endif +#if SIZEOF_INT*CHAR_BIT > 12*8 + v = murmur16(v + (h >> 12*8)); +#endif +#endif + return v; +} + +unsigned int +rb_hash_end(unsigned int h) +{ + h = murmur_step(h, 10); + h = murmur_step(h, 17); + return h; +} + +unsigned int +rb_hash_start(unsigned int h) { static int hashseed_init = 0; static unsigned int hashseed; @@ -2064,7 +2110,13 @@ rb_memhash(const void *ptr, long len) hashseed_init = 1; } - return hash(ptr, len, hashseed); + return hashseed + h; +} + +int +rb_memhash(const void *ptr, long len) +{ + return hash(ptr, len, rb_hash_start(0)); } int |