X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=175c93c3529c5e17347d0009ea739dcdf55ac9b2;hb=b01ff6189633c1bf86f94065d2564810e6871869;hp=53b51ea03ee94657c13aabb24b27e2902e579e7b;hpb=8d0cd77fc7bafd1f353bc7c50910b751766f931a;p=awesomized%2Flibmemcached diff --git a/include/memcached.h b/include/memcached.h index 53b51ea0..175c93c3 100644 --- a/include/memcached.h +++ b/include/memcached.h @@ -32,11 +32,15 @@ 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 HUGE_STRING_LEN +#define MEMCACHED_MAX_HOST_LENGTH 64 +#define MEMCACHED_WHEEL_SIZE 1024 +#define MEMCACHED_STRIDE 4 +#define MEMCACHED_DEFAULT_TIMEOUT 100 typedef enum { MEMCACHED_SUCCESS, MEMCACHED_FAILURE, - MEMCACHED_HOST_LOCKUP_FAILURE, + MEMCACHED_HOST_LOOKUP_FAILURE, MEMCACHED_CONNECTION_FAILURE, MEMCACHED_CONNECTION_BIND_FAILURE, MEMCACHED_WRITE_FAILURE, @@ -63,9 +67,15 @@ typedef enum { MEMCACHED_FAIL_UNIX_SOCKET, MEMCACHED_NOT_SUPPORTED, MEMCACHED_NO_KEY_PROVIDED, + MEMCACHED_FETCH_NOTFINISHED, MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */ } memcached_return; +typedef enum { + MEMCACHED_DISTRIBUTION_MODULA, + MEMCACHED_DISTRIBUTION_CONSISTENT, +} memcached_server_distribution; + typedef enum { MEMCACHED_BEHAVIOR_NO_BLOCK, MEMCACHED_BEHAVIOR_TCP_NODELAY, @@ -74,6 +84,9 @@ typedef enum { MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, + MEMCACHED_BEHAVIOR_SUPPORT_CAS, + MEMCACHED_BEHAVIOR_POLL_TIMEOUT, + MEMCACHED_BEHAVIOR_DISTRIBUTION, } memcached_behavior; typedef enum { @@ -85,6 +98,7 @@ typedef enum { MEMCACHED_HASH_FNV1_32, MEMCACHED_HASH_FNV1A_32, MEMCACHED_HASH_KETAMA, + MEMCACHED_HASH_HSIEH, } memcached_hash; typedef enum { @@ -97,10 +111,11 @@ typedef enum { typedef enum { MEMCACHED_NOT_ALLOCATED, MEMCACHED_ALLOCATED, + MEMCACHED_USED, } memcached_allocated; struct memcached_server_st { - char *hostname; + char hostname[MEMCACHED_MAX_HOST_LENGTH]; unsigned int port; int fd; unsigned int stack_responses; @@ -112,40 +127,39 @@ struct memcached_server_st { size_t read_buffer_length; char *read_ptr; memcached_allocated sockaddr_inited; - struct sockaddr_in servAddr; + struct addrinfo *address_info; memcached_connection type; uint8_t major_version; uint8_t minor_version; uint8_t micro_version; + uint16_t count; }; struct memcached_stat_st { - unsigned int pid; - unsigned int uptime; - unsigned int threads; - time_t time; + uint32_t pid; + uint32_t uptime; + uint32_t threads; + uint32_t time; + uint32_t pointer_size; + uint32_t rusage_user_seconds; + uint32_t rusage_user_microseconds; + uint32_t rusage_system_seconds; + uint32_t rusage_system_microseconds; + uint32_t curr_items; + uint32_t total_items; + uint32_t limit_maxbytes; + uint32_t curr_connections; + uint32_t total_connections; + uint32_t connection_structures; + uint64_t bytes; + uint64_t cmd_get; + uint64_t cmd_set; + uint64_t get_hits; + uint64_t get_misses; + uint64_t evictions; + uint64_t bytes_read; + uint64_t bytes_written; char version[MEMCACHED_VERSION_STRING]; - unsigned int pointer_size; - unsigned int rusage_user; - unsigned int rusage_system; - unsigned int rusage_user_seconds; - unsigned int rusage_user_microseconds; - unsigned int rusage_system_seconds; - unsigned int rusage_system_microseconds; - unsigned int curr_items; - unsigned int total_items; - unsigned long long bytes; - unsigned int curr_connections; - unsigned int total_connections; - unsigned int connection_structures; - unsigned long long cmd_get; - unsigned long long cmd_set; - unsigned long long get_hits; - unsigned long long get_misses; - unsigned long long evictions; - unsigned long long bytes_read; - unsigned long long bytes_written; - unsigned int limit_maxbytes; }; struct memcached_string_st { @@ -177,8 +191,12 @@ struct memcached_st { unsigned long long flags; int send_size; int recv_size; + int32_t poll_timeout; memcached_string_st result_buffer; memcached_hash hash; + memcached_server_distribution distribution; + unsigned int wheel[MEMCACHED_WHEEL_SIZE]; + uint8_t replicas; memcached_return warning; /* Future Use */ }; @@ -254,11 +272,11 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr, 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 +#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_udp(memcached_st *ptr, char *hostname, @@ -281,6 +299,61 @@ char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, memcached_return *error); +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, + memcached_return *error); + +memcached_return memcached_mget_by_key(memcached_st *ptr, + char *master_key, size_t master_key_length, + char **keys, size_t *key_length, + unsigned int number_of_keys); + +memcached_return memcached_set_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); + +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); + +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); + +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); + +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); + +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, + uint64_t cas); + /* Result Struct */ void memcached_result_free(memcached_result_st *result); memcached_result_st *memcached_result_create(memcached_st *ptr, @@ -307,6 +380,7 @@ size_t memcached_result_length(memcached_result_st *ptr); #define WATCHPOINT_ERROR(A) 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_ASSERT(A) assert((A)); @@ -315,6 +389,7 @@ size_t memcached_result_length(memcached_result_st *ptr); #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; };