Add memcached_[gs]et_user_data and updated the doc for memcached_set_memory_allocator...

[awesomized/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 33a80bab29693982e49ae0210b3fc08f18694095..5991aabb46ced3c685ed7a26fcf0f9a4ce40786e 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -9,18 +9,20 @@ memcached_st *memcached_create(memcached_st *ptr)
 
   if (ptr == NULL)
   {
-    ptr= (memcached_st *)malloc(sizeof(memcached_st));
+    ptr= (memcached_st *)calloc(1, sizeof(memcached_st));
 
     if (!ptr)
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
 
-    memset(ptr, 0, sizeof(memcached_st));
-    ptr->is_allocated= MEMCACHED_ALLOCATED;
+    ptr->is_allocated= true;
   }
   else
   {
     memset(ptr, 0, sizeof(memcached_st));
   }
+
+  memcached_set_memory_allocators(ptr, NULL, NULL, NULL, NULL);
+
   result_ptr= memcached_result_create(ptr, &ptr->result);
   WATCHPOINT_ASSERT(result_ptr);
   ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
@@ -28,6 +30,10 @@ memcached_st *memcached_create(memcached_st *ptr)
   ptr->retry_timeout= 0;
   ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
+  /* TODO, Document why we picked these defaults */
+  ptr->io_msg_watermark= 500;
+  ptr->io_bytes_watermark= 65 * 1024;
+
   return ptr;
 }
 
@@ -41,43 +47,67 @@ void memcached_free(memcached_st *ptr)
   if (ptr->on_cleanup)
     ptr->on_cleanup(ptr);
 
-  if (ptr->is_allocated == MEMCACHED_ALLOCATED)
-  {
-    if (ptr->call_free)
-      ptr->call_free(ptr, ptr);
-    else
-      free(ptr);
-  }
+  if (ptr->continuum)
+    ptr->call_free(ptr, ptr->continuum);
+
+  if (ptr->is_allocated)
+    ptr->call_free(ptr, ptr);
   else
-    ptr->is_allocated= MEMCACHED_USED;
+    memset(ptr, 0, sizeof(memcached_st));
 }
 
 /*
-  clone is the destination, while ptr is the structure to clone.
-  If ptr is NULL the call is the same as if a memcached_create() was
+  clone is the destination, while source is the structure to clone.
+  If source is NULL the call is the same as if a memcached_create() was
   called.
 */
-memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
+memcached_st *memcached_clone(memcached_st *clone, memcached_st *source)
 {
   memcached_return rc= MEMCACHED_SUCCESS;
   memcached_st *new_clone;
 
-  if (ptr == NULL)
+  if (source == NULL)
     return memcached_create(clone);
 
-  if (ptr->is_allocated == MEMCACHED_USED)
+  if (clone && clone->is_allocated)
   {
-    WATCHPOINT_ASSERT(0);
     return NULL;
   }
-  
+
   new_clone= memcached_create(clone);
-  
+
   if (new_clone == NULL)
     return NULL;
 
-  if (ptr->hosts)
-    rc= memcached_server_push(new_clone, ptr->hosts);
+  new_clone->flags= source->flags;
+  new_clone->send_size= source->send_size;
+  new_clone->recv_size= source->recv_size;
+  new_clone->poll_timeout= source->poll_timeout;
+  new_clone->connect_timeout= source->connect_timeout;
+  new_clone->retry_timeout= source->retry_timeout;
+  new_clone->distribution= source->distribution;
+  new_clone->hash= source->hash;
+  new_clone->hash_continuum= source->hash_continuum;
+  new_clone->user_data= source->user_data;
+
+  new_clone->snd_timeout= source->snd_timeout;
+  new_clone->rcv_timeout= source->rcv_timeout;
+
+  new_clone->on_clone= source->on_clone;
+  new_clone->on_cleanup= source->on_cleanup;
+  new_clone->call_free= source->call_free;
+  new_clone->call_malloc= source->call_malloc;
+  new_clone->call_realloc= source->call_realloc;
+  new_clone->call_calloc= source->call_calloc;
+  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->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;
+
+  if (source->hosts)
+    rc= memcached_server_push(new_clone, source->hosts);
 
   if (rc != MEMCACHED_SUCCESS)
   {
@@ -87,26 +117,33 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   }
 
 
-  new_clone->flags= ptr->flags;
-  new_clone->send_size= ptr->send_size;
-  new_clone->recv_size= ptr->recv_size;
-  new_clone->poll_timeout= ptr->poll_timeout;
-  new_clone->connect_timeout= ptr->connect_timeout;
-  new_clone->retry_timeout= ptr->retry_timeout;
-  new_clone->distribution= ptr->distribution;
-  new_clone->hash= ptr->hash;
-  new_clone->user_data= ptr->user_data;
+  if (source->prefix_key[0] != 0)
+  {
+    strcpy(new_clone->prefix_key, source->prefix_key);
+    new_clone->prefix_key_length= source->prefix_key_length;
+  }
+
+  rc= run_distribution(new_clone);
+  if (rc != MEMCACHED_SUCCESS)
+  {
+    memcached_free(new_clone);
 
-  new_clone->on_clone= ptr->on_clone;
-  new_clone->on_cleanup= ptr->on_cleanup;
-  new_clone->call_free= ptr->call_free;
-  new_clone->call_malloc= ptr->call_malloc;
-  new_clone->call_realloc= ptr->call_realloc;
-  new_clone->get_key_failure= ptr->get_key_failure;
-  new_clone->delete_trigger= ptr->delete_trigger;
+    return NULL;
+  }
 
-  if (ptr->on_clone)
-    ptr->on_clone(ptr, new_clone);
+  if (source->on_clone)
+    source->on_clone(source, new_clone);
 
   return new_clone;
 }
+void *memcached_get_user_data(memcached_st *ptr)
+{
+  return ptr->user_data;
+}
+
+void *memcached_set_user_data(memcached_st *ptr, void *data)
+{
+  void *ret= ptr->user_data;
+  ptr->user_data= data;
+  return ret;
+}