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);
{
if (memcached_server_count(ptr))
{
- qsort(ptr->hosts, memcached_server_count(ptr), sizeof(memcached_server_st), compare_servers);
- ptr->hosts[0].number_of_hosts= memcached_server_count(ptr);
+ 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);
}
}
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);
}
}
else
+ {
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);
{
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;
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= memcached_servers_count(list);
- new_host_list= ptr->call_realloc(ptr, ptr->hosts,
- sizeof(memcached_server_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;
- 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[memcached_server_count(ptr)]);
+
+ instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
+
/* TODO check return type */
- (void)memcached_server_create_with(ptr, &ptr->hosts[memcached_server_count(ptr)], 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].number_of_hosts= memcached_server_count(ptr);
+
+ // 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= 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;
- 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[memcached_server_count(ptr)], 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++;
- memcached_servers_set_count(&ptr->hosts[0], memcached_server_count(ptr));
+ 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 < memcached_server_count(ptr); 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+= 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;