Fixes for previous merges (and additional file added for murmur)

[awesomized/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index 419f1949090e9eef74bfbf3dba9ff674955f0eb2..3178866d747db5177301c60562773d30c57e433f 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -105,6 +105,7 @@ typedef enum {
   MEMCACHED_BEHAVIOR_SORT_HOSTS,
   MEMCACHED_BEHAVIOR_VERIFY_KEY,
   MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
+  MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
 } memcached_behavior;
 
 typedef enum {
@@ -126,6 +127,7 @@ typedef enum {
   MEMCACHED_HASH_FNV1A_32,
   MEMCACHED_HASH_KETAMA,
   MEMCACHED_HASH_HSIEH,
+  MEMCACHED_HASH_MURMUR,
 } memcached_hash;
 
 typedef enum {
@@ -160,6 +162,7 @@ struct memcached_server_st {
   uint8_t minor_version;
   uint8_t micro_version;
   uint16_t count;
+  time_t next_retry;
   memcached_st *root;
 };
 
@@ -221,6 +224,7 @@ struct memcached_st {
   int recv_size;
   int32_t poll_timeout;
   int32_t connect_timeout;
+  int32_t retry_timeout;
   memcached_result_st result;
   memcached_hash hash;
   memcached_server_distribution distribution;
@@ -263,7 +267,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
 void memcached_quit(memcached_st *ptr);
 char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, void *data);
-unsigned long long memcached_behavior_get(memcached_st *ptr, memcached_behavior flag);
+uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag);
 
 /* All of the functions for adding data to the server */
 memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length,