X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=95592a487490d85a7531123adb716a48a016c98c;hb=387b6a7d1e3d953104c43c44bd49be4789fd5f2a;hp=119c4607d589b1e9a3480f4c6d9240a7d872c990;hpb=521e830fe336a17bee6e7376e3bf01a3b35ddc37;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 119c4607..95592a48 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -25,68 +25,33 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +// Everything above this line must be in the order specified. +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { #endif -#define MEMCACHED_VERSION_STRING_LENGTH 24 - -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 pointer_size; - uint32_t rusage_system_microseconds; - 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 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 limit_maxbytes; - char version[MEMCACHED_VERSION_STRING_LENGTH]; -}; - struct memcached_st { struct { bool is_allocated:1; bool is_initialized:1; bool is_purging:1; } options; - uint8_t distribution; - uint8_t hash; + memcached_server_distribution_t distribution; + memcached_hash_t hash; uint32_t continuum_points_counter; memcached_server_st *hosts; memcached_server_st *last_disconnected_server; @@ -100,23 +65,21 @@ struct memcached_st { uint32_t cursor_server; int cached_errno; struct { + bool auto_eject_hosts:1; + bool binary_protocol:1; + bool buffer_requests:1; + bool hash_with_prefix_key:1; + bool ketama_weighted:1; bool no_block:1; - bool tcp_nodelay:1; + bool no_reply:1; + bool randomize_replica_read:1; bool reuse_memory:1; - bool use_md5:1; - bool use_crc:1; - bool use_cache_lookups:1; bool support_cas:1; - bool buffer_requests:1; + bool tcp_nodelay:1; + bool use_cache_lookups:1; bool use_sort_hosts:1; - bool verify_key:1; - bool ketama_weighted:1; - bool binary_protocol:1; - bool hash_with_prefix_key:1; - bool no_reply:1; bool use_udp:1; - bool auto_eject_hosts:1; - bool randomize_replica_read:1; + bool verify_key:1; } flags; int32_t poll_timeout; int32_t connect_timeout; @@ -127,7 +90,8 @@ struct memcached_st { void *user_data; time_t next_distribution_rebuild; size_t prefix_key_length; - memcached_hash_t hash_continuum; + uint32_t number_of_replicas; + memcached_hash_t distribution_hash; memcached_result_st result; memcached_continuum_item_st *continuum; memcached_clone_fn on_clone; @@ -138,9 +102,8 @@ struct memcached_st { memcached_calloc_fn call_calloc; memcached_trigger_key_fn get_key_failure; memcached_trigger_delete_key_fn delete_trigger; - char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; - uint32_t number_of_replicas; memcached_callback_st *callbacks; + char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; }; LIBMEMCACHED_API @@ -161,76 +124,6 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr); LIBMEMCACHED_API memcached_return_t memcached_delete(memcached_st *ptr, const char *key, size_t key_length, time_t expiration); -LIBMEMCACHED_API -memcached_return_t memcached_increment(memcached_st *ptr, - const char *key, size_t key_length, - uint32_t offset, - uint64_t *value); -LIBMEMCACHED_API -memcached_return_t memcached_decrement(memcached_st *ptr, - const char *key, size_t key_length, - uint32_t offset, - uint64_t *value); - -LIBMEMCACHED_API -memcached_return_t memcached_increment_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, - const char *key, size_t key_length, - uint64_t offset, - uint64_t *value); - -LIBMEMCACHED_API -memcached_return_t memcached_decrement_by_key(memcached_st *ptr, - const char *master_key, size_t master_key_length, - const char *key, size_t key_length, - uint64_t offset, - uint64_t *value); - -LIBMEMCACHED_API -memcached_return_t 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); -LIBMEMCACHED_API -memcached_return_t 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); -LIBMEMCACHED_API -memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, - const char *key, - size_t key_length, - uint64_t offset, - uint64_t initial, - time_t expiration, - uint64_t *value); -LIBMEMCACHED_API -memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, - const char *key, - size_t key_length, - uint64_t offset, - uint64_t initial, - time_t expiration, - uint64_t *value); -LIBMEMCACHED_API -void memcached_stat_free(memcached_st *, memcached_stat_st *); - -LIBMEMCACHED_API -memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return_t *error); - -LIBMEMCACHED_API -memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char *args, - const char *hostname, in_port_t port); LIBMEMCACHED_API memcached_return_t memcached_flush(memcached_st *ptr, time_t expiration); @@ -258,28 +151,28 @@ memcached_return_t memcached_flush_buffers(memcached_st *mem); LIBMEMCACHED_API memcached_return_t memcached_server_add_udp(memcached_st *ptr, - const char *hostname, - in_port_t port); + const char *hostname, + in_port_t port); LIBMEMCACHED_API memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr, - const char *filename); + const char *filename); LIBMEMCACHED_API -memcached_return_t memcached_server_add(memcached_st *ptr, +memcached_return_t memcached_server_add(memcached_st *ptr, const char *hostname, in_port_t port); LIBMEMCACHED_API memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr, - const char *hostname, - in_port_t port, - uint32_t weight); + const char *hostname, + in_port_t port, + uint32_t weight); LIBMEMCACHED_API memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_st *ptr, - const char *filename, - uint32_t weight); + const char *filename, + uint32_t weight); LIBMEMCACHED_API memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, - in_port_t port, - uint32_t weight); + in_port_t port, + uint32_t weight); LIBMEMCACHED_API void memcached_server_list_free(memcached_server_st *ptr); @@ -322,10 +215,6 @@ memcached_return_t memcached_fetch_execute(memcached_st *ptr, void *context, unsigned int number_of_callbacks); -LIBMEMCACHED_API -memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *function, void *context, uint32_t number_of_callbacks); - - LIBMEMCACHED_API memcached_return_t memcached_set_memory_allocators(memcached_st *ptr, memcached_malloc_fn mem_malloc,