X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.c;h=0461c3c7a40816710854eaaae384e7c476c97401;hb=b539fd56a235cfbbdd12ebc64c66686b518573d0;hp=ee9d857569075e4c4e9402f4eb652a882e8b807a;hpb=c29c787187baac1f403668a5dbf8ba481b9a8c8e;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.c b/libmemcached/server.c
index ee9d8575..0461c3c7 100644
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -29,6 +29,9 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
   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;
@@ -211,92 +214,53 @@ memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
   return ptr->last_disconnected_server;
 }
 
-inline uint32_t memcached_server_list_count(const memcached_server_st *self)
+void memcached_server_list_free(memcached_server_list_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)
-{
-  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;
 }