X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=5b92d6356d6ea2d3c31a38d8ed461e88bf6aba3e;hb=857ca43d65fe6a52474641130312d26d125bef15;hp=c6b898dc9f38dc855f0bc4aa46171963e215fdbc;hpb=b70595336b2914550af90318eca857dfb02d72de;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index c6b898dc..5b92d635 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -10,8 +10,8 @@ * */ -#ifndef __MEMCACHED_H__ -#define __MEMCACHED_H__ +#ifndef __LIBMEMCACHED_MEMCACHED_H__ +#define __LIBMEMCACHED_MEMCACHED_H__ #include #include @@ -29,21 +29,56 @@ #include #include #include +#include // Everything above this line must be in the order specified. +#include #include #include #include #include +#include #include +#include +#include +#include #include +#include +#include +#include #include #include #include +#include +#include +#include #ifdef __cplusplus extern "C" { #endif +LIBMEMCACHED_API +void memcached_servers_reset(memcached_st *ptr); + +LIBMEMCACHED_API +memcached_st *memcached_create(memcached_st *ptr); + +LIBMEMCACHED_API +void memcached_free(memcached_st *ptr); + +LIBMEMCACHED_API +memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr); + +LIBMEMCACHED_API +void *memcached_get_user_data(const memcached_st *ptr); + +LIBMEMCACHED_API +void *memcached_set_user_data(memcached_st *ptr, void *data); + +#ifdef __cplusplus +} // extern "C" +#endif + + struct memcached_st { /** @note these are static and should not change without a call to behavior. @@ -51,10 +86,13 @@ struct memcached_st { struct { bool is_purging:1; bool is_processing_input:1; + } state; + struct { // Everything below here is pretty static. bool auto_eject_hosts:1; bool binary_protocol:1; bool buffer_requests:1; + bool cork:1; bool hash_with_prefix_key:1; bool ketama_weighted:1; bool no_block:1; @@ -67,11 +105,11 @@ struct memcached_st { bool use_sort_hosts:1; bool use_udp:1; bool verify_key:1; - bool cork:1; } flags; memcached_server_distribution_t distribution; - memcached_hash_t hash; + hashkit_st hashkit; uint32_t continuum_points_counter; // Ketama + uint32_t number_of_hosts; memcached_server_st *servers; memcached_server_st *last_disconnected_server; int32_t snd_timeout; @@ -80,7 +118,6 @@ struct memcached_st { uint32_t io_msg_watermark; uint32_t io_bytes_watermark; uint32_t io_key_prefetch; - uint32_t number_of_hosts; int cached_errno; int32_t poll_timeout; int32_t connect_timeout; @@ -92,15 +129,20 @@ struct memcached_st { time_t next_distribution_rebuild; // Ketama size_t prefix_key_length; uint32_t number_of_replicas; - memcached_hash_t distribution_hash; + hashkit_st distribution_hashkit; memcached_result_st result; memcached_continuum_item_st *continuum; // Ketama + + struct _allocators_st { + memcached_calloc_fn calloc; + memcached_free_fn free; + memcached_malloc_fn malloc; + memcached_realloc_fn realloc; + void *context; + } allocators; + memcached_clone_fn on_clone; memcached_cleanup_fn on_cleanup; - memcached_free_fn call_free; - memcached_malloc_fn call_malloc; - memcached_realloc_fn call_realloc; - memcached_calloc_fn call_calloc; memcached_trigger_key_fn get_key_failure; memcached_trigger_delete_key_fn delete_trigger; memcached_callback_st *callbacks; @@ -108,13 +150,106 @@ struct memcached_st { struct { bool is_allocated:1; } options; -}; -LIBMEMCACHED_API -memcached_return_t memcached_version(memcached_st *ptr); +#ifdef __cplusplus + memcached_st() : + state(), + flags(), + distribution(), + hashkit(), + continuum_points_counter(), + number_of_hosts(), + servers(), + last_disconnected_server(), + snd_timeout(), + rcv_timeout(), + server_failure_limit(), + io_msg_watermark(), + io_bytes_watermark(), + io_key_prefetch(), + cached_errno(), + poll_timeout(), + connect_timeout(), + retry_timeout(), + continuum_count(), + send_size(), + recv_size(), + user_data(), + next_distribution_rebuild(), + prefix_key_length(), + number_of_replicas(), + distribution_hashkit(), + result(), + continuum(), + allocators(), + on_clone(), + on_cleanup(), + get_key_failure(), + delete_trigger(), + callbacks(), + prefix_key(), + options() + { + memcached_create(this); + } + + ~memcached_st() + { + memcached_free(this); + } + + memcached_st(const memcached_st& source) : + state(), + flags(), + distribution(), + hashkit(), + continuum_points_counter(), + number_of_hosts(), + servers(), + last_disconnected_server(), + snd_timeout(), + rcv_timeout(), + server_failure_limit(), + io_msg_watermark(), + io_bytes_watermark(), + io_key_prefetch(), + cached_errno(), + poll_timeout(), + connect_timeout(), + retry_timeout(), + continuum_count(), + send_size(), + recv_size(), + user_data(), + next_distribution_rebuild(), + prefix_key_length(), + number_of_replicas(), + distribution_hashkit(), + result(), + continuum(), + allocators(), + on_clone(), + on_cleanup(), + get_key_failure(), + delete_trigger(), + callbacks(), + prefix_key(), + options() + { + memcached_clone(this, &source); + } + + memcached_st& operator=(const memcached_st& source) + { + memcached_free(this); + memcached_clone(this, &source); + + return *this; + } + +#endif +}; -LIBMEMCACHED_API -void memcached_servers_reset(memcached_st *ptr); // Local Only Inline static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key) @@ -122,145 +257,4 @@ static inline memcached_server_st *memcached_server_instance_fetch(memcached_st return &ptr->servers[server_key]; } -/* Public API */ - -LIBMEMCACHED_API -const char * memcached_lib_version(void); - -LIBMEMCACHED_API -memcached_st *memcached_create(memcached_st *ptr); -LIBMEMCACHED_API -void memcached_free(memcached_st *ptr); -LIBMEMCACHED_API -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_flush(memcached_st *ptr, time_t expiration); - -LIBMEMCACHED_API -memcached_return_t memcached_verbosity(memcached_st *ptr, unsigned int verbosity); - -LIBMEMCACHED_API -void memcached_quit(memcached_st *ptr); - -LIBMEMCACHED_API -const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc); - -/* The two public hash bits */ -LIBMEMCACHED_API -uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash_t hash_algorithm); - -LIBMEMCACHED_API -uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length); - -LIBMEMCACHED_API -memcached_return_t memcached_flush_buffers(memcached_st *mem); - -/* Server Public functions */ - -LIBMEMCACHED_API -memcached_return_t memcached_server_add_udp(memcached_st *ptr, - const char *hostname, - in_port_t port); -LIBMEMCACHED_API -memcached_return_t memcached_server_add_unix_socket(memcached_st *ptr, - const char *filename); -LIBMEMCACHED_API -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); -LIBMEMCACHED_API -memcached_return_t memcached_server_add_unix_socket_with_weight(memcached_st *ptr, - 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); -LIBMEMCACHED_API -void memcached_server_list_free(memcached_server_st *ptr); - -LIBMEMCACHED_API -memcached_return_t 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, - in_port_t port, - memcached_return_t *error); -LIBMEMCACHED_API -memcached_server_st *memcached_server_list_append_with_weight(memcached_server_st *ptr, - const char *hostname, - in_port_t port, - uint32_t weight, - memcached_return_t *error); -LIBMEMCACHED_API -unsigned int memcached_server_list_count(memcached_server_st *ptr); - -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 *memc_stat, - const char *key, memcached_return_t *error); -LIBMEMCACHED_API -char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat, - memcached_return_t *error); - -LIBMEMCACHED_API -memcached_return_t 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_t memcached_fetch_execute(memcached_st *ptr, - memcached_execute_fn *callback, - void *context, - unsigned int number_of_callbacks); - -LIBMEMCACHED_API -memcached_return_t memcached_set_memory_allocators(memcached_st *ptr, - memcached_malloc_fn mem_malloc, - memcached_free_fn mem_free, - memcached_realloc_fn mem_realloc, - memcached_calloc_fn mem_calloc); - -LIBMEMCACHED_API -void memcached_get_memory_allocators(memcached_st *ptr, - memcached_malloc_fn *mem_malloc, - memcached_free_fn *mem_free, - memcached_realloc_fn *mem_realloc, - memcached_calloc_fn *mem_calloc); - -LIBMEMCACHED_API -void *memcached_get_user_data(memcached_st *ptr); -LIBMEMCACHED_API -void *memcached_set_user_data(memcached_st *ptr, void *data); - -LIBMEMCACHED_LOCAL -memcached_return_t run_distribution(memcached_st *ptr); - -// These are private -#define memcached_is_allocated(__object) ((__object)->options.is_allocated) -#define memcached_is_initialized(__object) ((__object)->options.is_initialized) -#define memcached_is_purging(__object) ((__object)->flags.is_purging) -#define memcached_is_processing_input(__object) ((__object)->flags.is_processing_input) -#define memcached_set_purging(__object, __value) ((__object)->flags.is_purging= (__value)) -#define memcached_set_processing_input(__object, __value) ((__object)->flags.is_processing_input= (__value)) - -#ifdef __cplusplus -} -#endif - - -#endif /* __MEMCACHED_H__ */ +#endif /* __LIBMEMCACHED_MEMCACHED_H__ */