Restructuring for new memcached_result_st.

[awesomized/libmemcached] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index f922fee15680dabe42c1acde41d6e239feb5c481..31a65ea9aad0fa490cc3a7d013faf4176d4844c2 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -5,8 +5,24 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <limits.h>
+#include <assert.h>
+#include <time.h>
+#include <errno.h>
+
+
 #include <memcached.h>
-#include <memcached_io.h>
+#include "memcached_io.h"
 
 #include <libmemcached_config.h>
 
@@ -18,19 +34,62 @@
 
 #include "libmemcached_probes.h"
 
+#define MEMCACHED_BLOCK_SIZE 1024
+
 typedef enum {
   MEM_NO_BLOCK= (1 << 0),
   MEM_TCP_NODELAY= (1 << 1),
   MEM_REUSE_MEMORY= (1 << 2),
   MEM_USE_MD5= (1 << 3),
   MEM_USE_KETAMA= (1 << 4),
+  MEM_USE_CRC= (1 << 5),
 } 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);
+
 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);
+
+#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) (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_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_string_st *string,
+                                         char *value, size_t length);
+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);
+
+/* Result Struct */
+#define memcache_result_key_value(A) memcached_string_value(A->key)
+#define memcache_result_key_length(A) memcached_string_length(A->key)
+#define memcache_result_result_value(A) memcached_string_value(A->value)
+#define memcache_result_result_length(A) memcached_string_length(A->value)
+#define memcache_result_flags(A) A->flags
+#define memcache_result_cas(A) A->cas
+
+memcached_result_st *memcached_result_create(memcached_st *ptr, 
+                                             memcached_result_st *result);
+void memcached_result_free(memcached_result_st *result);
+
 
 #endif /* __COMMON_H__ */