X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=30823a8733d3d96cc12cfc666c74d2c61af14ef4;hb=93723c9e5e41d8d9c41f610623060b28b4ec8ae3;hp=e4510d6d9290f2f26f3c8e63c35c85b4b3b032d5;hpb=3928e14fbe1ed17cefe9bdbbb282fb7ecf053e7a;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index e4510d6d..30823a87 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -10,50 +10,81 @@ * */ -#ifndef __MEMCACHED_H__ -#define __MEMCACHED_H__ +#ifndef __LIBMEMCACHED_MEMCACHED_H__ +#define __LIBMEMCACHED_MEMCACHED_H__ -#include #include +#include +#include +#include +#include + #if !defined(__cplusplus) # include #endif -#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 +#include #include +#include +#include +#include #include #include +#include #include - -#ifdef __cplusplus -extern "C" { -#endif +#include +#include +#include struct memcached_st { + /** + @note these are static and should not change without a call to behavior. + */ struct { - bool is_allocated:1; - bool is_initialized:1; - bool is_purging:1; - bool is_processing_input:1; - } options; + bool is_purging MEMCACHED_BITFIELD; + bool is_processing_input MEMCACHED_BITFIELD; + } state; + struct { + // Everything below here is pretty static. + bool auto_eject_hosts MEMCACHED_BITFIELD; + bool binary_protocol MEMCACHED_BITFIELD; + bool buffer_requests MEMCACHED_BITFIELD; + bool cork MEMCACHED_BITFIELD; + bool hash_with_prefix_key MEMCACHED_BITFIELD; + bool ketama_weighted MEMCACHED_BITFIELD; + bool no_block MEMCACHED_BITFIELD; + bool no_reply MEMCACHED_BITFIELD; + bool randomize_replica_read MEMCACHED_BITFIELD; + bool reuse_memory MEMCACHED_BITFIELD; + bool support_cas MEMCACHED_BITFIELD; + bool tcp_nodelay MEMCACHED_BITFIELD; + bool use_cache_lookups MEMCACHED_BITFIELD; + bool use_sort_hosts MEMCACHED_BITFIELD; + bool use_udp MEMCACHED_BITFIELD; + bool verify_key MEMCACHED_BITFIELD; + } 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; @@ -62,28 +93,7 @@ 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; - /** - @note these are static and should not change without a call to behavior. - */ - 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 no_reply:1; - bool randomize_replica_read:1; - bool reuse_memory:1; - bool support_cas:1; - bool tcp_nodelay:1; - bool use_cache_lookups:1; - bool use_sort_hosts:1; - bool use_udp:1; - bool verify_key:1; - } flags; int32_t poll_timeout; int32_t connect_timeout; int32_t retry_timeout; @@ -94,167 +104,94 @@ 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; char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; + struct { + bool is_allocated MEMCACHED_BITFIELD; + } options; + }; -LIBMEMCACHED_API -memcached_return_t memcached_version(memcached_st *ptr); +#ifdef __cplusplus +extern "C" { +#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) -{ - 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); +void memcached_free(memcached_st *ptr); LIBMEMCACHED_API -memcached_server_st *memcached_servers_parse(const char *server_strings); +memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr); 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); +void *memcached_get_user_data(const memcached_st *ptr); 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); +void *memcached_set_user_data(memcached_st *ptr, void *data); 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); +memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source); 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); +memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key); LIBMEMCACHED_API -void *memcached_get_user_data(memcached_st *ptr); -LIBMEMCACHED_API -void *memcached_set_user_data(memcached_st *ptr, void *data); +uint32_t memcached_server_count(const memcached_st *); -LIBMEMCACHED_LOCAL -memcached_return_t run_distribution(memcached_st *ptr); +#ifdef __cplusplus +} // extern "C" +#endif -#define memcached_is_allocated(__object) ((__object)->options.is_allocated) -#define memcached_is_initialized(__object) ((__object)->options.is_initialized) #ifdef __cplusplus -} +class Memcached : private memcached_st { +public: + + Memcached() + { + memcached_create(this); + } + + ~Memcached() + { + memcached_free(this); + } + + Memcached(const Memcached& source) + { + memcached_clone(this, &source); + } + + Memcached& operator=(const Memcached& source) + { + memcached_free(this); + memcached_clone(this, &source); + + return *this; + } +}; #endif +#endif /* __LIBMEMCACHED_MEMCACHED_H__ */ -#endif /* __MEMCACHED_H__ */