Add support for query_id, and fixes a few cases where programmer error can

[awesomized/libmemcached] / libmemcached / server.c

diff --git a/libmemcached/server.c b/libmemcached/server.c
index f46c75bc785e3d0de7182d4957a04c9fb35ab574..4fe676b05a82691493c326f61ed4962bb83e9cea 100644 (file)
--- a/libmemcached/server.c
+++ b/libmemcached/server.c
@@ -12,14 +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;
@@ -27,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;
@@ -39,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)
   {
@@ -49,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, NI_MAXHOST - 1);
+  }
 }
 
 static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
@@ -112,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
   {
@@ -150,6 +168,12 @@ memcached_return_t memcached_server_cursor(const memcached_st *ptr,
                                            void *context,
                                            uint32_t number_of_callbacks)
 {
+  memcached_return_t rc;
+  if ((rc= initialize_const_query(ptr)) != MEMCACHED_SUCCESS)
+  {
+    return rc;
+  }
+
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
     memcached_server_instance_st instance=
@@ -169,6 +193,26 @@ memcached_return_t memcached_server_cursor(const memcached_st *ptr,
   return MEMCACHED_SUCCESS;
 }
 
+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,
@@ -177,14 +221,20 @@ memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr,
   uint32_t server_key;
   memcached_server_instance_st instance;
 
-  *error= memcached_validate_key_length(key_length,
-                                        ptr->flags.binary_protocol);
-  unlikely (*error != MEMCACHED_SUCCESS)
+  memcached_return_t rc;
+  if ((rc= initialize_const_query(ptr)) != MEMCACHED_SUCCESS)
+  {
+    if (error)
+      *error= rc;
+
     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;
   }
 
@@ -201,14 +251,22 @@ memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr,
 
 }
 
-void memcached_server_error_reset(memcached_server_st *ptr)
+void memcached_server_error_reset(memcached_server_st *self)
 {
-  ptr->cached_server_error[0]= 0;
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return;
+
+  self->cached_server_error[0]= 0;
 }
 
-memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr)
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *self)
 {
-  return ptr->last_disconnected_server;
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
+  return self->last_disconnected_server;
 }
 
 void memcached_server_list_free(memcached_server_list_st self)
@@ -216,8 +274,6 @@ void memcached_server_list_free(memcached_server_list_st self)
   if (self == NULL)
     return;
 
-  const memcached_st *root= self->root;
-
   for (uint32_t x= 0; x < memcached_server_list_count(self); x++)
   {
     if (self[x].address_info)
@@ -227,6 +283,7 @@ void memcached_server_list_free(memcached_server_list_st self)
     }
   }
 
+  const memcached_st *root= self->root;
   if (root)
   {
     libmemcached_free(root, self);
@@ -237,28 +294,48 @@ void memcached_server_list_free(memcached_server_list_st 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)
 {
+  WATCHPOINT_ASSERT(servers);
+  if (! servers)
+    return 0;
+
   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)
 {
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
   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)
 {
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return NULL;
+
   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)
 {
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
   return self->port;
 }
 
-inline uint32_t memcached_server_response_count(memcached_server_instance_st self)
+uint32_t memcached_server_response_count(memcached_server_instance_st self)
 {
+  WATCHPOINT_ASSERT(self);
+  if (! self)
+    return 0;
+
   return self->cursor_active;
 }