X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=f5378d9a411422c6f6829d5ddabb3be0100d8ca0;hb=e1e4e3a22a3a6967ef6b33695f9a800ab5cd4b2e;hp=3e8cea8857d1489001ab0d8859ae812915da3945;hpb=3e08799c9d80873a66e7e0b08c6524b0d5c47c28;p=awesomized%2Flibmemcached diff --git a/include/memcached.h b/include/memcached.h index 3e8cea88..f5378d9a 100644 --- a/include/memcached.h +++ b/include/memcached.h @@ -31,15 +31,15 @@ extern "C" { typedef struct memcached_st memcached_st; typedef struct memcached_stat_st memcached_stat_st; typedef struct memcached_string_st memcached_string_st; -typedef struct memcached_host_st memcached_host_st; +typedef struct memcached_server_st memcached_server_st; #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 WATCHPOINT printf("WATCHPOINT %s:%d\n", __FILE__, __LINE__);fflush(stdout); +//#define MEMCACHED_MAX_BUFFER 8196 +#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN*4 typedef enum { MEMCACHED_SUCCESS, @@ -57,21 +57,38 @@ typedef enum { MEMCACHED_DATA_EXISTS, MEMCACHED_DATA_DOES_NOT_EXIST, MEMCACHED_NOTSTORED, + MEMCACHED_STORED, MEMCACHED_NOTFOUND, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_PARTIAL_READ, MEMCACHED_SOME_ERRORS, + MEMCACHED_NO_SERVERS, + 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_TCP_NODELAY, + MEMCACHED_BEHAVIOR_MD5_HASHING, + MEMCACHED_BEHAVIOR_KETAMA, +} memcached_behavior; + typedef enum { MEMCACHED_NOT_ALLOCATED= 0, MEMCACHED_ALLOCATED= 1, } memcached_allocated; -struct memcached_host_st { +struct memcached_server_st { char *hostname; unsigned int port; int fd; + unsigned int stack_responses; + unsigned int cursor_active; }; struct memcached_stat_st { @@ -112,28 +129,24 @@ struct memcached_string_st { struct memcached_st { memcached_allocated is_allocated; - memcached_host_st *hosts; + memcached_server_st *hosts; unsigned int number_of_hosts; unsigned int cursor_server; + char read_buffer[MEMCACHED_MAX_BUFFER]; + size_t read_buffer_length; + char *read_ptr; + char write_buffer[MEMCACHED_MAX_BUFFER]; + size_t write_buffer_offset; char connected; + int my_errno; + unsigned long long flags; + memcached_return warning; /* Future Use */ }; /* Public API */ -memcached_st *memcached_init(memcached_st *ptr); -void memcached_deinit(memcached_st *ptr); +memcached_st *memcached_create(memcached_st *ptr); +void memcached_free(memcached_st *ptr); -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); -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); -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); memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length, time_t expiration); memcached_return memcached_increment(memcached_st *ptr, @@ -145,11 +158,30 @@ memcached_return memcached_decrement(memcached_st *ptr, unsigned int offset, unsigned int *value); memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error); -memcached_return memcached_stat_hostname(memcached_stat_st *stat, char *args, - char *hostname, unsigned int port); +memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, + char *hostname, unsigned int port); memcached_return memcached_flush(memcached_st *ptr, time_t expiration); 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, + char *value, size_t value_length, + time_t expiration, + uint16_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); +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); + +/* Get functions */ char *memcached_get(memcached_st *ptr, char *key, size_t key_length, size_t *value_length, uint16_t *flags, @@ -160,26 +192,31 @@ memcached_return memcached_mget(memcached_st *ptr, char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, size_t *value_length, uint16_t *flags, memcached_return *error); + +/* Server Public functions */ +#define memcached_server_count(A) A->number_of_hosts +#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); -char *memcached_strerror(memcached_st *ptr, memcached_return rc); +void memcached_server_list_free(memcached_server_st *ptr); +memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list); -/* 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); -memcached_return memcached_stat_get_value(memcached_stat_st *stat, char *key, - char *value, size_t value_length); -char ** memcached_stat_get_keys(memcached_stat_st *stat, memcached_return *error); +memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, + char *hostname, unsigned int port, + memcached_return *error); +unsigned int memcached_server_list_count(memcached_server_st *ptr); +memcached_server_st *memcached_servers_parse(char *server_strings); /* 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_init(memcached_st *ptr, size_t initial_size); +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); @@ -189,6 +226,19 @@ size_t memcached_string_backspace(memcached_st *ptr, memcached_string_st *string memcached_return memcached_string_reset(memcached_st *ptr, memcached_string_st *string); void memcached_string_free(memcached_st *ptr, memcached_string_st *string); +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); + +/* 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); + + #ifdef __cplusplus } #endif