X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=b60922929eead41609d52038005436bd831afbc0;hb=d455dd963105dc3ccc120887215f66dec8f55377;hp=6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce;hpb=d48f4bbb5d5bee5ab3bed6f479558ef1fa74b58f;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 6f3b0f5d..b6092292 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -12,13 +12,19 @@ #include #include +#if !defined(__cplusplus) +# include +#endif #include #include +#ifdef MEMCACHED_INTERNAL #include +#endif #include #include #include +#include #include #include #include @@ -31,16 +37,12 @@ extern "C" { #define MEMCACHED_VERSION_STRING_LENGTH 12 /* string value */ -<<<<<<< local -#define LIBMEMCACHED_VERSION_STRING "0.19" - -struct continuum_item{ - uint32_t index; - uint32_t value; +struct memcached_continuum_item_st { + uint32_t index; + uint32_t value; }; -======= -#define LIBMEMCACHED_VERSION_STRING "0.20" ->>>>>>> other + +#define LIBMEMCACHED_VERSION_STRING "0.25" struct memcached_stat_st { uint32_t pid; @@ -70,10 +72,11 @@ struct memcached_stat_st { }; struct memcached_st { - memcached_allocated is_allocated; + uint8_t purging; + bool is_allocated; memcached_server_st *hosts; - unsigned int number_of_hosts; - unsigned int cursor_server; + uint32_t number_of_hosts; + uint32_t cursor_server; int cached_errno; uint32_t flags; int send_size; @@ -85,8 +88,8 @@ struct memcached_st { memcached_hash hash; memcached_server_distribution distribution; void *user_data; - unsigned int wheel[MEMCACHED_WHEEL_SIZE]; - struct continuum_item continuum[MEMCACHED_CONTINUUM_SIZE]; + uint32_t continuum_count; + memcached_continuum_item_st *continuum; memcached_clone_func on_clone; memcached_cleanup_func on_cleanup; memcached_free_function call_free; @@ -94,10 +97,15 @@ struct memcached_st { memcached_realloc_function call_realloc; memcached_trigger_key get_key_failure; memcached_trigger_delete_key delete_trigger; -#ifdef NOT_USED /* Future Use */ - uint8_t replicas; - memcached_return warning; -#endif + char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; + size_t prefix_key_length; + memcached_hash hash_continuum; + uint32_t continuum_points_counter; + int32_t snd_timeout; + int32_t rcv_timeout; + uint32_t server_failure_limit; + uint32_t io_msg_watermark; + uint32_t io_bytes_watermark; }; @@ -108,14 +116,14 @@ 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, +memcached_return memcached_delete(memcached_st *ptr, const char *key, size_t key_length, time_t expiration); memcached_return memcached_increment(memcached_st *ptr, - char *key, size_t key_length, + const char *key, size_t key_length, uint32_t offset, uint64_t *value); memcached_return memcached_decrement(memcached_st *ptr, - char *key, size_t key_length, + const char *key, size_t key_length, uint32_t offset, uint64_t *value); void memcached_stat_free(memcached_st *, memcached_stat_st *); @@ -129,66 +137,55 @@ char *memcached_strerror(memcached_st *ptr, memcached_return rc); memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data); uint64_t memcached_behavior_get(memcached_st *ptr, memcached_behavior flag); -/* Get functions */ -char *memcached_get(memcached_st *ptr, char *key, size_t key_length, - size_t *value_length, - 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, uint32_t *flags, - memcached_return *error); -memcached_result_st *memcached_fetch_result(memcached_st *ptr, - memcached_result_st *result, - memcached_return *error); - /* Server Public functions */ memcached_return memcached_server_add_udp(memcached_st *ptr, - char *hostname, + const char *hostname, unsigned int port); memcached_return memcached_server_add_unix_socket(memcached_st *ptr, - char *filename); -memcached_return memcached_server_add(memcached_st *ptr, char *hostname, + const char *filename); +memcached_return memcached_server_add(memcached_st *ptr, const char *hostname, unsigned int port); + +memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr, + const char *hostname, + unsigned int port, + uint32_t weight); +memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, + const char *filename, + uint32_t weight); +memcached_return memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, + unsigned int port, + uint32_t weight); 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); + const char *hostname, + unsigned int port, + memcached_return *error); +memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr, + const char *hostname, + unsigned int port, + uint32_t weight, + memcached_return *error); unsigned int memcached_server_list_count(memcached_server_st *ptr); -memcached_server_st *memcached_servers_parse(char *server_strings); +memcached_server_st *memcached_servers_parse(const char *server_strings); char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, - char *key, memcached_return *error); + const char *key, memcached_return *error); 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, - uint32_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_delete_by_key(memcached_st *ptr, - char *master_key, size_t master_key_length, - char *key, size_t key_length, + const char *master_key, size_t master_key_length, + const 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), + memcached_execute_function *callback, void *context, - unsigned int number_of_callbacks - ); + unsigned int number_of_callbacks); memcached_return memcached_callback_set(memcached_st *ptr, memcached_callback flag, @@ -197,11 +194,6 @@ void *memcached_callback_get(memcached_st *ptr, memcached_callback flag, memcached_return *error); -memcached_return memcached_server_cursor(memcached_st *ptr, - memcached_server_function *callback, - void *context, - unsigned int number_of_callbacks); - #ifdef __cplusplus }