Merge in changes for ICC fix.

[awesomized/libmemcached] / libmemcached / server.c

diff --git a/libmemcached/server.c b/libmemcached/server.c
index f480750d8679079c5003ce4448c834777da91c6d..0461c3c7a40816710854eaaae384e7c476c97401 100644 (file)
--- 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;
@@ -78,7 +81,8 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc
   return self;
 }
 
-memcached_server_st *memcached_server_create_with(const memcached_st *memc, memcached_server_st *self,
+memcached_server_st *memcached_server_create_with(const memcached_st *memc,
+                                                  memcached_server_write_instance_st self,
                                                   const char *hostname, in_port_t port,
                                                   uint32_t weight, memcached_connection_t type)
 {
@@ -144,24 +148,21 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination,
 
 }
 
-memcached_return_t memcached_server_cursor(memcached_st *ptr,
-                                           memcached_server_fn *callback,
+memcached_return_t memcached_server_cursor(const memcached_st *ptr,
+                                           const memcached_server_fn *callback,
                                            void *context,
                                            uint32_t number_of_callbacks)
 {
-  uint32_t y;
-
-  for (y= 0; y < memcached_server_count(ptr); y++)
+  for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
-    uint32_t x;
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(ptr, y);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(ptr, x);
 
-    for (x= 0; x < number_of_callbacks; x++)
+    for (uint32_t y= 0; y < number_of_callbacks; y++)
     {
       unsigned int iferror;
 
-      iferror= (*callback[x])(ptr, instance, context);
+      iferror= (*callback[y])(ptr, instance, context);
 
       if (iferror)
         continue;
@@ -171,10 +172,13 @@ memcached_return_t memcached_server_cursor(memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
-memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, size_t key_length, memcached_return_t *error)
+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);
@@ -194,17 +198,10 @@ 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, instance);
+  instance= memcached_server_instance_by_position(ptr, server_key);
 
-}
+  return instance;
 
-const char *memcached_server_error(memcached_server_st *ptr)
-{
-  return ptr 
-    ?  ptr->cached_server_error
-    : NULL;
 }
 
 void memcached_server_error_reset(memcached_server_st *ptr)
@@ -212,54 +209,66 @@ void memcached_server_error_reset(memcached_server_st *ptr)
   ptr->cached_server_error[0]= 0;
 }
 
-memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr)
+memcached_server_instance_st memcached_server_get_last_disconnect(const 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)
+void memcached_server_list_free(memcached_server_list_st self)
 {
-  uint32_t x, host_index;
-  memcached_st *root= (memcached_st *)st_ptr->root;
-  memcached_server_st *list;
-
-  if (root == NULL)
-    return MEMCACHED_FAILURE;
+  if (self == NULL)
+    return;
 
-  list= memcached_server_list(root);
+  const memcached_st *root= self->root;
 
-  for (x= 0, host_index= 0; x < memcached_server_count(root); x++)
+  for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
   {
-    if (strncmp(list[x].hostname, st_ptr->hostname, NI_MAXHOST) != 0 || list[x].port != st_ptr->port)
+    if (self[x].address_info)
     {
-      if (host_index != x)
-        memcpy(list+host_index, list+x, sizeof(memcached_server_st));
-      host_index++;
+      freeaddrinfo(self[x].address_info);
+      self[x].address_info= NULL;
     }
   }
-  root->number_of_hosts= host_index;
 
-  if (st_ptr->address_info)
+  if (root)
   {
-    freeaddrinfo(st_ptr->address_info);
-    st_ptr->address_info= NULL;
+    libmemcached_free(root, self);
   }
-  run_distribution(root);
+  else
+  {
+    free(self);
+  }
+}
 
-  return MEMCACHED_SUCCESS;
+uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+{
+  return servers->number_of_hosts= count;
+}
+
+uint32_t memcached_server_count(const memcached_st *self)
+{
+  return self->number_of_hosts;
+}
+
+const char *memcached_server_name(memcached_server_instance_st self)
+{
+  return self->hostname;
+}
+
+in_port_t memcached_server_port(memcached_server_instance_st self)
+{
+  return self->port;
+}
+
+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)
+{
+  return ptr
+    ?  ptr->cached_server_error
+    : NULL;
 }
+