X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=47968139f0acdd96c2e14ff4fc5cef75c07a37ca;hb=9cab202576a66e3150d283ea2066ee88a6502cea;hp=39158498c1bbbe53b468eb5145c93386324cf09a;hpb=a246ac50a88e4af750fd2dd209eff94dcadf72d2;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 39158498..47968139 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -25,15 +25,17 @@
 
 #include <libmemcached/visibility.h>
 #include <libmemcached/memcached_configure.h>
-#include <libmemcached/memcached_constants.h>
-#include <libmemcached/memcached_types.h>
-#include <libmemcached/memcached_behavior.h>
-#include <libmemcached/memcached_callback.h>
-#include <libmemcached/memcached_get.h>
-#include <libmemcached/memcached_server.h>
-#include <libmemcached/memcached_string.h>
-#include <libmemcached/memcached_result.h>
-#include <libmemcached/memcached_storage.h>
+#include <libmemcached/constants.h>
+#include <libmemcached/types.h>
+#include <libmemcached/string.h>
+// Everything above this line must be in the order specified.
+#include <libmemcached/behavior.h>
+#include <libmemcached/callback.h>
+#include <libmemcached/dump.h>
+#include <libmemcached/get.h>
+#include <libmemcached/result.h>
+#include <libmemcached/server.h>
+#include <libmemcached/storage.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,23 +102,21 @@ struct memcached_st {
   uint32_t cursor_server;
   int cached_errno;
   struct {
+    bool auto_eject_hosts:1;
+    bool binary_protocol:1;
+    bool buffer_requests:1;
+    bool hash_with_prefix_key:1;
+    bool ketama_weighted:1;
     bool no_block:1;
-    bool tcp_nodelay:1;
+    bool no_reply:1;
+    bool randomize_replica_read:1;
     bool reuse_memory:1;
-    bool use_md5:1;
-    bool use_crc:1;
-    bool use_cache_lookups:1;
     bool support_cas:1;
-    bool buffer_requests:1;
+    bool tcp_nodelay:1;
+    bool use_cache_lookups:1;
     bool use_sort_hosts:1;
-    bool verify_key:1;
-    bool ketama_weighted:1;
-    bool binary_protocol:1;
-    bool hash_with_prefix_key:1;
-    bool no_reply:1;
     bool use_udp:1;
-    bool auto_eject_hosts:1;
-    bool randomize_replica_read:1;
+    bool verify_key:1;
   } flags;
   int32_t poll_timeout;
   int32_t connect_timeout;
@@ -127,7 +127,8 @@ struct memcached_st {
   void *user_data;
   time_t next_distribution_rebuild;
   size_t prefix_key_length;
-  memcached_hash_t hash_continuum;
+  uint32_t number_of_replicas;
+  memcached_hash_t distribution_hash;
   memcached_result_st result;
   memcached_continuum_item_st *continuum;
   memcached_clone_fn on_clone;
@@ -138,9 +139,8 @@ struct memcached_st {
   memcached_calloc_fn call_calloc;
   memcached_trigger_key_fn get_key_failure;
   memcached_trigger_delete_key_fn delete_trigger;
-  char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
-  uint32_t number_of_replicas;
   memcached_callback_st *callbacks;
+  char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
 };
 
 LIBMEMCACHED_API
@@ -173,14 +173,14 @@ memcached_return_t memcached_decrement(memcached_st *ptr,
                                      uint64_t *value);
 
 LIBMEMCACHED_API
-memcached_return_t memcached_increment_by_key(memcached_st *ptr, 
+memcached_return_t memcached_increment_by_key(memcached_st *ptr,
                                             const char *master_key, size_t master_key_length,
                                             const char *key, size_t key_length,
                                             uint64_t offset,
                                             uint64_t *value);
 
 LIBMEMCACHED_API
-memcached_return_t memcached_decrement_by_key(memcached_st *ptr, 
+memcached_return_t memcached_decrement_by_key(memcached_st *ptr,
                                             const char *master_key, size_t master_key_length,
                                             const char *key, size_t key_length,
                                             uint64_t offset,
@@ -258,28 +258,28 @@ memcached_return_t memcached_flush_buffers(memcached_st *mem);
 
 LIBMEMCACHED_API
 memcached_return_t memcached_server_add_udp(memcached_st *ptr,
-                                          const char *hostname,
-                                          in_port_t port);
+                                            const char *hostname,
+                                            in_port_t port);
 LIBMEMCACHED_API
 memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr,
-                                                  const char *filename);
+                                                    const char *filename);
 LIBMEMCACHED_API
-memcached_return_t memcached_server_add(memcached_st *ptr, 
+memcached_return_t memcached_server_add(memcached_st *ptr,
                                         const char *hostname, in_port_t port);
 
 LIBMEMCACHED_API
 memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr,
-                                                      const char *hostname,
-                                                      in_port_t port,
-                                                      uint32_t weight);
+                                                        const char *hostname,
+                                                        in_port_t port,
+                                                        uint32_t weight);
 LIBMEMCACHED_API
 memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_st *ptr,
-                                                              const char *filename,
-                                                              uint32_t weight);
+                                                                const char *filename,
+                                                                uint32_t weight);
 LIBMEMCACHED_API
 memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, const char *hostname,
-                                                  in_port_t port,
-                                                  uint32_t weight);
+                                                    in_port_t port,
+                                                    uint32_t weight);
 LIBMEMCACHED_API
 void memcached_server_list_free(memcached_server_st *ptr);
 
@@ -322,10 +322,6 @@ memcached_return_t memcached_fetch_execute(memcached_st *ptr,
                                            void *context,
                                            unsigned int number_of_callbacks);
 
-LIBMEMCACHED_API
-memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *function, void *context, uint32_t number_of_callbacks);
-
-
 LIBMEMCACHED_API
 memcached_return_t memcached_set_memory_allocators(memcached_st *ptr,
                                                    memcached_malloc_fn mem_malloc,