X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=9d0d2f0be30a814e949a7833f230dd60e3364a3c;hb=385cc099521ab79b8ecb289cd25c46d7cf3caa5c;hp=66f8a495aac8238152cdf37e0e17078564258ecd;hpb=8fa220229fdb895f6f07311124e9c71943fdbad4;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 66f8a495..9d0d2f0b 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -13,21 +13,23 @@
 #ifndef __LIBMEMCACHED_MEMCACHED_H__
 #define __LIBMEMCACHED_MEMCACHED_H__
 
-#include <stdlib.h>
 #include <inttypes.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/platform.h>
 #include <libmemcached/constants.h>
 #include <libmemcached/types.h>
 #include <libmemcached/string.h>
+#include <libmemcached/array.h>
+#include <libmemcached/error.h>
 #include <libmemcached/stats.h>
 #include <libhashkit/hashkit.h>
 // Everything above this line must be in the order specified.
@@ -43,14 +45,17 @@
 #include <libmemcached/flush_buffers.h>
 #include <libmemcached/get.h>
 #include <libmemcached/hash.h>
+#include <libmemcached/options.h>
 #include <libmemcached/parse.h>
 #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>
+#include <libmemcached/sasl.h>
 
 struct memcached_st {
   /**
@@ -59,6 +64,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.
@@ -68,7 +74,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;
@@ -78,6 +84,8 @@ struct memcached_st {
     bool use_sort_hosts:1;
     bool use_udp:1;
     bool verify_key:1;
+    bool tcp_keepalive:1;
+    bool load_from_file:1;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -91,6 +99,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;
@@ -100,7 +109,6 @@ struct memcached_st {
   int recv_size;
   void *user_data;
   time_t next_distribution_rebuild; // Ketama
-  size_t prefix_key_length;
   uint32_t number_of_replicas;
   hashkit_st distribution_hashkit;
   memcached_result_st result;
@@ -119,7 +127,9 @@ struct memcached_st {
   memcached_trigger_key_fn get_key_failure;
   memcached_trigger_delete_key_fn delete_trigger;
   memcached_callback_st *callbacks;
-  char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
+  struct memcached_sasl_st sasl;
+  struct memcached_error_st *error_messages;
+  struct memcached_array_st *prefix_key;
   struct {
     bool is_allocated:1;
   } options;
@@ -139,6 +149,12 @@ memcached_st *memcached_create(memcached_st *ptr);
 LIBMEMCACHED_API
 void memcached_free(memcached_st *ptr);
 
+LIBMEMCACHED_API
+void memcached_reset(memcached_st *ptr);
+
+LIBMEMCACHED_API
+void memcached_reset_last_disconnected_server(memcached_st *ptr);
+
 LIBMEMCACHED_API
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);
 
@@ -148,17 +164,20 @@ void *memcached_get_user_data(const memcached_st *ptr);
 LIBMEMCACHED_API
 void *memcached_set_user_data(memcached_st *ptr, void *data);
 
+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
 
 
-// Local Only Inline
-static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
-{
-  return &ptr->servers[server_key];
-}
-
 #ifdef __cplusplus
 class Memcached : private memcached_st {
 public:
@@ -179,7 +198,7 @@ public:
   }
 
   Memcached& operator=(const Memcached& source)
-  { 
+  {
     memcached_free(this);
     memcached_clone(this, &source);