static int compare_servers(const void *p1, const void *p2)
{
int return_value;
- memcached_server_st *a= (memcached_server_st *)p1;
- memcached_server_st *b= (memcached_server_st *)p2;
+ memcached_server_instance_st *a= (memcached_server_instance_st *)p1;
+ memcached_server_instance_st *b= (memcached_server_instance_st *)p2;
return_value= strcmp(a->hostname, b->hostname);
static void sort_hosts(memcached_st *ptr)
{
- if (ptr->number_of_hosts)
+ if (memcached_server_count(ptr))
{
- qsort(ptr->hosts, ptr->number_of_hosts, sizeof(memcached_server_st), compare_servers);
- ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+ memcached_server_instance_st *instance;
+
+ qsort(memcached_server_list(ptr), memcached_server_count(ptr), sizeof(memcached_server_instance_st), compare_servers);
+ instance= memcached_server_instance_fetch(ptr, 0);
+ instance->number_of_hosts= memcached_server_count(ptr);
}
}
return MEMCACHED_SUCCESS;
}
-void server_list_free(memcached_st *ptr, memcached_server_st *servers)
-{
- unsigned int x;
-
- if (servers == NULL)
- return;
-
- for (x= 0; x < servers->count; x++)
- if (servers[x].address_info)
- {
- freeaddrinfo(servers[x].address_info);
- servers[x].address_info= NULL;
- }
-
- if (ptr)
- ptr->call_free(ptr, servers);
- else
- free(servers);
-}
-
static uint32_t ketama_server_hash(const char *key, unsigned int key_length, int alignment)
{
unsigned char results[16];
uint32_t host_index;
uint32_t continuum_index= 0;
uint32_t value;
- memcached_server_st *list;
+ memcached_server_instance_st *list;
uint32_t pointer_index;
uint32_t pointer_counter= 0;
uint32_t pointer_per_server= MEMCACHED_POINTS_PER_SERVER;
return MEMCACHED_ERRNO;
}
- list = ptr->hosts;
+ list = memcached_server_list(ptr);
/* count live servers (those without a retry delay set) */
is_auto_ejecting= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS);
{
live_servers= 0;
ptr->next_distribution_rebuild= 0;
- for (host_index= 0; host_index < ptr->number_of_hosts; ++host_index)
+ for (host_index= 0; host_index < memcached_server_count(ptr); ++host_index)
{
if (list[host_index].next_retry <= now.tv_sec)
live_servers++;
}
}
else
- live_servers= ptr->number_of_hosts;
+ {
+ live_servers= memcached_server_count(ptr);
+ }
is_ketama_weighted= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
points_per_server= (uint32_t) (is_ketama_weighted ? MEMCACHED_POINTS_PER_SERVER_KETAMA : MEMCACHED_POINTS_PER_SERVER);
if (is_ketama_weighted)
{
- for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index)
+ for (host_index = 0; host_index < memcached_server_count(ptr); ++host_index)
{
if (list[host_index].weight == 0)
{
}
}
- for (host_index = 0; host_index < ptr->number_of_hosts; ++host_index)
+ for (host_index = 0; host_index < memcached_server_count(ptr); ++host_index)
{
if (is_auto_ejecting && list[host_index].next_retry > now.tv_sec)
continue;
WATCHPOINT_ASSERT(ptr);
WATCHPOINT_ASSERT(ptr->continuum);
- WATCHPOINT_ASSERT(ptr->number_of_hosts * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
+ WATCHPOINT_ASSERT(memcached_server_count(ptr) * 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);
#ifdef DEBUG
- for (pointer_index= 0; ptr->number_of_hosts && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++)
+ for (pointer_index= 0; memcached_server_count(ptr) && pointer_index < ((live_servers * MEMCACHED_POINTS_PER_SERVER) - 1); pointer_index++)
{
WATCHPOINT_ASSERT(ptr->continuum[pointer_index].value <= ptr->continuum[pointer_index + 1].value);
}
memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list)
{
- unsigned int x;
- uint16_t count;
+ uint32_t count;
memcached_server_st *new_host_list;
- if (!list)
+ if (! list)
return MEMCACHED_SUCCESS;
- count= list[0].count;
- new_host_list= ptr->call_realloc(ptr, ptr->hosts,
- sizeof(memcached_server_st) * (count + ptr->number_of_hosts));
+ 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)));
if (! new_host_list)
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
- ptr->hosts= new_host_list;
+ 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;
+
if ((ptr->flags.use_udp && list[x].type != MEMCACHED_CONNECTION_UDP)
|| ((list[x].type == MEMCACHED_CONNECTION_UDP)
&& ! (ptr->flags.use_udp)) )
return MEMCACHED_INVALID_HOST_PROTOCOL;
WATCHPOINT_ASSERT(list[x].hostname[0] != 0);
- memcached_server_create(ptr, &ptr->hosts[ptr->number_of_hosts]);
+
+ instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
+
/* TODO check return type */
- (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], list[x].hostname,
+ (void)memcached_server_create_with(ptr, instance, list[x].hostname,
list[x].port, list[x].weight, list[x].type);
ptr->number_of_hosts++;
}
- ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+
+ // Provides backwards compatibility with server list.
+ {
+ memcached_server_instance_st *instance;
+ instance= memcached_server_instance_fetch(ptr, 0);
+ instance->number_of_hosts= memcached_server_count(ptr);
+ }
return run_distribution(ptr);
}
const char *filename,
uint32_t weight)
{
- if (!filename)
+ if (! filename)
return MEMCACHED_FAILURE;
return server_add(ptr, filename, 0, weight, MEMCACHED_CONNECTION_UNIX_SOCKET);
in_port_t port,
uint32_t weight)
{
- if (!port)
+ if (! port)
port= MEMCACHED_DEFAULT_PORT;
- if (!hostname)
+ if (! hostname)
hostname= "localhost";
return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_UDP);
in_port_t port,
uint32_t weight)
{
- if (!port)
+ if (! port)
port= MEMCACHED_DEFAULT_PORT;
- if (!hostname)
+ if (! hostname)
hostname= "localhost";
return server_add(ptr, hostname, port, weight, MEMCACHED_CONNECTION_TCP);
uint32_t weight,
memcached_connection_t type)
{
- memcached_server_st *new_host_list;
+ memcached_server_instance_st *new_host_list;
+ memcached_server_instance_st *instance;
if ( (ptr->flags.use_udp && type != MEMCACHED_CONNECTION_UDP)
|| ( (type == MEMCACHED_CONNECTION_UDP) && (! ptr->flags.use_udp) ) )
return MEMCACHED_INVALID_HOST_PROTOCOL;
- new_host_list= ptr->call_realloc(ptr, ptr->hosts,
- sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
+ new_host_list= ptr->call_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;
- ptr->hosts= new_host_list;
+ memcached_server_list_set(ptr, new_host_list);
/* TODO: Check return type */
- (void)memcached_server_create_with(ptr, &ptr->hosts[ptr->number_of_hosts], hostname, port, weight, type);
+ instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
+ (void)memcached_server_create_with(ptr, instance, hostname, port, weight, type);
ptr->number_of_hosts++;
- ptr->hosts[0].count= (uint16_t) ptr->number_of_hosts;
+
+ instance= memcached_server_instance_fetch(ptr, 0);
+ memcached_servers_set_count(instance, memcached_server_count(ptr));
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= ptr->hosts;
+ memcached_st *root= (memcached_st *)st_ptr->root;
+ memcached_server_st *list;
- for (x= 0, host_index= 0; x < ptr->number_of_hosts; x++)
+ if (root == NULL)
+ return MEMCACHED_FAILURE;
+
+ list= memcached_server_list(root);
+
+ 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;
}
memcached_return_t *error)
{
unsigned int count;
- memcached_server_st *new_host_list;
+ memcached_server_instance_st *new_host_list;
if (hostname == NULL || error == NULL)
return NULL;
- if (!port)
+ if (! port)
port= MEMCACHED_DEFAULT_PORT;
/* Increment count for hosts */
count= 1;
if (ptr != NULL)
{
- count+= ptr[0].count;
+ count+= memcached_servers_count(ptr);
}
- new_host_list= (memcached_server_st *)realloc(ptr, sizeof(memcached_server_st) * count);
+ new_host_list= (memcached_server_instance_st *)realloc(ptr, sizeof(memcached_server_instance_st) * count);
if (!new_host_list)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
memcached_server_create_with(NULL, &new_host_list[count-1], hostname, port, weight, MEMCACHED_CONNECTION_TCP);
/* Backwards compatibility hack */
- new_host_list[0].count= (uint16_t) count;
+ memcached_servers_set_count(new_host_list, count);
*error= MEMCACHED_SUCCESS;
return new_host_list;
}
-
-unsigned int memcached_server_list_count(memcached_server_st *ptr)
-{
- if (ptr == NULL)
- return 0;
-
- return ptr[0].count;
-}
-
-void memcached_server_list_free(memcached_server_st *ptr)
-{
- server_list_free(NULL, ptr);
-}
projects / awesomized / libmemcached / blobdiff