libmemcached: fix #13

[awesomized/libmemcached] / libmemcached / memcached.cc

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index 932b8986fdbfa94a0c017f94650ecfe8d695380d..6e88c257d1c79a0cf7735f8f471cfc6e524c8623 100644 (file)
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -87,6 +87,7 @@ static inline bool _memcached_init(Memcached *self)
   self->snd_timeout= 0;
   self->rcv_timeout= 0;
   self->server_failure_limit= MEMCACHED_SERVER_FAILURE_LIMIT;
+  self->server_timeout_limit= MEMCACHED_SERVER_TIMEOUT_LIMIT;
   self->query_id= 1; // 0 is considered invalid
 
   /* TODO, Document why we picked these defaults */
@@ -136,7 +137,7 @@ static void __memcached_free(Memcached *ptr, bool release_st)
 
   memcached_virtual_bucket_free(ptr);
 
-  memcached_instance_free((org::libmemcached::Instance*)ptr->last_disconnected_server);
+  memcached_instance_free((memcached_instance_st*)ptr->last_disconnected_server);
 
   if (ptr->on_cleanup)
   {
@@ -172,38 +173,38 @@ static void __memcached_free(Memcached *ptr, bool release_st)
 
 memcached_st *memcached_create(memcached_st *shell)
 {
-  Memcached* ptr= memcached2Memcached(shell);
-  if (ptr)
+  if (shell)
   {
-    ptr->options.is_allocated= false;
+    shell->options.is_allocated= false;
   }
   else
   {
-    ptr= (memcached_st *)libmemcached_xmalloc(NULL, memcached_st);
+    shell= (memcached_st *)libmemcached_xmalloc(NULL, memcached_st);
 
-    if (ptr == NULL)
+    if (shell == NULL)
     {
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
     }
 
-    ptr->options.is_allocated= true;
+    shell->options.is_allocated= true;
   }
 
-  if (_memcached_init(ptr) == false)
+  if (_memcached_init(shell) == false)
   {
-    memcached_free(ptr);
+    memcached_free(shell);
     return NULL;
   }
 
-  if (memcached_result_create(ptr, &ptr->result) == NULL)
+  Memcached* memc= memcached2Memcached(shell);
+  if (memcached_result_create(shell, &memc->result) == NULL)
   {
-    memcached_free(ptr);
+    memcached_free(shell);
     return NULL;
   }
 
-  WATCHPOINT_ASSERT_INITIALIZED(&ptr->result);
+  WATCHPOINT_ASSERT_INITIALIZED(&memc->result);
 
-  return ptr;
+  return shell;
 }
 
 memcached_st *memcached(const char *string, size_t length)
@@ -284,6 +285,8 @@ void memcached_servers_reset(memcached_st *shell)
   {
     libmemcached_free(self, self->ketama.continuum);
     self->ketama.continuum= NULL;
+    self->ketama.continuum_count= 0;
+    self->ketama.continuum_points_counter= 0;
 
     memcached_instance_list_free(memcached_instance_list(self), self->number_of_hosts);
     memcached_instance_set(self, NULL, 0);
@@ -297,7 +300,7 @@ void memcached_reset_last_disconnected_server(memcached_st *shell)
   Memcached* self= memcached2Memcached(shell);
   if (self)
   {
-    memcached_instance_free((org::libmemcached::Instance*)self->last_disconnected_server);
+    memcached_instance_free((memcached_instance_st*)self->last_disconnected_server);
     self->last_disconnected_server= NULL;
   }
 }
@@ -362,6 +365,7 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->get_key_failure= source->get_key_failure;
   new_clone->delete_trigger= source->delete_trigger;
   new_clone->server_failure_limit= source->server_failure_limit;
+  new_clone->server_timeout_limit= source->server_timeout_limit;
   new_clone->io_msg_watermark= source->io_msg_watermark;
   new_clone->io_bytes_watermark= source->io_bytes_watermark;
   new_clone->io_key_prefetch= source->io_key_prefetch;
@@ -432,10 +436,10 @@ void *memcached_set_user_data(memcached_st *shell, void *data)
 
 memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
 {
-  return memcached_instance_push(destination, (org::libmemcached::Instance*)source->servers, source->number_of_hosts);
+  return memcached_instance_push(destination, (memcached_instance_st*)source->servers, source->number_of_hosts);
 }
 
-org::libmemcached::Instance* memcached_instance_fetch(Memcached *ptr, uint32_t server_key)
+memcached_instance_st* memcached_instance_fetch(Memcached *ptr, uint32_t server_key)
 {
   if (ptr == NULL)
   {
@@ -445,7 +449,7 @@ org::libmemcached::Instance* memcached_instance_fetch(Memcached *ptr, uint32_t s
   return &ptr->servers[server_key];
 }
 
-memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *shell, uint32_t server_key)
+const memcached_instance_st * memcached_server_instance_by_position(const memcached_st *shell, uint32_t server_key)
 {
   const Memcached* memc= memcached2Memcached(shell);
   if (memc)
@@ -456,7 +460,7 @@ memcached_server_instance_st memcached_server_instance_by_position(const memcach
   return NULL;
 }
 
-org::libmemcached::Instance* memcached_instance_by_position(const memcached_st *shell, uint32_t server_key)
+memcached_instance_st* memcached_instance_by_position(const memcached_st *shell, uint32_t server_key)
 {
   const Memcached* memc= memcached2Memcached(shell);
   if (memc)
@@ -478,12 +482,12 @@ uint64_t memcached_query_id(const memcached_st *shell)
   return 0;
 }
 
-org::libmemcached::Instance* memcached_instance_list(const memcached_st *shell)
+memcached_instance_st* memcached_instance_list(const memcached_st *shell)
 {
   const Memcached* memc= memcached2Memcached(shell);
   if (memc)
   {
-    return (org::libmemcached::Instance*)memc->servers;
+    return (memcached_instance_st*)memc->servers;
   }
 
   return NULL;