projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates for 0.29 release
[awesomized/libmemcached]
/
libmemcached
/
memcached_hash.c
diff --git
a/libmemcached/memcached_hash.c
b/libmemcached/memcached_hash.c
index c7bcb4bed35810cbad3ebbfb22475ddd8f0260ab..e6747db5f7b2de3ba64ae67a658c9e25a60ebba6 100644
(file)
--- a/
libmemcached/memcached_hash.c
+++ b/
libmemcached/memcached_hash.c
@@
-1,5
+1,6
@@
#include "common.h"
#include "common.h"
+
/* Defines */
static uint64_t FNV_64_INIT= 0xcbf29ce484222325LL;
static uint64_t FNV_64_PRIME= 0x100000001b3LL;
/* Defines */
static uint64_t FNV_64_INIT= 0xcbf29ce484222325LL;
static uint64_t FNV_64_PRIME= 0x100000001b3LL;
@@
-76,7
+77,9
@@
uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memca
break;
case MEMCACHED_HASH_HSIEH:
{
break;
case MEMCACHED_HASH_HSIEH:
{
+#ifdef HAVE_HSIEH_HASH
hash= hsieh_hash(key, key_length);
hash= hsieh_hash(key, key_length);
+#endif
break;
}
case MEMCACHED_HASH_MURMUR:
break;
}
case MEMCACHED_HASH_MURMUR:
@@
-177,6
+180,14
@@
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
WATCHPOINT_ASSERT(hash);
WATCHPOINT_ASSERT(hash);
+ if (memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS) && ptr->next_distribution_rebuild) {
+ struct timeval now;
+
+ if (gettimeofday(&now, NULL) == 0 &&
+ now.tv_sec > ptr->next_distribution_rebuild)
+ run_distribution(ptr);
+ }
+
return dispatch_host(ptr, hash);
}
return dispatch_host(ptr, hash);
}