Committing work for next release (got to do something over lunch aye?)

[m6w6/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index c16db98ac2c00cf277db7986b5a587d86be5b23f..c49b3b9614783e834f49f25a6ee1d3d81d33fef5 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -19,6 +19,10 @@
 #include <assert.h>
 #include <time.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <sys/un.h>
+#include <netinet/tcp.h>
+
 
 
 #include <memcached.h>
@@ -34,6 +38,8 @@
 
 #include "libmemcached_probes.h"
 
+#define MEMCACHED_BLOCK_SIZE 1024
+
 typedef enum {
   MEM_NO_BLOCK= (1 << 0),
   MEM_TCP_NODELAY= (1 << 1),
@@ -41,39 +47,50 @@ typedef enum {
   MEM_USE_MD5= (1 << 3),
   MEM_USE_KETAMA= (1 << 4),
   MEM_USE_CRC= (1 << 5),
+  MEM_USE_CACHE_LOOKUPS= (1 << 6),
+  MEM_SUPPORT_CAS= (1 << 7),
 } memcached_flags;
 
 /* Hashing algo */
 void md5_signature(unsigned char *key, unsigned int length, unsigned char *result);
 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, 
                                     char *buffer, size_t buffer_length,
                                     unsigned int server_key);
 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);
+void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t io_death);
 
 #define memcached_server_response_increment(A,B) A->hosts[B].stack_responses++
 #define memcached_server_response_decrement(A,B) A->hosts[B].stack_responses--
 
 /* String Struct */
-#define memcached_string_length(A, B) (size_t)(B->end - B->string)
-#define memcached_string_size(A, B) B->current_size
-#define memcached_string_value(A, B) B->string
+#define memcached_string_length(A) (size_t)(A->end - A->string)
+#define memcached_string_set_length(A, B) A->end= A->string + B
+#define memcached_string_size(A) A->current_size
+#define memcached_string_value(A) A->string
 
 memcached_string_st *memcached_string_create(memcached_st *ptr, 
                                              memcached_string_st *string, 
                                              size_t initial_size);
-memcached_return memcached_string_append_character(memcached_st *ptr, 
-                                                   memcached_string_st *string, 
+memcached_return memcached_string_check(memcached_string_st *string, size_t need);
+char *memcached_string_c_copy(memcached_string_st *string);
+memcached_return memcached_string_append_character(memcached_string_st *string, 
                                                    char character);
-memcached_return memcached_string_append(memcached_st *ptr, memcached_string_st *string,
+memcached_return memcached_string_append(memcached_string_st *string,
                                          char *value, size_t length);
-size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string, size_t remove);
-memcached_return memcached_string_reset(memcached_st *ptr, memcached_string_st *string);
-void memcached_string_free(memcached_st *ptr, 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 memcached_finish_server(memcached_st *ptr, unsigned int server_key);
+void memcached_finish(memcached_st *ptr);
+
 
 
 #endif /* __COMMON_H__ */