X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=a8865a7b2943808db599a5969bd0e86114702227;hb=f05cd5b77ca7b17440bfc7ed9f48f7c11d269767;hp=d1daf775362af71375de732e55a7bf2f7dbfffeb;hpb=073c4085895027aabe10aec9264dd8f4dae7e264;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index d1daf775..a8865a7b 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -12,10 +12,15 @@ #include #include +#if !defined(__cplusplus) +# include +#endif #include #include +#ifdef MEMCACHED_INTERNAL #include +#endif #include #include #include @@ -29,7 +34,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,7 +42,18 @@ struct memcached_continuum_item_st { uint32_t value; }; -#define LIBMEMCACHED_VERSION_STRING "0.22" +#define LIBMEMCACHED_VERSION_STRING "0.28" + +struct memcached_analysis_st { + uint64_t most_used_bytes; + uint64_t least_remaining_bytes; + 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; +}; struct memcached_stat_st { uint32_t pid; @@ -67,10 +83,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; @@ -93,6 +110,15 @@ struct memcached_st { 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 io_msg_watermark; + uint32_t io_bytes_watermark; + uint32_t io_key_prefetch; + time_t next_distribution_rebuild; }; @@ -113,6 +139,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, @@ -123,27 +163,46 @@ void memcached_quit(memcached_st *ptr); 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); +uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm); +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); @@ -164,11 +223,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 }