X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=a859b22117d4f2ae4d7484ed5ded2902521aae88;hb=1207354f3bcebf2bb489ec0e56152918d56be81e;hp=313266aa13b30e05608cb28c23c7d66fb75c7244;hpb=c63f3c2633dbda43dd4cf151edd586a279fc8cbf;p=awesomized%2Flibmemcached diff --git a/include/memcached.h b/include/memcached.h index 313266aa..a859b221 100644 --- a/include/memcached.h +++ b/include/memcached.h @@ -12,6 +12,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -28,7 +29,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 HUGE_STRING_LEN*4 +#define MEMCACHED_MAX_BUFFER HUGE_STRING_LEN typedef enum { MEMCACHED_SUCCESS, @@ -57,16 +58,38 @@ typedef enum { MEMCACHED_VALUE, MEMCACHED_STAT, MEMCACHED_ERRNO, + MEMCACHED_FAIL_UNIX_SOCKET, + MEMCACHED_NOT_SUPPORTED, 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_HASH, MEMCACHED_BEHAVIOR_KETAMA, + MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, + MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, } memcached_behavior; +typedef enum { + MEMCACHED_HASH_DEFAULT= 0, + MEMCACHED_HASH_MD5, + MEMCACHED_HASH_CRC, + MEMCACHED_HASH_FNV1_64, + MEMCACHED_HASH_FNV1A_64, + MEMCACHED_HASH_FNV1_32, + MEMCACHED_HASH_FNV1A_32, + MEMCACHED_HASH_KETAMA, +} memcached_hash; + +typedef enum { + MEMCACHED_CONNECTION_UNKNOWN, + MEMCACHED_CONNECTION_TCP, + MEMCACHED_CONNECTION_UDP, + MEMCACHED_CONNECTION_UNIX_SOCKET, +} memcached_connection; + typedef enum { MEMCACHED_NOT_ALLOCATED= 0, MEMCACHED_ALLOCATED= 1, @@ -78,6 +101,7 @@ struct memcached_server_st { int fd; unsigned int stack_responses; unsigned int cursor_active; + memcached_connection type; }; struct memcached_stat_st { @@ -129,12 +153,16 @@ struct memcached_st { char connected; int my_errno; unsigned long long flags; + int send_size; + int recv_size; + memcached_hash hash; memcached_return warning; /* Future Use */ }; /* Public API */ memcached_st *memcached_create(memcached_st *ptr); void memcached_free(memcached_st *ptr); +memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr); memcached_return memcached_delete(memcached_st *ptr, char *key, size_t key_length, time_t expiration); @@ -189,6 +217,8 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, #define memcached_server_list(A) A->hosts #define memcached_server_response_count(A,B) A->hosts[B].stack_responses +memcached_return memcached_server_add_unix_socket(memcached_st *ptr, + char *filename); memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port); void memcached_server_list_free(memcached_server_st *ptr); @@ -200,32 +230,35 @@ memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, 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_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); - 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) %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 HAVE_DEBUG +#define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout); +#define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout); +#define WATCHPOINT_STRING(A) fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,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_ASSERT(A) assert((A)); +#else +/* +#define WATCHPOINT { 1; }; +#define WATCHPOINT_ERROR(A) { 1; }; +#define WATCHPOINT_STRING(A) { 1; }; +#define WATCHPOINT_NUMBER(A) { 1; }; +#define WATCHPOINT_ERRNO(A) { 1; }; +#define WATCHPOINT_ASSERT(A) { 1; }; +*/ +#define WATCHPOINT +#define WATCHPOINT_ERROR(A) +#define WATCHPOINT_STRING(A) +#define WATCHPOINT_NUMBER(A) +#define WATCHPOINT_ERRNO(A) +#define WATCHPOINT_ASSERT(A) +#endif #ifdef __cplusplus