return MEMCACHED_SUCCESS;
}
-static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment)
+static uint32_t ketama_server_hash(const char *key, unsigned int key_length, uint32_t alignment)
{
unsigned char results[16];
- md5_signature((unsigned char*)key, key_length, results);
+ libhashkit_md5_signature((unsigned char*)key, key_length, results);
+
return ((uint32_t) (results[3 + alignment * 4] & 0xFF) << 24)
| ((uint32_t) (results[2 + alignment * 4] & 0xFF) << 16)
| ((uint32_t) (results[1 + alignment * 4] & 0xFF) << 8)
{
memcached_continuum_item_st *new_ptr;
- new_ptr= ptr->call_realloc(ptr, ptr->continuum,
- sizeof(memcached_continuum_item_st) * (live_servers + MEMCACHED_CONTINUUM_ADDITION) * points_per_server);
+ new_ptr= libmemcached_realloc(ptr, ptr->continuum,
+ sizeof(memcached_continuum_item_st) * (live_servers + MEMCACHED_CONTINUUM_ADDITION) * points_per_server);
if (new_ptr == 0)
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
if (is_ketama_weighted)
{
- unsigned int i;
- for (i = 0; i < pointer_per_hash; i++)
+ for (uint32_t x = 0; x < pointer_per_hash; x++)
{
- value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+ value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, x);
ptr->continuum[continuum_index].index= host_index;
ptr->continuum[continuum_index++].value= value;
}
}
else
{
- value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->distribution_hash);
+ value= hashkit_digest(&ptr->distribution_hashkit, sort_host, sort_host_length);
ptr->continuum[continuum_index].index= host_index;
ptr->continuum[continuum_index++].value= value;
}
if (is_ketama_weighted)
{
- unsigned int i;
- for (i = 0; i < pointer_per_hash; i++)
+ for (uint32_t x = 0; x < pointer_per_hash; x++)
{
- value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) i);
+ value= ketama_server_hash(sort_host, (uint32_t) sort_host_length, (int) x);
ptr->continuum[continuum_index].index= host_index;
ptr->continuum[continuum_index++].value= value;
}
}
else
{
- value= memcached_generate_hash_value(sort_host, sort_host_length, ptr->distribution_hash);
+ value= hashkit_digest(&ptr->distribution_hashkit, sort_host, sort_host_length);
ptr->continuum[continuum_index].index= host_index;
ptr->continuum[continuum_index++].value= value;
}
memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list)
{
- uint32_t x;
uint32_t count;
memcached_server_st *new_host_list;
return MEMCACHED_SUCCESS;
count= memcached_servers_count(list);
- new_host_list= ptr->call_realloc(ptr, memcached_server_list(ptr),
- sizeof(memcached_server_instance_st) * (count + memcached_server_count(ptr)));
+ new_host_list= libmemcached_realloc(ptr, memcached_server_list(ptr),
+ sizeof(memcached_server_instance_st) * (count + memcached_server_count(ptr)));
if (! new_host_list)
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
memcached_server_list_set(ptr, new_host_list);
- for (x= 0; x < count; x++)
+ for (uint32_t x= 0; x < count; x++)
{
memcached_server_instance_st *instance;
instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
- memcached_server_create(ptr, instance);
/* TODO check return type */
(void)memcached_server_create_with(ptr, instance, list[x].hostname,
list[x].port, list[x].weight, list[x].type);
|| ( (type == MEMCACHED_CONNECTION_UDP) && (! ptr->flags.use_udp) ) )
return MEMCACHED_INVALID_HOST_PROTOCOL;
- new_host_list= ptr->call_realloc(ptr, memcached_server_list(ptr),
- sizeof(memcached_server_instance_st) * (ptr->number_of_hosts + 1));
+ new_host_list= libmemcached_realloc(ptr, memcached_server_list(ptr),
+ sizeof(memcached_server_instance_st) * (ptr->number_of_hosts + 1));
if (new_host_list == NULL)
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return run_distribution(ptr);
}
+/**
+ @todo allow lists to query themselves even if they lack a root
+*/
memcached_return_t memcached_server_remove(memcached_server_st *st_ptr)
{
uint32_t x, host_index;
- memcached_st *ptr= st_ptr->root;
- memcached_server_st *list= memcached_server_list(ptr);
+ memcached_st *root= (memcached_st *)st_ptr->root;
+ memcached_server_st *list;
+
+ if (root == NULL)
+ return MEMCACHED_FAILURE;
+
+ list= memcached_server_list(root);
- for (x= 0, host_index= 0; x < memcached_server_count(ptr); x++)
+ for (x= 0, host_index= 0; x < memcached_server_count(root); x++)
{
if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port)
{
host_index++;
}
}
- ptr->number_of_hosts= host_index;
+ root->number_of_hosts= host_index;
if (st_ptr->address_info)
{
freeaddrinfo(st_ptr->address_info);
st_ptr->address_info= NULL;
}
- run_distribution(ptr);
+ run_distribution(root);
return MEMCACHED_SUCCESS;
}