projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of latest - callback commit needed
[m6w6/libmemcached]
/
lib
/
common.h
diff --git
a/lib/common.h
b/lib/common.h
index 73913c1c05e98f187ddee33687470b4821db4f4c..c87beb60810ff5ad968da226c4a6144ba0e44ea2 100644
(file)
--- a/
lib/common.h
+++ b/
lib/common.h
@@
-17,8
+17,23
@@
#include <unistd.h>
#include <limits.h>
#include <assert.h>
#include <unistd.h>
#include <limits.h>
#include <assert.h>
-#include <time.h>
#include <errno.h>
#include <errno.h>
+#include <fcntl.h>
+#include <sys/un.h>
+#include <netinet/tcp.h>
+#include "libmemcached_config.h"
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <memcached.h>
#include <memcached.h>
@@
-35,6
+50,10
@@
#include "libmemcached_probes.h"
#define MEMCACHED_BLOCK_SIZE 1024
#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),
typedef enum {
MEM_NO_BLOCK= (1 << 0),
@@
-45,28
+64,32
@@
typedef enum {
MEM_USE_CRC= (1 << 5),
MEM_USE_CACHE_LOOKUPS= (1 << 6),
MEM_SUPPORT_CAS= (1 << 7),
MEM_USE_CRC= (1 << 5),
MEM_USE_CACHE_LOOKUPS= (1 << 6),
MEM_SUPPORT_CAS= (1 << 7),
+ MEM_BUFFER_REQUESTS= (1 << 8),
} 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_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,
memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key);
memcached_return memcached_response(memcached_st *ptr,
char *buffer, size_t buffer_length,
+ memcached_result_st *result,
unsigned int server_key);
unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_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--
+#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
/* String Struct */
/* 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
+#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,
memcached_string_st *memcached_string_create(memcached_st *ptr,
memcached_string_st *string,
@@
-83,7
+106,11
@@
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_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,
+ char *buffer,
+ memcached_result_st *result,
+ unsigned int server_key);
+void server_list_free(memcached_st *ptr, memcached_server_st *servers);
#endif /* __COMMON_H__ */
#endif /* __COMMON_H__ */