X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=98f5ed68553d1d29e069859a7c967d510fd34547;hb=259ed7e68a0de0887e9aedbe0aa5fdd9404929f9;hp=9e468038f64912a5ed202687d977749dda4383c4;hpb=ea47169abd0793bb7eb1b72e4de411ae9b43dce4;p=m6w6%2Flibmemcached diff --git a/libmemcached/server.h b/libmemcached/server.h index 9e468038..98f5ed68 100644 --- a/libmemcached/server.h +++ b/libmemcached/server.h @@ -15,25 +15,26 @@ struct memcached_server_st { struct { - bool is_allocated MEMCACHED_BITFIELD; - bool is_initialized MEMCACHED_BITFIELD; - bool sockaddr_inited MEMCACHED_BITFIELD; - bool is_shutting_down MEMCACHED_BITFIELD; + bool is_allocated:1; + bool is_initialized:1; + bool is_shutting_down:1; + bool is_dead:1; } options; uint32_t number_of_hosts; uint32_t cursor_active; in_port_t port; int cached_errno; - int fd; + memcached_socket_t fd; uint32_t io_bytes_sent; /* # bytes sent since last read */ uint32_t server_failure_counter; uint32_t weight; - struct { // Place any "state" sort variables in here. - bool is_corked; - } state; - uint8_t major_version; - uint8_t micro_version; - uint8_t minor_version; + struct { + uint32_t read; + uint32_t write; + } io_wait_count; + uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set. + uint8_t micro_version; // ditto + uint8_t minor_version; // ditto memcached_connection_t type; char *read_ptr; char *cached_server_error; @@ -41,6 +42,7 @@ struct memcached_server_st { size_t read_data_length; size_t write_buffer_offset; struct addrinfo *address_info; + struct addrinfo *address_info_next; time_t next_retry; const memcached_st *root; uint64_t limit_maxbytes; @@ -55,35 +57,20 @@ extern "C" { #endif LIBMEMCACHED_API -memcached_return_t memcached_server_cursor(memcached_st *ptr, - memcached_server_fn *callback, +memcached_return_t memcached_server_cursor(const memcached_st *ptr, + const memcached_server_fn *callback, void *context, uint32_t number_of_callbacks); LIBMEMCACHED_API -memcached_server_st *memcached_server_by_key(memcached_st *ptr, - const char *key, - size_t key_length, - memcached_return_t *error); - -LIBMEMCACHED_API -const char *memcached_server_error(memcached_server_st *ptr); + memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr, + const char *key, + size_t key_length, + memcached_return_t *error); LIBMEMCACHED_API void memcached_server_error_reset(memcached_server_st *ptr); -/* These should not currently be used by end users */ -/* TODO: Is the above comment valid? If so, how can we unit test these if they - * aren't exported. If not, we should remove the comment */ - -LIBMEMCACHED_LOCAL -memcached_server_st *memcached_server_create_with(const memcached_st *memc, - memcached_server_st *host, - const char *hostname, - in_port_t port, - uint32_t weight, - memcached_connection_t type); - LIBMEMCACHED_API void memcached_server_free(memcached_server_st *ptr); @@ -92,10 +79,7 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination, const memcached_server_st *source); LIBMEMCACHED_API -memcached_return_t memcached_server_remove(memcached_server_st *st_ptr); - -LIBMEMCACHED_API -memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr); +memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr); LIBMEMCACHED_API @@ -109,6 +93,13 @@ LIBMEMCACHED_API memcached_return_t memcached_server_add(memcached_st *ptr, const char *hostname, in_port_t port); +LIBMEMCACHED_LOCAL + memcached_return_t memcached_server_add_parsed(memcached_st *ptr, + const char *hostname, + size_t hostname_length, + in_port_t port, + uint32_t weight); + LIBMEMCACHED_API memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr, const char *hostname, @@ -122,42 +113,23 @@ LIBMEMCACHED_API memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, const char *hostname, in_port_t port, uint32_t weight); -/* Server List Public functions */ +/** + Operations on Single Servers. +*/ LIBMEMCACHED_API -void memcached_server_list_free(memcached_server_st *ptr); - +uint32_t memcached_server_response_count(memcached_server_instance_st self); LIBMEMCACHED_API -memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st *list); +const char *memcached_server_name(memcached_server_instance_st self); 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); +in_port_t memcached_server_port(memcached_server_instance_st self); LIBMEMCACHED_API -uint32_t memcached_servers_count(memcached_server_st *servers); - -LIBMEMCACHED_LOCAL -uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count); +const char *memcached_server_error(memcached_server_instance_st ptr); -#define memcached_server_count(A) (A)->number_of_hosts -#define memcached_server_name(A,B) (B).hostname -#define memcached_server_port(A,B) (B).port -#define memcached_server_list(A) (A)->servers -#define memcached_server_list_set(A,B) (A)->servers=(B) -#define memcached_server_response_count(A) (A)->cursor_active #ifdef __cplusplus } // extern "C"