/* Protoypes (static) */
static memcached_return server_add(memcached_st *ptr, const char *hostname,
unsigned int port,
+ uint32_t weight,
memcached_connection type);
memcached_return update_continuum(memcached_st *ptr);
if (ptr->flags & MEM_USE_SORT_HOSTS)
sort_hosts(ptr);
break;
+ case MEMCACHED_DISTRIBUTION_RANDOM:
+ break;
default:
WATCHPOINT_ASSERT(0); /* We have added a distribution without extending the logic */
}
return MEMCACHED_SUCCESS;
}
-void host_reset(memcached_st *ptr, memcached_server_st *host,
- const char *hostname, unsigned int port,
- memcached_connection type)
-{
- memset(host, 0, sizeof(memcached_server_st));
- strncpy(host->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
- host->root= ptr ? ptr : NULL;
- host->port= port;
- host->fd= -1;
- host->type= type;
- host->read_ptr= host->read_buffer;
- if (ptr)
- host->next_retry= ptr->retry_timeout;
- host->sockaddr_inited= MEMCACHED_NOT_ALLOCATED;
-}
-
void server_list_free(memcached_st *ptr, memcached_server_st *servers)
{
unsigned int x;
free(servers);
}
+static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment)
+{
+ unsigned char results[16];
+
+ 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)
+ | (results[0 + alignment * 4] & 0xFF);
+}
+
static int continuum_item_cmp(const void *t1, const void *t2)
{
memcached_continuum_item_st *ct1= (memcached_continuum_item_st *)t1;
memcached_server_st *list;
uint32_t pointer_counter= 0;
uint32_t pointer_per_server= MEMCACHED_POINTS_PER_SERVER;
- memcached_return rc;
- uint64_t total_mem_bytes= 0;
- memcached_stat_st *stat_p= NULL;
+ uint32_t pointer_per_hash= 1;
+ uint64_t total_weight= 0;
uint32_t is_ketama_weighted= 0;
+ uint32_t points_per_server= 0;
+
+ is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
+ points_per_server= is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER;
+
+ if (ptr->number_of_hosts == 0)
+ return MEMCACHED_SUCCESS;
if (ptr->number_of_hosts > ptr->continuum_count)
{
memcached_continuum_item_st *new_ptr;
if (ptr->call_realloc)
- new_ptr= (memcached_continuum_item_st *)ptr->call_realloc(ptr, ptr->continuum, sizeof(memcached_continuum_item_st) * (ptr->number_of_hosts + MEMCACHED_CONTINUUM_ADDITION) * MEMCACHED_POINTS_PER_SERVER);
+ new_ptr= (memcached_continuum_item_st *)ptr->call_realloc(ptr, ptr->continuum,
+ sizeof(memcached_continuum_item_st) * (ptr->number_of_hosts + MEMCACHED_CONTINUUM_ADDITION) * points_per_server);
else
- new_ptr= (memcached_continuum_item_st *)realloc(ptr->continuum, sizeof(memcached_continuum_item_st) * (ptr->number_of_hosts + MEMCACHED_CONTINUUM_ADDITION) * MEMCACHED_POINTS_PER_SERVER);
+ new_ptr= (memcached_continuum_item_st *)realloc(ptr->continuum,
+ sizeof(memcached_continuum_item_st) * (ptr->number_of_hosts + MEMCACHED_CONTINUUM_ADDITION) * points_per_server);
if (new_ptr == 0)
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
list = ptr->hosts;
- is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
- if(is_ketama_weighted)
+ if (is_ketama_weighted)
{
- stat_p = memcached_stat(ptr, NULL, &rc);
for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index)
{
- list[host_index].limit_maxbytes= (stat_p + host_index)->limit_maxbytes;
- total_mem_bytes += (stat_p + host_index)->limit_maxbytes;
+ if (list[host_index].weight == 0)
+ {
+ list[host_index].weight = 1;
+ }
+ total_weight += list[host_index].weight;
}
}
for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index)
{
- if(is_ketama_weighted)
+ if (is_ketama_weighted)
{
- float pct = (float)list[host_index].limit_maxbytes/ (float)total_mem_bytes;
- pointer_per_server= floorf( pct * MEMCACHED_POINTS_PER_SERVER * (float)(ptr->number_of_hosts));
+ float pct = (float)list[host_index].weight / (float)total_weight;
+ pointer_per_server= floorf(pct * MEMCACHED_POINTS_PER_SERVER_KETAMA / 4 * (float)(ptr->number_of_hosts) + 0.0000000001) * 4;
+ pointer_per_hash= 4;
#ifdef HAVE_DEBUG
printf("ketama_weighted:%s|%d|%llu|%u\n",
list[host_index].hostname,
list[host_index].port,
- (unsigned long long)list[host_index].limit_maxbytes,
+ (unsigned long long)list[host_index].weight,
pointer_per_server);
#endif
}
- for(index= 1; index <= pointer_per_server; ++index)
+ for (index= 1; index <= pointer_per_server / pointer_per_hash; ++index)
{
char sort_host[MEMCACHED_MAX_HOST_SORT_LENGTH]= "";
size_t sort_host_length;
- sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, "%s:%d-%d",
- list[host_index].hostname, list[host_index].port, index);
+ if (list[host_index].port == MEMCACHED_DEFAULT_PORT)
+ {
+ sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, "%s-%d",
+ list[host_index].hostname, index - 1);
+
+ }
+ else
+ {
+ sort_host_length= snprintf(sort_host, MEMCACHED_MAX_HOST_SORT_LENGTH, "%s:%d-%d",
+ list[host_index].hostname, list[host_index].port, index - 1);
+ }
WATCHPOINT_ASSERT(sort_host_length);
- value= generate_hash_value(sort_host, sort_host_length, ptr->hash_continuum);
- ptr->continuum[continuum_index].index= host_index;
- ptr->continuum[continuum_index++].value= value;
+
+ if (is_ketama_weighted)
+ {
+ int i;
+ for (i = 0; i < pointer_per_hash; i++)
+ {
+ value= ketama_server_hash(sort_host, sort_host_length, i);
+ 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->hash_continuum);
+ ptr->continuum[continuum_index].index= host_index;
+ ptr->continuum[continuum_index++].value= value;
+ }
}
pointer_counter+= pointer_per_server;
}
WATCHPOINT_ASSERT(ptr);
WATCHPOINT_ASSERT(ptr->continuum);
- WATCHPOINT_ASSERT(ptr->number_of_hosts);
WATCHPOINT_ASSERT(ptr->number_of_hosts * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
ptr->continuum_points_counter= pointer_counter;
qsort(ptr->continuum, ptr->continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp);
- if (stat_p)
- memcached_stat_free(NULL, stat_p);
-
#ifdef HAVE_DEBUG
- for (index= 0; index < ((ptr->number_of_hosts * MEMCACHED_POINTS_PER_SERVER) - 1); index++)
+ for (index= 0; ptr->number_of_hosts && index < ((ptr->number_of_hosts * MEMCACHED_POINTS_PER_SERVER) - 1); index++)
{
WATCHPOINT_ASSERT(ptr->continuum[index].value <= ptr->continuum[index + 1].value);
}
return MEMCACHED_SUCCESS;
count= list[0].count;
-
if (ptr->call_realloc)
new_host_list=
(memcached_server_st *)ptr->call_realloc(ptr, ptr->hosts,
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
ptr->hosts= new_host_list;
-
+
for (x= 0; x < count; x++)
{
WATCHPOINT_ASSERT(list[x].hostname[0] != 0);
- host_reset(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname,
- list[x].port, list[x].type);
+ memcached_server_create(ptr, &ptr->hosts[ptr->number_of_hosts]);
+ /* TODO check return type */
+ (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname,
+ list[x].port, list[x].weight, list[x].type);
ptr->number_of_hosts++;
}
ptr->hosts[0].count= ptr->number_of_hosts;
return run_distribution(ptr);
}
-memcached_return memcached_server_add_unix_socket(memcached_st *ptr, const char *filename)
+memcached_return memcached_server_add_unix_socket(memcached_st *ptr,
+ const char *filename)
+{
+ return memcached_server_add_unix_socket_with_weight(ptr, filename, 0);
+}
+
+memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr,
+ const char *filename,
+ uint32_t weight)
{
if (!filename)
return MEMCACHED_FAILURE;
- return server_add(ptr, filename, 0, MEMCACHED_CONNECTION_UNIX_SOCKET);
+ return server_add(ptr, filename, 0, weight, MEMCACHED_CONNECTION_UNIX_SOCKET);
}
memcached_return memcached_server_add_udp(memcached_st *ptr,
const char *hostname,
unsigned int port)
+{
+ return memcached_server_add_udp_with_weight(ptr, hostname, port, 0);
+}
+
+memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr,
+ const char *hostname,
+ unsigned int port,
+ uint32_t weight)
{
if (!port)
port= MEMCACHED_DEFAULT_PORT;
if (!hostname)
hostname= "localhost";
- return server_add(ptr, hostname, port, MEMCACHED_CONNECTION_UDP);
+ return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_UDP);
}
memcached_return memcached_server_add(memcached_st *ptr,
const char *hostname,
unsigned int port)
+{
+ return memcached_server_add_with_weight(ptr, hostname, port, 0);
+}
+
+memcached_return memcached_server_add_with_weight(memcached_st *ptr,
+ const char *hostname,
+ unsigned int port,
+ uint32_t weight)
{
if (!port)
port= MEMCACHED_DEFAULT_PORT;
if (!hostname)
hostname= "localhost";
- return server_add(ptr, hostname, port, MEMCACHED_CONNECTION_TCP);
+ return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_TCP);
}
static memcached_return server_add(memcached_st *ptr, const char *hostname,
unsigned int port,
+ uint32_t weight,
memcached_connection type)
{
memcached_server_st *new_host_list;
ptr->hosts= new_host_list;
- host_reset(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, type);
+ /* TODO: Check return type */
+ (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, weight, type);
ptr->number_of_hosts++;
ptr->hosts[0].count= ptr->number_of_hosts;
for (x= 0, index= 0; x < ptr->number_of_hosts; x++)
{
- if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH)!=0 || list[x].port != st_ptr->port)
+ if (strncmp(list[x].hostname, st_ptr->hostname, MEMCACHED_MAX_HOST_LENGTH) != 0 || list[x].port != st_ptr->port)
{
- memcpy(list+index, list+x, sizeof(memcached_server_st));
+ if (index != x)
+ memcpy(list+index, list+x, sizeof(memcached_server_st));
index++;
}
}
}
memcached_server_st *memcached_server_list_append(memcached_server_st *ptr,
- const char *hostname, unsigned int port,
+ const char *hostname, unsigned int port,
memcached_return *error)
+{
+ return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error);
+}
+
+memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr,
+ const char *hostname, unsigned int port,
+ uint32_t weight,
+ memcached_return *error)
{
unsigned int count;
memcached_server_st *new_host_list;
return NULL;
}
- host_reset(NULL, &new_host_list[count-1], hostname, port, MEMCACHED_CONNECTION_TCP);
+ /* TODO: Check return type */
+ memcached_server_create_with(NULL, &new_host_list[count-1], hostname, port, weight, MEMCACHED_CONNECTION_TCP);
/* Backwards compatibility hack */
new_host_list[0].count= count;
projects / m6w6 / libmemcached / blobdiff