Refactored all of the IO commands to pass only server structures (this is an

[awesomized/libmemcached] / lib / memcached.c

diff --git a/lib/memcached.c b/lib/memcached.c
index 8122e1e837876156fe8dc5d4a192d5fdadb26d7e..31c12ab3158bc52af7665376171816157f27e3c5 100644 (file)
--- a/lib/memcached.c
+++ b/lib/memcached.c
@@ -1,11 +1,13 @@
 /*
   Memcached library
 */
-#include <memcached.h>
+#include "common.h"
 
-memcached_st *memcached_init(memcached_st *ptr)
+memcached_st *memcached_create(memcached_st *ptr)
 {
-  if (!ptr)
+  memcached_result_st *result_ptr;
+
+  if (ptr == NULL)
   {
     ptr= (memcached_st *)malloc(sizeof(memcached_st));
 
@@ -19,29 +21,86 @@ memcached_st *memcached_init(memcached_st *ptr)
   {
     memset(ptr, 0, sizeof(memcached_st));
   }
+  result_ptr= memcached_result_create(ptr, &ptr->result);
+  WATCHPOINT_ASSERT(result_ptr);
+  ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+  ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
   return ptr;
 }
 
-void memcached_deinit(memcached_st *ptr)
+void memcached_free(memcached_st *ptr)
 {
-  unsigned int x;
+  /* If we have anything open, lets close it now */
+  memcached_quit(ptr);
+  server_list_free(ptr, ptr->hosts);
+  memcached_result_free(&ptr->result);
 
-  if (ptr->hosts)
+  if (ptr->on_cleanup)
+    ptr->on_cleanup(ptr);
+
+  if (ptr->is_allocated == MEMCACHED_ALLOCATED)
   {
-    for (x= 0; x < ptr->number_of_hosts; x++)
-    {
-      if (ptr->hosts[x].fd > 0)
-        close(ptr->hosts[x].fd);
+    if (ptr->call_free)
+      ptr->call_free(ptr, ptr);
+    else
+      free(ptr);
+  }
+  else
+    ptr->is_allocated= MEMCACHED_USED;
+}
 
-      free(ptr->hosts[x].hostname);
-    }
+/*
+  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
+  called.
+*/
+memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
+{
+  memcached_return rc= MEMCACHED_SUCCESS;
+  memcached_st *new_clone;
 
-    free(ptr->hosts);
+  if (ptr == NULL)
+    return memcached_create(clone);
+
+  if (ptr->is_allocated == MEMCACHED_USED)
+  {
+    WATCHPOINT_ASSERT(0);
+    return NULL;
   }
+  
+  new_clone= memcached_create(clone);
+  
+  if (new_clone == NULL)
+    return NULL;
 
-  if (ptr->is_allocated == MEMCACHED_ALLOCATED)
-    free(ptr);
-  else
-    memset(ptr, 0, sizeof(memcached_st));
+  if (ptr->hosts)
+    rc= memcached_server_push(new_clone, ptr->hosts);
+
+  if (rc != MEMCACHED_SUCCESS)
+  {
+    memcached_free(new_clone);
+
+    return NULL;
+  }
+
+
+  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->distribution= ptr->distribution;
+  new_clone->hash= ptr->hash;
+  new_clone->user_data= ptr->user_data;
+
+  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;
+
+  if (ptr->on_clone)
+    ptr->on_clone(ptr, new_clone);
+
+  return new_clone;
 }