X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=9244057945bbf899407e89a4e2e0cdb274f2a6e7;hb=7cbb74311e579a2eaac356194b4e6c4e86f1fcf9;hp=47968139f0acdd96c2e14ff4fc5cef75c07a37ca;hpb=98c99981e0ebe7f716bea2e4d95434d159103fcd;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 47968139..92440579 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -24,11 +24,14 @@ #include #include -#include +#include #include #include #include +#include // Everything above this line must be in the order specified. +#include +#include #include #include #include @@ -41,46 +44,6 @@ 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; @@ -89,7 +52,7 @@ struct memcached_st { } options; memcached_server_distribution_t distribution; memcached_hash_t hash; - uint32_t continuum_points_counter; + uint32_t continuum_points_counter; // Ketama memcached_server_st *hosts; memcached_server_st *last_disconnected_server; int32_t snd_timeout; @@ -99,7 +62,6 @@ struct memcached_st { uint32_t io_bytes_watermark; uint32_t io_key_prefetch; uint32_t number_of_hosts; - uint32_t cursor_server; int cached_errno; struct { bool auto_eject_hosts:1; @@ -121,16 +83,16 @@ struct memcached_st { int32_t poll_timeout; int32_t connect_timeout; int32_t retry_timeout; - uint32_t continuum_count; + uint32_t continuum_count; // Ketama int send_size; int recv_size; void *user_data; - time_t next_distribution_rebuild; + time_t next_distribution_rebuild; // Ketama size_t prefix_key_length; uint32_t number_of_replicas; memcached_hash_t distribution_hash; memcached_result_st result; - memcached_continuum_item_st *continuum; + memcached_continuum_item_st *continuum; // Ketama memcached_clone_fn on_clone; memcached_cleanup_fn on_cleanup; memcached_free_fn call_free; @@ -146,6 +108,9 @@ struct memcached_st { LIBMEMCACHED_API memcached_return_t memcached_version(memcached_st *ptr); +LIBMEMCACHED_API +void memcached_servers_reset(memcached_st *ptr); + /* Public API */ LIBMEMCACHED_API @@ -161,76 +126,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);