X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=9ac0df70e42b585ba4a3425b5ce578128c560004;hb=29db6c77e126d9ae0c416ad76402fdbef7372cdb;hp=47cdaf843768b0605c2ff24aa96fe722e1aaf204;hpb=6728560401a22513074f2f7c4b2060abc3fbea98;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 47cdaf84..9ac0df70 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -12,10 +12,16 @@ #include #include +#if !defined(__cplusplus) +# include +#endif #include #include +#ifdef MEMCACHED_INTERNAL #include +#endif +#include #include #include #include @@ -29,7 +35,7 @@ extern "C" { #endif /* These are Private and should not be used by applications */ -#define MEMCACHED_VERSION_STRING_LENGTH 12 +#define MEMCACHED_VERSION_STRING_LENGTH 24 /* string value */ struct memcached_continuum_item_st { @@ -37,67 +43,85 @@ struct memcached_continuum_item_st { uint32_t value; }; -#define LIBMEMCACHED_VERSION_STRING "0.23" +#define LIBMEMCACHED_VERSION_STRING "0.30" + +struct memcached_analysis_st { + uint32_t average_item_size; + uint32_t longest_uptime; + uint32_t least_free_server; + uint32_t most_consumed_server; + uint32_t oldest_server; + double pool_hit_ratio; + uint64_t most_used_bytes; + uint64_t least_remaining_bytes; +}; struct memcached_stat_st { + uint32_t connection_structures; + uint32_t curr_connections; + uint32_t curr_items; 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; - uint64_t limit_maxbytes; - uint32_t curr_connections; + uint32_t rusage_system_seconds; + uint32_t rusage_user_microseconds; + uint32_t rusage_user_seconds; + uint32_t threads; + uint32_t time; uint32_t total_connections; - uint32_t connection_structures; + uint32_t total_items; + uint32_t uptime; uint64_t bytes; + uint64_t bytes_read; + uint64_t bytes_written; uint64_t cmd_get; uint64_t cmd_set; + uint64_t evictions; uint64_t get_hits; uint64_t get_misses; - uint64_t evictions; - uint64_t bytes_read; - uint64_t bytes_written; + uint64_t limit_maxbytes; char version[MEMCACHED_VERSION_STRING_LENGTH]; }; struct memcached_st { - memcached_allocated is_allocated; + uint8_t purging; + bool is_allocated; + uint8_t distribution; + uint8_t hash; + uint32_t continuum_points_counter; memcached_server_st *hosts; + int32_t snd_timeout; + int32_t rcv_timeout; + uint32_t server_failure_limit; + uint32_t io_msg_watermark; + uint32_t io_bytes_watermark; + uint32_t io_key_prefetch; uint32_t number_of_hosts; uint32_t cursor_server; int cached_errno; uint32_t flags; - int send_size; - int recv_size; int32_t poll_timeout; int32_t connect_timeout; int32_t retry_timeout; - memcached_result_st result; - memcached_hash hash; - memcached_server_distribution distribution; - void *user_data; uint32_t continuum_count; + int send_size; + int recv_size; + void *user_data; + time_t next_distribution_rebuild; + size_t prefix_key_length; + memcached_hash hash_continuum; + memcached_result_st result; memcached_continuum_item_st *continuum; 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; + memcached_calloc_function call_calloc; memcached_trigger_key get_key_failure; memcached_trigger_delete_key delete_trigger; 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 number_of_replicas; }; @@ -118,6 +142,20 @@ memcached_return memcached_decrement(memcached_st *ptr, const char *key, size_t key_length, uint32_t offset, uint64_t *value); +memcached_return memcached_increment_with_initial(memcached_st *ptr, + const char *key, + size_t key_length, + uint64_t offset, + uint64_t initial, + time_t expiration, + uint64_t *value); +memcached_return memcached_decrement_with_initial(memcached_st *ptr, + const char *key, + size_t key_length, + uint64_t offset, + uint64_t initial, + time_t expiration, + uint64_t *value); void memcached_stat_free(memcached_st *, memcached_stat_st *); memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error); memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, @@ -129,26 +167,49 @@ 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); +/* The two public hash bits */ +uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm); +uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length); + +memcached_return memcached_flush_buffers(memcached_st *mem); + /* 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); @@ -169,11 +230,23 @@ 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); +memcached_return memcached_dump(memcached_st *ptr, memcached_dump_func *function, void *context, uint32_t number_of_callbacks); + + +memcached_return memcached_set_memory_allocators(memcached_st *ptr, + memcached_malloc_function mem_malloc, + memcached_free_function mem_free, + memcached_realloc_function mem_realloc, + memcached_calloc_function mem_calloc); +void memcached_get_memory_allocators(memcached_st *ptr, + memcached_malloc_function *mem_malloc, + memcached_free_function *mem_free, + memcached_realloc_function *mem_realloc, + memcached_calloc_function *mem_calloc); + +void *memcached_get_user_data(memcached_st *ptr); +void *memcached_set_user_data(memcached_st *ptr, void *data); #ifdef __cplusplus } @@ -181,4 +254,8 @@ memcached_return memcached_server_cursor(memcached_st *ptr, #include +#ifdef MEMCACHED_INTERNAL +#include +#endif + #endif /* __MEMCACHED_H__ */