X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=5458974170e997ffaf1a78899c44de4970baf3f7;hb=85a0b3bc944db78c070961cd3a48b8e34dcef8a4;hp=ba8b650c43c71c0cf92b14eee925a0d6d054f263;hpb=a9444a068407eb1e60107b4748c8e6a02a71fde6;p=awesomized%2Flibmemcached diff --git a/include/memcached.h b/include/memcached.h index ba8b650c..54589741 100644 --- a/include/memcached.h +++ b/include/memcached.h @@ -11,7 +11,7 @@ #define __MEMCACHED_H__ #include -#include +#include #include #include @@ -19,23 +19,20 @@ extern "C" { #endif -typedef struct memcached_st memcached_st; -typedef struct memcached_stat_st memcached_stat_st; -typedef struct memcached_result_st memcached_result_st; -typedef struct memcached_string_st memcached_string_st; -typedef struct memcached_server_st memcached_server_st; +/* These are Private and should not be used by applications */ +#define MEMCACHED_VERSION_STRING_LENGTH 12 -#define MEMCACHED_VERSION_STRING 12 +/* Public defines */ #define MEMCACHED_DEFAULT_PORT 11211 -#define MEMCACHED_DEFAULT_COMMAND_SIZE 350 -#define SMALL_STRING_LEN 1024 -#define HUGE_STRING_LEN 8196 #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */ -#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN +#define MEMCACHED_MAX_BUFFER 8196 #define MEMCACHED_MAX_HOST_LENGTH 64 #define MEMCACHED_WHEEL_SIZE 1024 #define MEMCACHED_STRIDE 4 -#define MEMCACHED_DEFAULT_TIMEOUT 800 +#define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX + +/* string value */ +#define LIBMEMCACHED_VERSION_STRING "0.17" typedef enum { MEMCACHED_SUCCESS, @@ -68,9 +65,23 @@ typedef enum { MEMCACHED_NOT_SUPPORTED, MEMCACHED_NO_KEY_PROVIDED, MEMCACHED_FETCH_NOTFINISHED, + MEMCACHED_TIMEOUT, + MEMCACHED_BUFFERED, + MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ } memcached_return; +typedef struct memcached_st memcached_st; +typedef struct memcached_stat_st memcached_stat_st; +typedef struct memcached_result_st memcached_result_st; +typedef struct memcached_string_st memcached_string_st; +typedef struct memcached_server_st memcached_server_st; +typedef memcached_return (*memcached_clone_func)(memcached_st *parent, memcached_st *clone); +typedef memcached_return (*memcached_cleanup_func)(memcached_st *ptr); +typedef void (*memcached_free_function)(memcached_st *ptr, void *mem); +typedef void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size); +typedef void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, const size_t size); + typedef enum { MEMCACHED_DISTRIBUTION_MODULA, MEMCACHED_DISTRIBUTION_CONSISTENT, @@ -87,8 +98,22 @@ typedef enum { MEMCACHED_BEHAVIOR_SUPPORT_CAS, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, MEMCACHED_BEHAVIOR_DISTRIBUTION, + MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, + MEMCACHED_BEHAVIOR_USER_DATA, + MEMCACHED_BEHAVIOR_SORT_HOSTS, + MEMCACHED_BEHAVIOR_VERIFY_KEY, + MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, } memcached_behavior; +typedef enum { + MEMCACHED_CALLBACK_USER_DATA, + MEMCACHED_CALLBACK_CLEANUP_FUNCTION, + MEMCACHED_CALLBACK_CLONE_FUNCTION, + MEMCACHED_CALLBACK_MALLOC_FUNCTION, + MEMCACHED_CALLBACK_REALLOC_FUNCTION, + MEMCACHED_CALLBACK_FREE_FUNCTION, +} memcached_callback; + typedef enum { MEMCACHED_HASH_DEFAULT= 0, MEMCACHED_HASH_MD5, @@ -118,12 +143,12 @@ struct memcached_server_st { char hostname[MEMCACHED_MAX_HOST_LENGTH]; unsigned int port; int fd; - unsigned int stack_responses; + int cached_errno; unsigned int cursor_active; char write_buffer[MEMCACHED_MAX_BUFFER]; size_t write_buffer_offset; - char *write_ptr; char read_buffer[MEMCACHED_MAX_BUFFER]; + size_t read_data_length; size_t read_buffer_length; char *read_ptr; memcached_allocated sockaddr_inited; @@ -133,6 +158,7 @@ struct memcached_server_st { uint8_t minor_version; uint8_t micro_version; uint16_t count; + memcached_st *root; }; struct memcached_stat_st { @@ -147,7 +173,7 @@ struct memcached_stat_st { uint32_t rusage_system_microseconds; uint32_t curr_items; uint32_t total_items; - uint32_t limit_maxbytes; + uint64_t limit_maxbytes; uint32_t curr_connections; uint32_t total_connections; uint32_t connection_structures; @@ -159,7 +185,7 @@ struct memcached_stat_st { uint64_t evictions; uint64_t bytes_read; uint64_t bytes_written; - char version[MEMCACHED_VERSION_STRING]; + char version[MEMCACHED_VERSION_STRING_LENGTH]; }; struct memcached_string_st { @@ -177,8 +203,9 @@ struct memcached_result_st { char key[MEMCACHED_MAX_KEY]; size_t key_length; memcached_string_st value; - uint16_t flags; + uint32_t flags; uint64_t cas; + /* Add result callback function */ }; struct memcached_st { @@ -186,21 +213,31 @@ struct memcached_st { memcached_server_st *hosts; unsigned int number_of_hosts; unsigned int cursor_server; - char connected; int cached_errno; - unsigned long long flags; + uint32_t flags; int send_size; int recv_size; int32_t poll_timeout; - memcached_string_st result_buffer; + int32_t connect_timeout; + memcached_result_st result; memcached_hash hash; memcached_server_distribution distribution; + void *user_data; unsigned int wheel[MEMCACHED_WHEEL_SIZE]; + memcached_clone_func on_clone; + memcached_cleanup_func on_cleanup; + memcached_free_function call_free; + memcached_malloc_function call_malloc; + memcached_realloc_function call_realloc; +#ifdef NOT_USED /* Future Use */ uint8_t replicas; - memcached_return warning; /* Future Use */ + memcached_return warning; +#endif }; /* Public API */ +const char * memcached_lib_version(void); + memcached_st *memcached_create(memcached_st *ptr); void memcached_free(memcached_st *ptr); memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr); @@ -230,42 +267,42 @@ unsigned long long memcached_behavior_get(memcached_st *ptr, memcached_behavior memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_add(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_replace(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_append(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_prepend(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_cas(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags, + uint32_t flags, uint64_t cas); /* Get functions */ char *memcached_get(memcached_st *ptr, char *key, size_t key_length, size_t *value_length, - uint16_t *flags, + uint32_t *flags, memcached_return *error); memcached_return memcached_mget(memcached_st *ptr, char **keys, size_t *key_length, unsigned int number_of_keys); char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, - size_t *value_length, uint16_t *flags, + size_t *value_length, uint32_t *flags, memcached_return *error); memcached_result_st *memcached_fetch_result(memcached_st *ptr, memcached_result_st *result, @@ -276,7 +313,8 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr, #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 +#define memcached_server_response_count(A) (A)->cursor_active + memcached_return memcached_server_add_udp(memcached_st *ptr, char *hostname, @@ -303,7 +341,7 @@ char *memcached_get_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, size_t *value_length, - uint16_t *flags, + uint32_t *flags, memcached_return *error); memcached_return memcached_mget_by_key(memcached_st *ptr, @@ -316,59 +354,76 @@ memcached_return memcached_set_by_key(memcached_st *ptr, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_add_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_replace_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_prepend_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_append_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags); + uint32_t flags); memcached_return memcached_cas_by_key(memcached_st *ptr, char *master_key, size_t master_key_length, char *key, size_t key_length, char *value, size_t value_length, time_t expiration, - uint16_t flags, + uint32_t flags, uint64_t cas); +memcached_return memcached_delete_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char *key, size_t key_length, + time_t expiration); + +memcached_return memcached_fetch_execute(memcached_st *ptr, + unsigned int (*callback[])(memcached_st *ptr, memcached_result_st *result, void *context), + void *context, + unsigned int number_of_callbacks + ); + +memcached_return memcached_callback_set(memcached_st *ptr, + memcached_callback flag, + void *data); +void *memcached_callback_get(memcached_st *ptr, + memcached_callback flag, + memcached_return *error); /* Result Struct */ void memcached_result_free(memcached_result_st *result); memcached_result_st *memcached_result_create(memcached_st *ptr, memcached_result_st *result); -#define memcached_result_key_value(A) A->key -#define memcached_result_key_length(A) A->key_length +#define memcached_result_key_value(A) (A)->key +#define memcached_result_key_length(A) (A)->key_length #ifdef FIX -#define memcached_result_value(A) memcached_string_value(A->value) -#define memcached_result_length(A) memcached_string_length(A->value) +#define memcached_result_value(A) memcached_string_value((A)->value) +#define memcached_result_length(A) memcached_string_length((A)->value) #else char *memcached_result_value(memcached_result_st *ptr); size_t memcached_result_length(memcached_result_st *ptr); #endif -#define memcached_result_flags(A) A->flags -#define memcached_result_cas(A) A->cas +#define memcached_result_flags(A) (A)->flags +#define memcached_result_cas(A) (A)->cas #ifndef __WATCHPOINT_H__ @@ -378,25 +433,18 @@ size_t memcached_result_length(memcached_result_st *ptr); #define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout); #ifdef __MEMCACHED_H__ #define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout); +#define WATCHPOINT_IFERROR(A) if(A != MEMCACHED_SUCCESS)fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout); #endif #define WATCHPOINT_STRING(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout); #define WATCHPOINT_STRING_LENGTH(A,B) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %.*s\n", __FILE__, __LINE__,__func__,(int)B,A);fflush(stdout); #define WATCHPOINT_NUMBER(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %zu\n", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout); -#define WATCHPOINT_ERRNO(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));A= 0;fflush(stdout); +#define WATCHPOINT_ERRNO(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));fflush(stdout); #define WATCHPOINT_ASSERT(A) assert((A)); #else -/* -#define WATCHPOINT { 1; }; -#define WATCHPOINT_ERROR(A) { 1; }; -#define WATCHPOINT_STRING(A) { 1; }; -#define WATCHPOINT_STRING_LENGTH(A,B) { 1; }; -#define WATCHPOINT_NUMBER(A) { 1; }; -#define WATCHPOINT_ERRNO(A) { 1; }; -#define WATCHPOINT_ASSERT(A) { 1; }; -*/ #define WATCHPOINT #ifdef __MEMCACHED_H__ #define WATCHPOINT_ERROR(A) +#define WATCHPOINT_IFERROR(A) #endif #define WATCHPOINT_STRING(A) #define WATCHPOINT_NUMBER(A)