X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.c;h=f480750d8679079c5003ce4448c834777da91c6d;hb=2c51ea585ccfbf3a14fed6d28f9115292ad0e6fc;hp=42abda2dec11563e8254097c6d2e470cc2ab9ea0;hpb=1d8231fc194a56976c5bb14a75ff548ef5440191;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.c b/libmemcached/server.c
index 42abda2d..f480750d 100644
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -14,97 +14,133 @@
 */
 #include "common.h"
 
-memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr)
+static inline void _server_init(memcached_server_st *self, const memcached_st *root,
+                                const char *hostname, in_port_t port,
+                                uint32_t weight, memcached_connection_t type)
 {
-  if (ptr == NULL)
+  self->options.sockaddr_inited= false;
+  self->options.is_shutting_down= false;
+  self->number_of_hosts= 0;
+  self->cursor_active= 0;
+  self->port= port;
+  self->cached_errno= 0;
+  self->fd= -1;
+  self->io_bytes_sent= 0;
+  self->server_failure_counter= 0;
+  self->weight= weight;
+  self->state.is_corked= false;
+  self->major_version= 0;
+  self->micro_version= 0;
+  self->minor_version= 0;
+  self->type= type;
+  self->read_ptr= self->read_buffer;
+  self->cached_server_error= NULL;
+  self->read_buffer_length= 0;
+  self->read_data_length= 0;
+  self->write_buffer_offset= 0;
+  self->address_info= NULL;
+
+  if (root)
   {
-    ptr= (memcached_server_st *)memc->call_calloc(memc, 1, sizeof(memcached_server_st));
+    self->next_retry= root->retry_timeout;
+  }
+  else
+  {
+    self->next_retry= 0;
+  }
+
+  self->root= root;
+  self->limit_maxbytes= 0;
+  if (hostname == NULL)
+    self->hostname[0]= 0;
+  else
+    strncpy(self->hostname, hostname, NI_MAXHOST - 1);
+}
+
+static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
+{
+  if (self == NULL)
+  {
+   self= (memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st));
 
-    if (!ptr)
+    if (! self)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
 
-    ptr->options.is_allocated= true;
+    self->options.is_allocated= true;
   }
   else
   {
-    memset(ptr, 0, sizeof(memcached_server_st));
+    self->options.is_allocated= false;
   }
 
-  ptr->root= memc;
+  self->options.is_initialized= true;
 
-  return ptr;
+  return self;
 }
 
-memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
+memcached_server_st *memcached_server_create_with(const memcached_st *memc, memcached_server_st *self,
                                                   const char *hostname, in_port_t port,
                                                   uint32_t weight, memcached_connection_t type)
 {
-  host= memcached_server_create(memc, host);
+  self= _server_create(self, memc);
 
-  if (host == NULL)
+  if (self == NULL)
     return NULL;
 
-  strncpy(host->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
-  host->root= memc ? memc : NULL;
-  host->port= port;
-  host->weight= weight;
-  host->fd= -1;
-  host->type= type;
-  host->read_ptr= host->read_buffer;
-  if (memc)
-    host->next_retry= memc->retry_timeout;
+  _server_init(self, memc, hostname, port, weight, type);
+
+
   if (type == MEMCACHED_CONNECTION_UDP)
   {
-    host->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
-    memcached_io_init_udp_header(host, 0);
+    self->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
+    memcached_io_init_udp_header(self, 0);
   }
 
-  return host;
+  return self;
 }
 
-void memcached_server_free(memcached_server_st *ptr)
+void memcached_server_free(memcached_server_st *self)
 {
-  memcached_quit_server(ptr, 0);
-
-  if (ptr->cached_server_error)
-    free(ptr->cached_server_error);
+  memcached_quit_server(self, false);
 
-  if (ptr->address_info)
-    freeaddrinfo(ptr->address_info);
+  if (self->cached_server_error)
+    free(self->cached_server_error);
 
+  if (self->address_info)
+    freeaddrinfo(self->address_info);
 
-  if (memcached_is_allocated(ptr))
+  if (memcached_is_allocated(self))
   {
-    ptr->root->call_free(ptr->root, ptr);
+    libmemcached_free(self->root, self);
   }
   else
   {
-    memset(ptr, 0, sizeof(memcached_server_st));
+    self->options.is_initialized= false;
   }
 }
 
 /*
   If we do not have a valid object to clone from, we toss an error.
 */
-memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr)
+memcached_server_st *memcached_server_clone(memcached_server_st *destination,
+                                            const memcached_server_st *source)
 {
-  memcached_server_st *rv= NULL;
-
-  /* We just do a normal create if ptr is missing */
-  if (ptr == NULL)
+  /* We just do a normal create if source is missing */
+  if (source == NULL)
     return NULL;
 
-  rv= memcached_server_create_with(ptr->root, clone,
-                                   ptr->hostname, ptr->port, ptr->weight,
-                                   ptr->type);
-  if (rv != NULL)
+  destination= memcached_server_create_with(source->root, destination,
+                                            source->hostname, source->port, source->weight,
+                                            source->type);
+  if (destination != NULL)
   {
-    rv->cached_errno= ptr->cached_errno;
-    if (ptr->cached_server_error)
-      rv->cached_server_error= strdup(ptr->cached_server_error);
+    destination->cached_errno= source->cached_errno;
+
+    if (source->cached_server_error)
+      destination->cached_server_error= strdup(source->cached_server_error);
   }
 
-  return rv;
+  return destination;
 
 }
 
@@ -113,17 +149,19 @@ memcached_return_t memcached_server_cursor(memcached_st *ptr,
                                            void *context,
                                            uint32_t number_of_callbacks)
 {
-  unsigned int y;
+  uint32_t y;
 
-  for (y= 0; y < ptr->number_of_hosts; y++)
+  for (y= 0; y < memcached_server_count(ptr); y++)
   {
-    unsigned int x;
+    uint32_t x;
+    memcached_server_instance_st *instance=
+      memcached_server_instance_fetch(ptr, y);
 
     for (x= 0; x < number_of_callbacks; x++)
     {
       unsigned int iferror;
 
-      iferror= (*callback[x])(ptr, &ptr->hosts[y], context);
+      iferror= (*callback[x])(ptr, instance, context);
 
       if (iferror)
         continue;
@@ -136,13 +174,14 @@ memcached_return_t memcached_server_cursor(memcached_st *ptr,
 memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, size_t key_length, memcached_return_t *error)
 {
   uint32_t server_key;
+  memcached_server_instance_st *instance;
 
   *error= memcached_validate_key_length(key_length,
                                         ptr->flags.binary_protocol);
   unlikely (*error != MEMCACHED_SUCCESS)
     return NULL;
 
-  unlikely (ptr->number_of_hosts == 0)
+  unlikely (memcached_server_count(ptr) == 0)
   {
     *error= MEMCACHED_NO_SERVERS;
     return NULL;
@@ -155,17 +194,17 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key
   }
 
   server_key= memcached_generate_hash(ptr, key, key_length);
+  instance= memcached_server_instance_fetch(ptr, server_key);
 
-  return memcached_server_clone(NULL, &ptr->hosts[server_key]);
+  return memcached_server_clone(NULL, instance);
 
 }
 
 const char *memcached_server_error(memcached_server_st *ptr)
 {
-  if (ptr)
-    return ptr->cached_server_error;
-  else
-    return NULL;
+  return ptr 
+    ?  ptr->cached_server_error
+    : NULL;
 }
 
 void memcached_server_error_reset(memcached_server_st *ptr)
@@ -177,3 +216,50 @@ memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr)
 {
   return ptr->last_disconnected_server;
 }
+
+uint32_t memcached_server_list_count(memcached_server_st *ptr)
+{
+  return (ptr == NULL)
+    ? 0
+    : memcached_servers_count(ptr);
+}
+
+void memcached_server_list_free(memcached_server_st *ptr)
+{
+  server_list_free(NULL, 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 *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(root); x++)
+  {
+    if (strncmp(list[x].hostname, st_ptr->hostname, NI_MAXHOST) != 0 || list[x].port != st_ptr->port)
+    {
+      if (host_index != x)
+        memcpy(list+host_index, list+x, sizeof(memcached_server_st));
+      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(root);
+
+  return MEMCACHED_SUCCESS;
+}