X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=a705550ed9edd73d821eff47c3b2f03b1b06e8b6;hb=8f27b5fa655ee8ebf7020ef91001cbe56d0b6537;hp=594b4ade3b686f49b78c59d3253f489217eed06d;hpb=a7db49095a0ed78a1418003a00eef6d483c0d854;p=awesomized%2Flibmemcached diff --git a/include/memcached.h b/include/memcached.h index 594b4ade..a705550e 100644 --- a/include/memcached.h +++ b/include/memcached.h @@ -10,19 +10,8 @@ #ifndef __MEMCACHED_H__ #define __MEMCACHED_H__ -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #ifdef __cplusplus extern "C" { @@ -39,7 +28,7 @@ typedef struct memcached_server_st memcached_server_st; #define HUGE_STRING_LEN 8196 #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */ //#define MEMCACHED_MAX_BUFFER 8196 -#define MEMCACHED_MAX_BUFFER 8196 +#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN typedef enum { MEMCACHED_SUCCESS, @@ -66,14 +55,18 @@ typedef enum { MEMCACHED_END, MEMCACHED_DELETED, MEMCACHED_VALUE, + MEMCACHED_STAT, + MEMCACHED_ERRNO, MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ } memcached_return; typedef enum { MEMCACHED_BEHAVIOR_NO_BLOCK, - MEMCACHED_BEHAVIOR_BLOCK, MEMCACHED_BEHAVIOR_TCP_NODELAY, - MEMCACHED_BEHAVIOR_TCP_DELAY, + MEMCACHED_BEHAVIOR_MD5_HASHING, + MEMCACHED_BEHAVIOR_KETAMA, + MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, + MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, } memcached_behavior; typedef enum { @@ -85,6 +78,8 @@ struct memcached_server_st { char *hostname; unsigned int port; int fd; + unsigned int stack_responses; + unsigned int cursor_active; }; struct memcached_stat_st { @@ -116,10 +111,6 @@ struct memcached_stat_st { unsigned int limit_maxbytes; }; -#define MEM_NO_BLOCK (1 << 0) -#define MEM_TCP_NODELAY (1 << 1) -#define MEM_REUSE_MEMORY (1 << 2) - struct memcached_string_st { char *string; char *end; @@ -139,8 +130,9 @@ struct memcached_st { size_t write_buffer_offset; char connected; int my_errno; - unsigned int stack_responses; unsigned long long flags; + int send_size; + int recv_size; memcached_return warning; /* Future Use */ }; @@ -166,6 +158,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity); void memcached_quit(memcached_st *ptr); char *memcached_strerror(memcached_st *ptr, memcached_return rc); memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, void *data); +unsigned long long memcached_behavior_get(memcached_st *ptr, memcached_behavior flag); /* All of the functions for adding data to the server */ memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, @@ -198,50 +191,30 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, #define memcached_server_name(A,B) B.hostname #define memcached_server_port(A,B) B.port #define memcached_server_list(A) A->hosts +#define memcached_server_response_count(A,B) A->hosts[B].stack_responses memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port); +void memcached_server_list_free(memcached_server_st *ptr); +memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list); memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, char *hostname, unsigned int port, memcached_return *error); -void memcached_server_list_free(memcached_server_st *ptr); -memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list); unsigned int memcached_server_list_count(memcached_server_st *ptr); +memcached_server_st *memcached_servers_parse(char *server_strings); -/* These are all private, do not use. */ -memcached_return memcached_connect(memcached_st *ptr); -memcached_return memcached_response(memcached_st *ptr, - char *buffer, size_t buffer_length, - unsigned int server_key); -unsigned int memcached_generate_hash(char *key, size_t key_length); char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, char *key, memcached_return *error); char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, memcached_return *error); - -/* 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 - -memcached_string_st *memcached_string_create(memcached_st *ptr, size_t initial_size); -memcached_return memcached_string_append_character(memcached_st *ptr, - memcached_string_st *string, - char character); -memcached_return memcached_string_append(memcached_st *ptr, 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); - /* Some personal debugging functions */ #define WATCHPOINT printf("\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout); #define WATCHPOINT_ERROR(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout); -#define WATCHPOINT_STRING(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, A);fflush(stdout); -#define WATCHPOINT_NUMBER(A) printf("\nWATCHPOINT %s:%d %d\n", __FILE__, __LINE__, A);fflush(stdout); -#define WATCHPOINT_ERRNO(A) printf("\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, strerror(A));A= 0;fflush(stdout); +#define WATCHPOINT_STRING(A) printf("\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout); +#define WATCHPOINT_NUMBER(A) printf("\nWATCHPOINT %s:%d (%s) %d\n", __FILE__, __LINE__,__func__,A);fflush(stdout); +#define WATCHPOINT_ERRNO(A) printf("\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout); #ifdef __cplusplus