X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.cc;h=2eb91281e42176f3e72e096f3021df1f938a03e5;hb=09b4ff9a9b7c62b4511ab10c9305eba757fea34b;hp=e81f19ee6fabb94687202a1be7d201d8fb34b0f1;hpb=969fea8e7bed82c109685ec3976cf7b0ec514ae9;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index e81f19ee..2eb91281 100644
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -40,31 +40,6 @@
 #include <libmemcached/options.hpp>
 #include <libmemcached/virtual_bucket.h>
 
-#if 0
-static const memcached_st global_copy= {
-  .state= {
-    .is_purging= false, // .is_purging
-    .is_processing_input= false, // is_processing_input
-    .is_time_for_rebuild= false,
-  },
-  .flags= {
-    .auto_eject_hosts= false,
-    .binary_protocol= false,
-    .buffer_requests= false,
-    .hash_with_namespace= false,
-    .no_block= false,
-    .no_reply= false,
-    .randomize_replica_read= false,
-    .support_cas= false,
-    .tcp_nodelay= false,
-    .use_sort_hosts= false,
-    .use_udp= false,
-    .verify_key= false,
-    .tcp_keepalive= false,
-  },
-};
-#endif
-
 static inline bool _memcached_init(memcached_st *self)
 {
   self->state.is_purging= false;
@@ -76,7 +51,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->flags.buffer_requests= false;
   self->flags.hash_with_namespace= false;
   self->flags.no_block= false;
-  self->flags.no_reply= false;
+  self->flags.reply= true;
   self->flags.randomize_replica_read= false;
   self->flags.support_cas= false;
   self->flags.tcp_nodelay= false;
@@ -89,7 +64,7 @@ static inline bool _memcached_init(memcached_st *self)
 
   self->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
-  if (not hashkit_create(&self->hashkit))
+  if (hashkit_create(&self->hashkit) == NULL)
   {
     return false;
   }
@@ -121,6 +96,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
   self->retry_timeout= MEMCACHED_SERVER_FAILURE_RETRY_TIMEOUT;
+  self->dead_timeout= MEMCACHED_SERVER_FAILURE_DEAD_TIMEOUT;
 
   self->send_size= -1;
   self->recv_size= -1;
@@ -148,7 +124,7 @@ static inline bool _memcached_init(memcached_st *self)
   return true;
 }
 
-static void _free(memcached_st *ptr, bool release_st)
+static void __memcached_free(memcached_st *ptr, bool release_st)
 {
   /* If we have anything open, lets close it now */
   send_quit(ptr);
@@ -182,7 +158,9 @@ static void _free(memcached_st *ptr, bool release_st)
     ptr->configure.filename= NULL;
   }
 
-  if (memcached_is_allocated(ptr) && release_st)
+  hashkit_free(&ptr->hashkit);
+
+  if (memcached_is_allocated(ptr) and release_st)
   {
     libmemcached_free(ptr, ptr);
   }
@@ -190,21 +168,21 @@ static void _free(memcached_st *ptr, bool release_st)
 
 memcached_st *memcached_create(memcached_st *ptr)
 {
-  if (ptr == NULL)
+  if (ptr)
+  {
+    ptr->options.is_allocated= false;
+  }
+  else
   {
-    ptr= (memcached_st *)malloc(sizeof(memcached_st));
+    ptr= (memcached_st *)libmemcached_xmalloc(NULL, memcached_st);
 
-    if (not ptr)
+    if (ptr == NULL)
     {
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
     }
 
     ptr->options.is_allocated= true;
   }
-  else
-  {
-    ptr->options.is_allocated= false;
-  }
 
 #if 0
   memcached_set_purging(ptr, false);
@@ -231,19 +209,17 @@ memcached_st *memcached_create(memcached_st *ptr)
 memcached_st *memcached(const char *string, size_t length)
 {
   memcached_st *self= memcached_create(NULL);
-  if (not self)
+  if (self == NULL)
   {
-    errno= ENOMEM;
     return NULL;
   }
 
-  if (not length)
+  if (length == 0)
   {
     return self;
   }
 
   memcached_return_t rc= memcached_parse_configuration(self, string, length);
-
   if (memcached_success(rc) and memcached_parse_filename(self))
   {
     rc= memcached_parse_configure_file(*self, memcached_parse_filename(self), memcached_parse_filename_length(self));
@@ -252,7 +228,6 @@ memcached_st *memcached(const char *string, size_t length)
   if (memcached_failed(rc))
   {
     memcached_free(self);
-    errno= EINVAL;
     return NULL;
   }
 
@@ -262,14 +237,14 @@ memcached_st *memcached(const char *string, size_t length)
 memcached_return_t memcached_reset(memcached_st *ptr)
 {
   WATCHPOINT_ASSERT(ptr);
-  if (not ptr)
+  if (ptr == NULL)
   {
     return MEMCACHED_INVALID_ARGUMENTS;
   }
 
   bool stored_is_allocated= memcached_is_allocated(ptr);
   uint64_t query_id= ptr->query_id;
-  _free(ptr, false);
+  __memcached_free(ptr, false);
   memcached_create(ptr);
   memcached_set_allocated(ptr, stored_is_allocated);
   ptr->query_id= query_id;
@@ -308,7 +283,7 @@ void memcached_free(memcached_st *ptr)
 {
   if (ptr)
   {
-    _free(ptr, true);
+    __memcached_free(ptr, true);
   }
 }
 
@@ -319,20 +294,22 @@ void memcached_free(memcached_st *ptr)
 */
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
 {
-  memcached_return_t rc= MEMCACHED_SUCCESS;
-
-  if (not source)
+  if (source == NULL)
+  {
     return memcached_create(clone);
+  }
 
-  if (clone && memcached_is_allocated(clone))
+  if (clone and memcached_is_allocated(clone))
   {
     return NULL;
   }
 
   memcached_st *new_clone= memcached_create(clone);
 
-  if (not new_clone)
+  if (new_clone == NULL)
+  {
     return NULL;
+  }
 
   new_clone->flags= source->flags;
   new_clone->send_size= source->send_size;
@@ -340,9 +317,10 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->poll_timeout= source->poll_timeout;
   new_clone->connect_timeout= source->connect_timeout;
   new_clone->retry_timeout= source->retry_timeout;
+  new_clone->dead_timeout= source->dead_timeout;
   new_clone->distribution= source->distribution;
 
-  if (not hashkit_clone(&new_clone->hashkit, &source->hashkit))
+  if (hashkit_clone(&new_clone->hashkit, &source->hashkit) == NULL)
   {
     memcached_free(new_clone);
     return NULL;
@@ -369,19 +347,16 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
 
   if (memcached_server_count(source))
   {
-    rc= memcached_push(new_clone, source);
-  }
-
-  if (memcached_failed(rc))
-  {
-    memcached_free(new_clone);
-
-    return NULL;
+    if (memcached_failed(memcached_push(new_clone, source)))
+    {
+      return NULL;
+    }
   }
 
 
   new_clone->_namespace= memcached_array_clone(new_clone, source->_namespace);
   new_clone->configure.filename= memcached_array_clone(new_clone, source->_namespace);
+  new_clone->configure.version= source->configure.version;
 
   if (LIBMEMCACHED_WITH_SASL_SUPPORT and source->sasl.callbacks)
   {
@@ -409,11 +384,21 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
 
 void *memcached_get_user_data(const memcached_st *ptr)
 {
+  if (ptr == NULL)
+  {
+    return NULL;
+  }
+
   return ptr->user_data;
 }
 
 void *memcached_set_user_data(memcached_st *ptr, void *data)
 {
+  if (ptr == NULL)
+  {
+    return NULL;
+  }
+
   void *ret= ptr->user_data;
   ptr->user_data= data;
 
@@ -427,18 +412,30 @@ memcached_return_t memcached_push(memcached_st *destination, const memcached_st
 
 memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
 {
+  if (ptr == NULL)
+  {
+    return NULL;
+  }
+
   return &ptr->servers[server_key];
 }
 
 memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
 {
+  if (ptr == NULL)
+  {
+    return NULL;
+  }
+
   return &ptr->servers[server_key];
 }
 
 uint64_t memcached_query_id(const memcached_st *self)
 {
-  if (not self)
+  if (self == NULL)
+  {
     return 0;
+  }
 
   return self->query_id;
 }