Added behavior method around testing of keys.

[m6w6/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index 268109b31a2969d29fe8fb0a612280a871c3f1af..9e4cb5e17fb4346b98134f7ca8fa6354fdf8e5f0 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <sys/un.h>
 #include <netinet/tcp.h>
-#include "libmemcached_config.h"
+#include <libmemcached_config.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -65,6 +65,8 @@ typedef enum {
   MEM_USE_CACHE_LOOKUPS= (1 << 6),
   MEM_SUPPORT_CAS= (1 << 7),
   MEM_BUFFER_REQUESTS= (1 << 8),
+  MEM_USE_SORT_HOSTS= (1 << 9),
+  MEM_VERIFY_KEY= (1 << 10),
 } memcached_flags;
 
 /* Hashing algo */
@@ -73,17 +75,16 @@ uint32_t hash_crc32(const char *data,
                     size_t data_len);
 uint32_t hsieh_hash(char *key, size_t key_length);
 
-memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key);
-memcached_return memcached_response(memcached_st *ptr, 
+memcached_return memcached_connect(memcached_server_st *ptr);
+memcached_return memcached_response(memcached_server_st *ptr, 
                                     char *buffer, size_t buffer_length,
-                                    memcached_result_st *result,
-                                    unsigned int server_key);
+                                    memcached_result_st *result);
 unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length);
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t io_death);
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
 
-#define memcached_server_response_increment(A,B) A->hosts[B].cursor_active++
-#define memcached_server_response_decrement(A,B) A->hosts[B].cursor_active--
-#define memcached_server_response_reset(A,B) A->hosts[B].cursor_active=0
+#define memcached_server_response_increment(A) (A)->cursor_active++
+#define memcached_server_response_decrement(A) (A)->cursor_active--
+#define memcached_server_response_reset(A) (A)->cursor_active=0
 
 /* String Struct */
 #define memcached_string_length(A) (size_t)((A)->end - (A)->string)
@@ -103,13 +104,15 @@ memcached_return memcached_string_append(memcached_string_st *string,
 size_t memcached_string_backspace(memcached_string_st *string, size_t remove);
 memcached_return memcached_string_reset(memcached_string_st *string);
 void memcached_string_free(memcached_string_st *string);
-memcached_return memcached_do(memcached_st *ptr, unsigned int server_key, char *commmand, 
-                              size_t command_length, char with_flush);
+memcached_return memcached_do(memcached_server_st *ptr, char *commmand, 
+                              size_t command_length, uint8_t with_flush);
 memcached_return memcached_version(memcached_st *ptr);
-memcached_return value_fetch(memcached_st *ptr,
+memcached_return value_fetch(memcached_server_st *ptr,
                              char *buffer,
-                             memcached_result_st *result,
-                             unsigned int server_key);
+                             memcached_result_st *result);
+void server_list_free(memcached_st *ptr, memcached_server_st *servers);
 
+memcached_return memcachd_key_test(char **keys, size_t *key_length, 
+                                   unsigned int number_of_keys);
 
 #endif /* __COMMON_H__ */