X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=5aca6db122074ed962cd7b53362f8c7d7489bd7a;hb=519261ca98528ebc5d854ed839f400aa03a3dc5c;hp=2a7dd3f01d29cb09dc15af184c92f9c6710d84e6;hpb=8f36e509f6130022162abf7cde7e6c8acbbe224c;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 2a7dd3f0..5aca6db1 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -10,25 +10,27 @@ * */ -#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 @@ -46,43 +48,44 @@ #include #include #include +#include #include #include #include #include - -#ifdef __cplusplus -extern "C" { -#endif +#include struct memcached_st { /** @note these are static and should not change without a call to behavior. */ struct { - bool is_purging:1; - bool is_processing_input:1; + bool is_purging MEMCACHED_BITFIELD; + bool is_processing_input MEMCACHED_BITFIELD; + } state; + struct { // Everything below here is pretty static. - 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; - bool cork:1; + 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; @@ -91,7 +94,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; @@ -103,29 +105,48 @@ 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; +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT + struct { + const sasl_callback_t *callbacks; + /* + ** Did we allocate data inside the callbacks, or did the user + ** supply that. + */ + bool is_allocated MEMCACHED_BITFIELD; + } sasl; + +#endif char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; struct { - bool is_allocated:1; + bool is_allocated MEMCACHED_BITFIELD; } options; + }; +#ifdef __cplusplus +extern "C" { +#endif + LIBMEMCACHED_API void memcached_servers_reset(memcached_st *ptr); -/* Public API */ - LIBMEMCACHED_API memcached_st *memcached_create(memcached_st *ptr); @@ -133,7 +154,7 @@ LIBMEMCACHED_API void memcached_free(memcached_st *ptr); LIBMEMCACHED_API -memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr); +memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr); LIBMEMCACHED_API void *memcached_get_user_data(const memcached_st *ptr); @@ -141,16 +162,48 @@ void *memcached_get_user_data(const memcached_st *ptr); LIBMEMCACHED_API void *memcached_set_user_data(memcached_st *ptr, void *data); -// Local Only Inline -static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key) -{ - return &ptr->servers[server_key]; -} +LIBMEMCACHED_API +memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source); + +LIBMEMCACHED_API +memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key); + +LIBMEMCACHED_API +uint32_t memcached_server_count(const memcached_st *); + +#ifdef __cplusplus +} // extern "C" +#endif #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__ */