X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.cc;h=5f57c515c3122e9a954294a6371c28631eeaa091;hb=674c7578fa870c3b57e81e765c355ce98434b310;hp=ce3fb8e39ce612b3c451162dbcd3e4db03bab0fe;hpb=5d66b2f99bf7de6f54a3e463b01542b997f68ac8;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index ce3fb8e3..5f57c515 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,8 +64,12 @@ 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;
+  }
+
+  self->server_info.version= 0;
 
   self->ketama.continuum= NULL;
   self->ketama.continuum_count= 0;
@@ -104,7 +83,7 @@ static inline bool _memcached_init(memcached_st *self)
 
   self->snd_timeout= 0;
   self->rcv_timeout= 0;
-  self->server_failure_limit= 0;
+  self->server_failure_limit= MEMCACHED_SERVER_FAILURE_LIMIT;
   self->query_id= 1; // 0 is considered invalid
 
   /* TODO, Document why we picked these defaults */
@@ -116,7 +95,8 @@ static inline bool _memcached_init(memcached_st *self)
   self->io_key_prefetch= 0;
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
-  self->retry_timeout= 0;
+  self->retry_timeout= MEMCACHED_SERVER_FAILURE_RETRY_TIMEOUT;
+  self->dead_timeout= MEMCACHED_SERVER_FAILURE_DEAD_TIMEOUT;
 
   self->send_size= -1;
   self->recv_size= -1;
@@ -144,19 +124,21 @@ 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);
-  memcached_server_list_free(memcached_server_list(ptr));
+  memcached_instance_list_free(memcached_instance_list(ptr), memcached_instance_list_count(ptr));
   memcached_result_free(&ptr->result);
 
   memcached_virtual_bucket_free(ptr);
 
-  memcached_server_free(ptr->last_disconnected_server);
+  memcached_instance_free((org::libmemcached::Instance*)ptr->last_disconnected_server);
 
   if (ptr->on_cleanup)
+  {
     ptr->on_cleanup(ptr);
+  }
 
   libmemcached_free(ptr, ptr->ketama.continuum);
 
@@ -176,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);
   }
@@ -184,34 +168,29 @@ 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);
-  memcached_set_processing_input(ptr, false);
-#endif
-
-  if (! _memcached_init(ptr))
+  if (_memcached_init(ptr) == false)
   {
     memcached_free(ptr);
     return NULL;
   }
 
-  if (! memcached_result_create(ptr, &ptr->result))
+  if (memcached_result_create(ptr, &ptr->result) == NULL)
   {
     memcached_free(ptr);
     return NULL;
@@ -224,42 +203,62 @@ 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 (length == 0 and string)
+  {
+    return NULL;
+  }
+
+  if (length and string == NULL)
   {
-    errno= ENOMEM;
     return NULL;
   }
 
-  if (not length)
-    return self;
+  if (length == 0)
+  {
+    if (bool(getenv("LIBMEMCACHED")))
+    {
+      string= getenv("LIBMEMCACHED");
+      length= string ? strlen(string) : 0;
+    }
+  }
+
+  memcached_st *memc= memcached_create(NULL);
+  if (memc == NULL)
+  {
+    return NULL;
+  }
 
-  memcached_return_t rc= memcached_parse_configuration(self, string, length);
+  if (length == 0 or string == NULL)
+  {
+    return memc;
+  }
 
-  if (memcached_success(rc) and memcached_parse_filename(self))
+  memcached_return_t rc= memcached_parse_configuration(memc, string, length);
+  if (memcached_success(rc) and memcached_parse_filename(memc))
   {
-    rc= memcached_parse_configure_file(*self, memcached_parse_filename(self), memcached_parse_filename_length(self));
+    rc= memcached_parse_configure_file(*memc, memcached_parse_filename(memc), memcached_parse_filename_length(memc));
   }
     
   if (memcached_failed(rc))
   {
-    memcached_free(self);
-    errno= EINVAL;
+    memcached_free(memc);
     return NULL;
   }
 
-  return self;
+  return memc;
 }
 
 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;
@@ -274,33 +273,32 @@ memcached_return_t memcached_reset(memcached_st *ptr)
 
 void memcached_servers_reset(memcached_st *self)
 {
-  if (not self)
-    return;
-
-  memcached_server_list_free(memcached_server_list(self));
+  if (self)
+  {
+    memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);
 
-  memcached_server_list_set(self, NULL);
-  self->number_of_hosts= 0;
-  memcached_server_free(self->last_disconnected_server);
-  self->last_disconnected_server= NULL;
-  self->server_failure_limit= 0;
+    memcached_instance_set(self, NULL);
+    self->number_of_hosts= 0;
+    memcached_instance_free((org::libmemcached::Instance*)self->last_disconnected_server);
+    self->last_disconnected_server= NULL;
+  }
 }
 
 void memcached_reset_last_disconnected_server(memcached_st *self)
 {
-  if (not self)
-    return;
-
-  memcached_server_free(self->last_disconnected_server);
-  self->last_disconnected_server= NULL;
+  if (self)
+  {
+    memcached_instance_free((org::libmemcached::Instance*)self->last_disconnected_server);
+    self->last_disconnected_server= NULL;
+  }
 }
 
 void memcached_free(memcached_st *ptr)
 {
-  if (not ptr)
-    return;
-
-  _free(ptr, true);
+  if (ptr)
+  {
+    __memcached_free(ptr, true);
+  }
 }
 
 /*
@@ -310,20 +308,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;
@@ -331,9 +331,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;
@@ -359,31 +360,28 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->tcp_keepidle= source->tcp_keepidle;
 
   if (memcached_server_count(source))
-    rc= memcached_push(new_clone, source);
-
-  if (rc != MEMCACHED_SUCCESS)
   {
-    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)
   {
-    if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
+    if (memcached_failed(memcached_clone_sasl(new_clone, source)))
     {
       memcached_free(new_clone);
       return NULL;
     }
   }
 
-  rc= run_distribution(new_clone);
-
-  if (rc != MEMCACHED_SUCCESS)
+  if (memcached_failed(run_distribution(new_clone)))
   {
     memcached_free(new_clone);
 
@@ -391,18 +389,30 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   }
 
   if (source->on_clone)
+  {
     source->on_clone(new_clone, source);
+  }
 
   return new_clone;
 }
 
 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;
 
@@ -411,23 +421,56 @@ void *memcached_set_user_data(memcached_st *ptr, void *data)
 
 memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
 {
-  return memcached_server_push(destination, source->servers);
+  return memcached_instance_push(destination, (org::libmemcached::Instance*)source->servers, source->number_of_hosts);
 }
 
-memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
+org::libmemcached::Instance* memcached_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];
+}
+
+org::libmemcached::Instance* memcached_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;
 }
+
+org::libmemcached::Instance* memcached_instance_list(const memcached_st *self)
+{
+  if (self)
+  {
+    return (org::libmemcached::Instance*)self->servers;
+  }
+
+  return NULL;
+}
+