projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
pandora-build v0.46 - fixed a plugin system problem when it's not in use.
[awesomized/libmemcached]
/
libmemcached
/
memcached_hash.c
diff --git
a/libmemcached/memcached_hash.c
b/libmemcached/memcached_hash.c
index d2af51653be0e815511addc738d15f51aab22cf5..4956d18e0655e784bbb4e7a4b3c0200d4552bb77 100644
(file)
--- a/
libmemcached/memcached_hash.c
+++ b/
libmemcached/memcached_hash.c
@@
-1,8
+1,9
@@
#include "common.h"
#include "common.h"
+
/* Defines */
/* Defines */
-static uint64_t FNV_64_INIT=
0xcbf29ce484222325LL
;
-static uint64_t FNV_64_PRIME=
0x100000001b3LL
;
+static uint64_t FNV_64_INIT=
UINT64_C(0xcbf29ce484222325)
;
+static uint64_t FNV_64_PRIME=
UINT64_C(0x100000001b3)
;
static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
@@
-46,11
+47,11
@@
uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memca
break;
case MEMCACHED_HASH_FNV1A_64:
{
break;
case MEMCACHED_HASH_FNV1A_64:
{
- hash= FNV_64_INIT;
+ hash=
(uint32_t)
FNV_64_INIT;
for (x= 0; x < key_length; x++)
{
hash ^= key[x];
for (x= 0; x < key_length; x++)
{
hash ^= key[x];
- hash *= FNV_64_PRIME;
+ hash *=
(uint32_t)
FNV_64_PRIME;
}
}
break;
}
}
break;
@@
-74,13
+75,13
@@
uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memca
}
}
break;
}
}
break;
-#ifdef HAVE_HSIEH_HASH
case MEMCACHED_HASH_HSIEH:
{
case MEMCACHED_HASH_HSIEH:
{
+#ifdef HAVE_HSIEH_HASH
hash= hsieh_hash(key, key_length);
hash= hsieh_hash(key, key_length);
+#endif
break;
}
break;
}
-#endif
case MEMCACHED_HASH_MURMUR:
{
hash= murmur_hash(key, key_length);
case MEMCACHED_HASH_MURMUR:
{
hash= murmur_hash(key, key_length);
@@
-91,6
+92,11
@@
uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memca
hash=jenkins_hash(key, key_length, 13);
break;
}
hash=jenkins_hash(key, key_length, 13);
break;
}
+ default:
+ {
+ WATCHPOINT_ASSERT(hash_algorithm);
+ break;
+ }
}
return hash;
}
}
return hash;
}
@@
-137,11
+143,10
@@
static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
right= begin;
return right->index;
}
right= begin;
return right->index;
}
- break;
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
case MEMCACHED_DISTRIBUTION_MODULA:
return hash % ptr->number_of_hosts;
case MEMCACHED_DISTRIBUTION_RANDOM:
- return random() % ptr->number_of_hosts;
+ return
(uint32_t)
random() % ptr->number_of_hosts;
default:
WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
return hash % ptr->number_of_hosts;
default:
WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
return hash % ptr->number_of_hosts;
@@
-165,12
+170,15
@@
uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
if (ptr->flags & MEM_HASH_WITH_PREFIX_KEY)
{
if (ptr->flags & MEM_HASH_WITH_PREFIX_KEY)
{
- int temp_len= ptr->prefix_key_length + key_length;
- char *temp= (char *)malloc(temp_len);
+ size_t temp_length= ptr->prefix_key_length + key_length;
+ char temp[temp_length];
+
+ if (temp_length > MEMCACHED_MAX_KEY -1)
+ return 0;
+
strncpy(temp, ptr->prefix_key, ptr->prefix_key_length);
strncpy(temp + ptr->prefix_key_length, key, key_length);
strncpy(temp, ptr->prefix_key, ptr->prefix_key_length);
strncpy(temp + ptr->prefix_key_length, key, key_length);
- hash= generate_hash(ptr, temp, temp_len);
- free(temp);
+ hash= generate_hash(ptr, temp, temp_length);
}
else
{
}
else
{
@@
-179,6
+187,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);
}
@@
-189,7
+205,7
@@
static uint32_t internal_generate_hash(const char *key, size_t key_length)
while (key_length--)
{
while (key_length--)
{
- value += *ptr++;
+ value +=
(uint32_t)
*ptr++;
value += (value << 10);
value ^= (value >> 6);
}
value += (value << 10);
value ^= (value >> 6);
}
@@
-197,7
+213,7
@@
static uint32_t internal_generate_hash(const char *key, size_t key_length)
value ^= (value >> 11);
value += (value << 15);
value ^= (value >> 11);
value += (value << 15);
- return value == 0 ? 1 : value;
+ return value == 0 ? 1 :
(uint32_t)
value;
}
static uint32_t internal_generate_md5(const char *key, size_t key_length)
}
static uint32_t internal_generate_md5(const char *key, size_t key_length)