X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.cc;h=bde53c7e4c68954f3bd6081d81a8ebdeb1ece3f9;hb=ad94287c37250fcb1f7881705f0effb37bae7da5;hp=cb0f0c2f65bdaeeaf5436f460ef98c523499ac0c;hpb=f0b9c972a973d997db6660680938dd5acb2baa46;p=m6w6%2Flibmemcached

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index cb0f0c2f..bde53c7e 100644
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -39,7 +39,6 @@
   This is a partial implementation for fetching/creating memcached_server_st objects.
 */
 #include <libmemcached/common.h>
-#include <cassert>
 
 static inline void _server_init(memcached_server_st *self, memcached_st *root,
                                 const char *hostname, in_port_t port,
@@ -50,7 +49,6 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   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;
@@ -61,14 +59,16 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->micro_version= UINT8_MAX;
   self->minor_version= UINT8_MAX;
   self->type= type;
+  self->error_messages= NULL;
   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;
   self->address_info_next= NULL;
 
+  self->state= MEMCACHED_SERVER_STATE_NEW;
+
   if (root)
   {
     self->next_retry= root->retry_timeout;
@@ -80,13 +80,13 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
 
   self->root= root;
   self->limit_maxbytes= 0;
-  if (hostname == NULL)
+  if (hostname)
   {
-    self->hostname[0]= 0;
+    strncpy(self->hostname, hostname, NI_MAXHOST - 1);
   }
   else
   {
-    strncpy(self->hostname, hostname, NI_MAXHOST - 1);
+    self->hostname[0]= 0;
   }
 }
 
@@ -111,15 +111,17 @@ 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_write_instance_st self,
-                                                  const char *hostname, in_port_t port,
-                                                  uint32_t weight, memcached_connection_t type)
+memcached_server_st *__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)
 {
   self= _server_create(self, memc);
 
   if (not self)
+  {
     return NULL;
+  }
 
   _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
@@ -133,27 +135,21 @@ memcached_server_st *memcached_server_create_with(const memcached_st *memc,
   return self;
 }
 
-void memcached_server_free(memcached_server_st *self)
+void __server_free(memcached_server_st *self)
 {
-  assert(self);
   memcached_quit_server(self, false);
 
-  if (self->cached_server_error)
-    free(self->cached_server_error);
-
   if (self->address_info)
+  {
     freeaddrinfo(self->address_info);
+    self->address_info= NULL;
+  }
+
+  memcached_error_free(*self);
 
   if (memcached_is_allocated(self))
   {
-    if (self->root)
-    {
-      libmemcached_free(self->root, self);
-    }
-    else
-    {
-      free(self);
-    }
+    libmemcached_free(self->root, self);
   }
   else
   {
@@ -161,6 +157,20 @@ void memcached_server_free(memcached_server_st *self)
   }
 }
 
+void memcached_server_free(memcached_server_st *self)
+{
+  if (not self)
+    return;
+
+  if (memcached_server_list_count(self))
+  {
+    memcached_server_list_free(self);
+    return;
+  }
+
+  __server_free(self);
+}
+
 /*
   If we do not have a valid object to clone from, we toss an error.
 */
@@ -171,15 +181,15 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination,
   if (not source)
     return NULL;
 
-  destination= memcached_server_create_with(source->root, destination,
-                                            source->hostname, source->port, source->weight,
-                                            source->type);
-  if (destination != NULL)
+  destination= __server_create_with(source->root, destination,
+                                    source->hostname, source->port, source->weight,
+                                    source->type);
+  if (not destination)
   {
-    destination->cached_errno= source->cached_errno;
-
-    if (source->cached_server_error)
-      destination->cached_server_error= strdup(source->cached_server_error);
+    if (source->error_messages)
+    {
+      destination->error_messages= memcached_error_copy(*source);
+    }
   }
 
   return destination;
@@ -197,6 +207,7 @@ memcached_return_t memcached_server_cursor(const memcached_st *ptr,
     return rc;
   }
 
+  size_t errors= 0;
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_server_instance_st instance=
@@ -204,16 +215,17 @@ memcached_return_t memcached_server_cursor(const memcached_st *ptr,
 
     for (uint32_t y= 0; y < number_of_callbacks; y++)
     {
-      unsigned int iferror;
-
-      iferror= (*callback[y])(ptr, instance, context);
+      memcached_return_t ret= (*callback[y])(ptr, instance, context);
 
-      if (iferror)
+      if (memcached_failed(ret))
+      {
+        errors++;
         continue;
+      }
     }
   }
 
-  return MEMCACHED_SUCCESS;
+  return errors ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
 }
 
 memcached_return_t memcached_server_execute(memcached_st *ptr,
@@ -227,7 +239,9 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
     unsigned int iferror= (*callback)(ptr, instance, context);
 
     if (iferror)
+    {
       continue;
+    }
   }
 
   return MEMCACHED_SUCCESS;
@@ -256,7 +270,7 @@ memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr,
     return NULL;
   }
 
-  if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if (memcached_failed((memcached_key_test(*ptr, (const char **)&key, &key_length, 1))))
   {
     *error= MEMCACHED_BAD_KEY_PROVIDED;
     return NULL;
@@ -271,9 +285,11 @@ void memcached_server_error_reset(memcached_server_st *self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
+  {
     return;
+  }
 
-  self->cached_server_error[0]= 0;
+  memcached_error_free(*self);
 }
 
 memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
@@ -285,31 +301,6 @@ memcached_server_instance_st memcached_server_get_last_disconnect(const memcache
   return self->last_disconnected_server;
 }
 
-void memcached_server_list_free(memcached_server_list_st self)
-{
-  if (not self)
-    return;
-
-  for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
-  {
-    if (self[x].address_info)
-    {
-      freeaddrinfo(self[x].address_info);
-      self[x].address_info= NULL;
-    }
-  }
-
-  memcached_st *root= self->root;
-  if (root)
-  {
-    libmemcached_free(root, self);
-  }
-  else
-  {
-    free(self);
-  }
-}
-
 uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
 {
   WATCHPOINT_ASSERT(servers);
@@ -328,7 +319,7 @@ uint32_t memcached_server_count(const memcached_st *self)
   return self->number_of_hosts;
 }
 
-const char *memcached_server_name(memcached_server_instance_st self)
+const char *memcached_server_name(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -337,7 +328,7 @@ const char *memcached_server_name(memcached_server_instance_st self)
   return self->hostname;
 }
 
-in_port_t memcached_server_port(memcached_server_instance_st self)
+in_port_t memcached_server_port(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -346,7 +337,7 @@ 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)
+uint32_t memcached_server_response_count(const memcached_server_instance_st self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
@@ -355,8 +346,26 @@ 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_type(const memcached_server_instance_st ptr)
 {
-  return ptr ?  ptr->cached_server_error : NULL;
-}
+  if (ptr)
+  {
+    switch (ptr->type)
+    {
+    case MEMCACHED_CONNECTION_TCP:
+      return "TCP";
+
+    case MEMCACHED_CONNECTION_UDP:
+      return "UDP";
 
+    case MEMCACHED_CONNECTION_UNIX_SOCKET:
+      return "SOCKET";
+
+    case MEMCACHED_CONNECTION_MAX:
+    case MEMCACHED_CONNECTION_UNKNOWN:
+      break;
+    }
+  }
+
+  return "UNKNOWN";
+}