Move public memcached_version declaration from lib/common.h to include/memcached.h.

[awesomized/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index 395b80ef83730863c5fbe9d248bdf498fa9a41a6..f436cc025d0af6fbd52ce2a97c6df7f15a9c2ec5 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 #include <sys/un.h>
 #include <netinet/tcp.h>
-#include "libmemcached_config.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -41,6 +40,19 @@
 
 #include <libmemcached_config.h>
 
+#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
+#define __builtin_expect(x, expected_value) (x)
+
+#define likely(x)       __builtin_expect((x),1)
+#define unlikely(x)     __builtin_expect((x),0)
+
+#else
+
+#define likely(x)       if((x))
+#define unlikely(x)     if((x))
+
+#endif
+
 #ifdef HAVE_DTRACE
 #define _DTRACE_VERSION 1
 #else
@@ -50,6 +62,10 @@
 #include "libmemcached_probes.h"
 
 #define MEMCACHED_BLOCK_SIZE 1024
+#define MEMCACHED_DEFAULT_COMMAND_SIZE 350
+#define SMALL_STRING_LEN 1024
+#define HUGE_STRING_LEN 8196
+
 
 typedef enum {
   MEM_NO_BLOCK= (1 << 0),
@@ -60,6 +76,9 @@ typedef enum {
   MEM_USE_CRC= (1 << 5),
   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 */
@@ -68,17 +87,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)
@@ -98,13 +116,14 @@ 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_version(memcached_st *ptr);
-memcached_return value_fetch(memcached_st *ptr,
+memcached_return memcached_do(memcached_server_st *ptr, char *commmand, 
+                              size_t command_length, uint8_t with_flush);
+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__ */