self->server_failure_counter= 0;
self->weight= weight;
self->state.is_corked= false;
+ self->state.is_dead= false;
+ WATCHPOINT_SET(self->io_wait_count.read= 0);
+ WATCHPOINT_SET(self->io_wait_count.write= 0);
self->major_version= 0;
self->micro_version= 0;
self->minor_version= 0;
{
for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
{
- memcached_server_instance_st *instance=
+ memcached_server_instance_st instance=
memcached_server_instance_by_position(ptr, x);
for (uint32_t y= 0; y < number_of_callbacks; y++)
return MEMCACHED_SUCCESS;
}
-memcached_server_instance_st *memcached_server_by_key(const memcached_st *ptr,
- const char *key,
- size_t key_length,
- memcached_return_t *error)
+memcached_return_t memcached_server_execute(memcached_st *ptr,
+ memcached_server_execute_fn callback,
+ void *context)
+{
+ for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
+ {
+ memcached_server_write_instance_st instance=
+ memcached_server_instance_fetch(ptr, x);
+
+ unsigned int iferror;
+
+ iferror= (*callback)(ptr, instance, context);
+
+ if (iferror)
+ continue;
+ }
+
+ return MEMCACHED_SUCCESS;
+}
+
+memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr,
+ const char *key,
+ size_t key_length,
+ memcached_return_t *error)
{
uint32_t server_key;
- memcached_server_instance_st *instance;
+ memcached_server_instance_st instance;
*error= memcached_validate_key_length(key_length,
ptr->flags.binary_protocol);
ptr->cached_server_error[0]= 0;
}
-memcached_server_instance_st *memcached_server_get_last_disconnect(const memcached_st *ptr)
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr)
{
return ptr->last_disconnected_server;
}
-inline uint32_t memcached_server_list_count(const memcached_server_st *self)
-{
- return (self == NULL)
- ? 0
- : self->number_of_hosts;
-}
-
-void memcached_server_list_free(memcached_server_st *self)
-{
- server_list_free(NULL, self);
-}
-
-/**
- @todo allow lists to query themselves even if they lack a root
-*/
-memcached_return_t memcached_server_remove(memcached_server_st *self)
+void memcached_server_list_free(memcached_server_list_st self)
{
- uint32_t host_index= 0;
- memcached_st *root= (memcached_st *)self->root;
- memcached_server_st *list;
-
- if (root == NULL)
- return MEMCACHED_FAILURE;
-
- list= memcached_server_list(root);
+ if (self == NULL)
+ return;
- /* Until we devise a way to mark servers that are about to be harvested, we need to shutdown before doing the clone. */
- memcached_quit(root);
+ const memcached_st *root= self->root;
- for (uint32_t x= 0; x < memcached_server_count(root); x++)
+ for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
{
- if (strncmp(list[x].hostname, self->hostname, NI_MAXHOST) != 0 || list[x].port != self->port)
+ if (self[x].address_info)
{
- if (host_index != x)
- {
- memcached_server_st *check=
- memcached_server_clone(list+host_index, list+x);
-
- if (! check) // Now we are in trouble, allocation didn't happen and we are midway through an operation. Bail!
- {
- return MEMCACHED_FAILURE;
- }
- memcached_server_free(list+x);
- }
- host_index++;
+ freeaddrinfo(self[x].address_info);
+ self[x].address_info= NULL;
}
}
- root->number_of_hosts= host_index;
- run_distribution(root);
-
- return MEMCACHED_SUCCESS;
+ if (root)
+ {
+ libmemcached_free(root, self);
+ }
+ else
+ {
+ free(self);
+ }
}
-
-inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
{
return servers->number_of_hosts= count;
}
-inline uint32_t memcached_server_count(const memcached_st *self)
+uint32_t memcached_server_count(const memcached_st *self)
{
return self->number_of_hosts;
}
-inline const char *memcached_server_name(memcached_server_instance_st *self)
+const char *memcached_server_name(memcached_server_instance_st self)
{
return self->hostname;
}
-inline in_port_t memcached_server_port(memcached_server_instance_st *self)
+in_port_t memcached_server_port(memcached_server_instance_st self)
{
return self->port;
}
-inline memcached_server_st *memcached_server_list(memcached_st *self)
-{
- return self->servers;
-}
-
-inline void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
-{
- self->servers= list;
-}
-
-inline uint32_t memcached_server_response_count(memcached_server_instance_st *self)
+uint32_t memcached_server_response_count(memcached_server_instance_st self)
{
return self->cursor_active;
}
-const char *memcached_server_error(memcached_server_instance_st *ptr)
+const char *memcached_server_error(memcached_server_instance_st ptr)
{
return ptr
? ptr->cached_server_error