X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.c;h=4fe676b05a82691493c326f61ed4962bb83e9cea;hb=b048aacba5d279f3271163cfaa0704684beca1e2;hp=bcc211f655a4e9e88aa73aac4868970ab2c6ae1d;hpb=6bd950c979c31a5cf84c7bdaaad9bccc789a0eb1;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.c b/libmemcached/server.c
index bcc211f6..4fe676b0 100644
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -12,13 +12,14 @@
 /*
   This is a partial implementation for fetching/creating memcached_server_st objects.
 */
-#include "common.h"
+#include <libmemcached/common.h>
 
 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)
 {
-  self->options.sockaddr_inited= false;
+  self->options.is_shutting_down= false;
+  self->options.is_dead= false;
   self->number_of_hosts= 0;
   self->cursor_active= 0;
   self->port= port;
@@ -26,11 +27,12 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
   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->weight= weight ? weight : 1; // 1 is the default weight value
+  WATCHPOINT_SET(self->io_wait_count.read= 0);
+  WATCHPOINT_SET(self->io_wait_count.write= 0);
+  self->major_version= UINT8_MAX;
+  self->micro_version= UINT8_MAX;
+  self->minor_version= UINT8_MAX;
   self->type= type;
   self->read_ptr= self->read_buffer;
   self->cached_server_error= NULL;
@@ -38,6 +40,7 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
   self->read_data_length= 0;
   self->write_buffer_offset= 0;
   self->address_info= NULL;
+  self->address_info_next= NULL;
 
   if (root)
   {
@@ -48,12 +51,21 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r
     self->next_retry= 0;
   }
 
+  if (self->weight > 1 && root)
+  {
+    ((memcached_st *)root)->ketama.weighted= true;
+  }
+
   self->root= root;
   self->limit_maxbytes= 0;
   if (hostname == NULL)
+  {
     self->hostname[0]= 0;
+  }
   else
-    strncpy(self->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
+  {
+    strncpy(self->hostname, hostname, NI_MAXHOST - 1);
+  }
 }
 
 static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
@@ -77,7 +89,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)
 {
@@ -100,7 +113,7 @@ memcached_server_st *memcached_server_create_with(const memcached_st *memc, memc
 
 void memcached_server_free(memcached_server_st *self)
 {
-  memcached_quit_server(self, 0);
+  memcached_quit_server(self, false);
 
   if (self->cached_server_error)
     free(self->cached_server_error);
@@ -110,7 +123,14 @@ void memcached_server_free(memcached_server_st *self)
 
   if (memcached_is_allocated(self))
   {
-    libmemcached_free(self->root, self);
+    if (self->root)
+    {
+      libmemcached_free(self->root, self);
+    }
+    else
+    {
+      free(self);
+    }
   }
   else
   {
@@ -143,24 +163,27 @@ 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;
+  memcached_return_t rc;
+  if ((rc= initialize_const_query(ptr)) != MEMCACHED_SUCCESS)
+  {
+    return rc;
+  }
 
-  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;
@@ -170,19 +193,48 @@ 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_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;
+
+  memcached_return_t rc;
+  if ((rc= initialize_const_query(ptr)) != MEMCACHED_SUCCESS)
+  {
+    if (error)
+      *error= rc;
 
-  *error= memcached_validate_key_length(key_length,
-                                        ptr->flags.binary_protocol);
-  unlikely (*error != MEMCACHED_SUCCESS)
     return NULL;
+  }
 
-  unlikely (memcached_server_count(ptr) == 0)
+  if ((rc= memcached_validate_key_length(key_length, ptr->flags.binary_protocol)) != MEMCACHED_SUCCESS)
   {
-    *error= MEMCACHED_NO_SERVERS;
+    if (error)
+      *error= rc;
+
     return NULL;
   }
 
@@ -193,37 +245,104 @@ 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);
+  instance= memcached_server_instance_by_position(ptr, server_key);
 
-  return memcached_server_clone(NULL, instance);
+  return instance;
 
 }
 
-const char *memcached_server_error(memcached_server_st *ptr)
+void memcached_server_error_reset(memcached_server_st *self)
 {
-  return ptr 
-    ?  ptr->cached_server_error
-    : NULL;
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return;
+
+  self->cached_server_error[0]= 0;
 }
 
-void memcached_server_error_reset(memcached_server_st *ptr)
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
 {
-  ptr->cached_server_error[0]= 0;
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
+  return self->last_disconnected_server;
 }
 
-memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr)
+void memcached_server_list_free(memcached_server_list_st self)
 {
-  return ptr->last_disconnected_server;
+  if (self == NULL)
+    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;
+    }
+  }
+
+  const 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);
+  if (! servers)
+    return 0;
+
+  return servers->number_of_hosts= count;
+}
+
+uint32_t memcached_server_count(const memcached_st *self)
+{
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
+  return self->number_of_hosts;
+}
+
+const char *memcached_server_name(memcached_server_instance_st self)
+{
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return NULL;
+
+  return self->hostname;
 }
 
-uint32_t memcached_server_list_count(memcached_server_st *ptr)
+in_port_t memcached_server_port(memcached_server_instance_st self)
 {
-  return (ptr == NULL)
-    ? 0
-    : memcached_servers_count(ptr);
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
+  return self->port;
+}
+
+uint32_t memcached_server_response_count(memcached_server_instance_st self)
+{
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
+  return self->cursor_active;
 }
 
-void memcached_server_list_free(memcached_server_st *ptr)
+const char *memcached_server_error(memcached_server_instance_st ptr)
 {
-  server_list_free(NULL, ptr);
+  return ptr
+    ?  ptr->cached_server_error
+    : NULL;
 }
+