X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=a7cdc97722e289e079b79582e4e129cf93965fdf;hb=a8efa12d2d90c3777f3c33347fe002884be1185d;hp=50421441ac550c46c9df2ef7d04472ffb9e50ce5;hpb=ce11ec5eadbc51ff26aa6b64f52cf36e6b703f46;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 50421441..a7cdc977 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -10,25 +10,27 @@
  *
  */
 
-#ifndef __MEMCACHED_H__
-#define __MEMCACHED_H__
+#ifndef __LIBMEMCACHED_MEMCACHED_H__
+#define __LIBMEMCACHED_MEMCACHED_H__
 
-#include <stdlib.h>
 #include <inttypes.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
 
 #if !defined(__cplusplus)
 # include <stdbool.h>
 #endif
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include <libmemcached/visibility.h>
 #include <libmemcached/configure.h>
 #include <libmemcached/constants.h>
 #include <libmemcached/types.h>
 #include <libmemcached/string.h>
 #include <libmemcached/stats.h>
+#include <libhashkit/hashkit.h>
 // Everything above this line must be in the order specified.
 #include <libmemcached/allocators.h>
 #include <libmemcached/analyze.h>
@@ -46,14 +48,12 @@
 #include <libmemcached/quit.h>
 #include <libmemcached/result.h>
 #include <libmemcached/server.h>
+#include <libmemcached/server_list.h>
 #include <libmemcached/storage.h>
 #include <libmemcached/strerror.h>
 #include <libmemcached/verbosity.h>
 #include <libmemcached/version.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <libmemcached/sasl.h>
 
 struct memcached_st {
   /**
@@ -62,6 +62,7 @@ struct memcached_st {
   struct {
     bool is_purging:1;
     bool is_processing_input:1;
+    bool is_time_for_rebuild:1;
   } state;
   struct {
     // Everything below here is pretty static.
@@ -71,7 +72,7 @@ struct memcached_st {
     bool cork:1;
     bool hash_with_prefix_key:1;
     bool ketama_weighted:1;
-    bool no_block:1;
+    bool no_block:1; // Don't block
     bool no_reply:1;
     bool randomize_replica_read:1;
     bool reuse_memory:1;
@@ -81,9 +82,10 @@ struct memcached_st {
     bool use_sort_hosts:1;
     bool use_udp:1;
     bool verify_key:1;
+    bool tcp_keepalive:1;
   } flags;
   memcached_server_distribution_t distribution;
-  memcached_hash_t hash;
+  hashkit_st hashkit;
   uint32_t continuum_points_counter; // Ketama
   uint32_t number_of_hosts;
   memcached_server_st *servers;
@@ -94,6 +96,7 @@ struct memcached_st {
   uint32_t io_msg_watermark;
   uint32_t io_bytes_watermark;
   uint32_t io_key_prefetch;
+  uint32_t tcp_keepidle;
   int cached_errno;
   int32_t poll_timeout;
   int32_t connect_timeout;
@@ -105,31 +108,38 @@ struct memcached_st {
   time_t next_distribution_rebuild; // Ketama
   size_t prefix_key_length;
   uint32_t number_of_replicas;
-  memcached_hash_t distribution_hash;
+  hashkit_st distribution_hashkit;
   memcached_result_st result;
   memcached_continuum_item_st *continuum; // Ketama
 
-  memcached_free_fn call_free;
-  memcached_malloc_fn call_malloc;
-  memcached_realloc_fn call_realloc;
-  memcached_calloc_fn call_calloc;
+  struct _allocators_st {
+    memcached_calloc_fn calloc;
+    memcached_free_fn free;
+    memcached_malloc_fn malloc;
+    memcached_realloc_fn realloc;
+    void *context;
+  } allocators;
 
   memcached_clone_fn on_clone;
   memcached_cleanup_fn on_cleanup;
   memcached_trigger_key_fn get_key_failure;
   memcached_trigger_delete_key_fn delete_trigger;
   memcached_callback_st *callbacks;
+  struct memcached_sasl_st *sasl;
   char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
   struct {
     bool is_allocated:1;
   } options;
+
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 LIBMEMCACHED_API
 void memcached_servers_reset(memcached_st *ptr);
 
-/* Public API */
-
 LIBMEMCACHED_API
 memcached_st *memcached_create(memcached_st *ptr);
 
@@ -137,7 +147,10 @@ LIBMEMCACHED_API
 void memcached_free(memcached_st *ptr);
 
 LIBMEMCACHED_API
-memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr);
+void memcached_reset_last_disconnected_server(memcached_st *ptr);
+
+LIBMEMCACHED_API
+memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);
 
 LIBMEMCACHED_API
 void *memcached_get_user_data(const memcached_st *ptr);
@@ -145,16 +158,48 @@ void *memcached_get_user_data(const memcached_st *ptr);
 LIBMEMCACHED_API
 void *memcached_set_user_data(memcached_st *ptr, void *data);
 
-// Local Only Inline
-static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
-{
-  return &ptr->servers[server_key];
-}
+LIBMEMCACHED_API
+memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source);
+
+LIBMEMCACHED_API
+memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key);
 
+LIBMEMCACHED_API
+uint32_t memcached_server_count(const memcached_st *);
 
 #ifdef __cplusplus
-}
+} // extern "C"
+#endif
+
+
+#ifdef __cplusplus
+class Memcached : private memcached_st {
+public:
+
+  Memcached()
+  {
+    memcached_create(this);
+  }
+
+  ~Memcached()
+  {
+    memcached_free(this);
+  }
+
+  Memcached(const Memcached& source)
+  {
+    memcached_clone(this, &source);
+  }
+
+  Memcached& operator=(const Memcached& source)
+  {
+    memcached_free(this);
+    memcached_clone(this, &source);
+
+    return *this;
+  }
+};
 #endif
 
+#endif /* __LIBMEMCACHED_MEMCACHED_H__ */
 
-#endif /* __MEMCACHED_H__ */