X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=225b20990d1f2d6a4bec4de5cb1e8781b3fc8908;hb=bb0ec116ceb30ec558195190c343dbcb18e08249;hp=c260211630e2c62593b7a0009cdf6b0d66928ccc;hpb=e115444989a124cc1a433ea20c13e877317bb0ad;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index c2602116..225b2099 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -33,7 +33,7 @@ extern "C" { #endif #define MEMCACHED_VERSION_STRING_LENGTH 24 -#define LIBMEMCACHED_VERSION_STRING "0.30" +#define LIBMEMCACHED_VERSION_STRING "0.34" struct memcached_analysis_st { uint32_t average_item_size; @@ -80,6 +80,7 @@ struct memcached_st { uint8_t hash; uint32_t continuum_points_counter; memcached_server_st *hosts; + memcached_server_st *last_disconnected_server; int32_t snd_timeout; int32_t rcv_timeout; uint32_t server_failure_limit; @@ -112,6 +113,7 @@ struct memcached_st { memcached_trigger_delete_key delete_trigger; char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; uint32_t number_of_replicas; + memcached_callback_st *callbacks; }; LIBMEMCACHED_API @@ -133,12 +135,12 @@ LIBMEMCACHED_API memcached_return memcached_delete(memcached_st *ptr, const char *key, size_t key_length, time_t expiration); LIBMEMCACHED_API -memcached_return memcached_increment(memcached_st *ptr, +memcached_return memcached_increment(memcached_st *ptr, const char *key, size_t key_length, uint32_t offset, uint64_t *value); LIBMEMCACHED_API -memcached_return memcached_decrement(memcached_st *ptr, +memcached_return memcached_decrement(memcached_st *ptr, const char *key, size_t key_length, uint32_t offset, uint64_t *value); @@ -163,7 +165,7 @@ void memcached_stat_free(memcached_st *, memcached_stat_st *); LIBMEMCACHED_API memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error); LIBMEMCACHED_API -memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, +memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, char *args, char *hostname, unsigned int port); LIBMEMCACHED_API memcached_return memcached_flush(memcached_st *ptr, time_t expiration); @@ -172,7 +174,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity); LIBMEMCACHED_API void memcached_quit(memcached_st *ptr); LIBMEMCACHED_API -char *memcached_strerror(memcached_st *ptr, memcached_return rc); +const char *memcached_strerror(memcached_st *ptr, memcached_return rc); LIBMEMCACHED_API memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data); LIBMEMCACHED_API @@ -190,27 +192,27 @@ memcached_return memcached_flush_buffers(memcached_st *mem); /* Server Public functions */ LIBMEMCACHED_API -memcached_return memcached_server_add_udp(memcached_st *ptr, +memcached_return memcached_server_add_udp(memcached_st *ptr, const char *hostname, unsigned int port); LIBMEMCACHED_API -memcached_return memcached_server_add_unix_socket(memcached_st *ptr, +memcached_return memcached_server_add_unix_socket(memcached_st *ptr, const char *filename); LIBMEMCACHED_API -memcached_return memcached_server_add(memcached_st *ptr, const char *hostname, +memcached_return memcached_server_add(memcached_st *ptr, const char *hostname, unsigned int port); LIBMEMCACHED_API -memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr, +memcached_return memcached_server_add_udp_with_weight(memcached_st *ptr, const char *hostname, unsigned int port, uint32_t weight); LIBMEMCACHED_API -memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, +memcached_return memcached_server_add_unix_socket_with_weight(memcached_st *ptr, const char *filename, uint32_t weight); LIBMEMCACHED_API -memcached_return memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, +memcached_return memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, unsigned int port, uint32_t weight); LIBMEMCACHED_API @@ -219,14 +221,14 @@ LIBMEMCACHED_API memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *list); LIBMEMCACHED_API -memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, - const char *hostname, - unsigned int port, +memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, + const char *hostname, + unsigned int port, memcached_return *error); LIBMEMCACHED_API -memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr, - const char *hostname, - unsigned int port, +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); LIBMEMCACHED_API @@ -235,30 +237,30 @@ LIBMEMCACHED_API memcached_server_st *memcached_servers_parse(const char *server_strings); LIBMEMCACHED_API -char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, +char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat, const char *key, memcached_return *error); LIBMEMCACHED_API -char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, +char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat, memcached_return *error); LIBMEMCACHED_API -memcached_return memcached_delete_by_key(memcached_st *ptr, +memcached_return memcached_delete_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, const char *key, size_t key_length, time_t expiration); LIBMEMCACHED_API -memcached_return memcached_fetch_execute(memcached_st *ptr, +memcached_return memcached_fetch_execute(memcached_st *ptr, memcached_execute_function *callback, void *context, unsigned int number_of_callbacks); LIBMEMCACHED_API -memcached_return memcached_callback_set(memcached_st *ptr, - memcached_callback flag, +memcached_return memcached_callback_set(memcached_st *ptr, + memcached_callback flag, void *data); LIBMEMCACHED_API -void *memcached_callback_get(memcached_st *ptr, +void *memcached_callback_get(memcached_st *ptr, memcached_callback flag, memcached_return *error);