X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.c;h=0461c3c7a40816710854eaaae384e7c476c97401;hb=4effcb18b27e2d84a8b29bc311b5edbee3c004b6;hp=bcc211f655a4e9e88aa73aac4868970ab2c6ae1d;hpb=a4456cc10079f2e6f648befc91657f2723c825e5;p=awesomized%2Flibmemcached diff --git a/libmemcached/server.c b/libmemcached/server.c index bcc211f6..0461c3c7 100644 --- a/libmemcached/server.c +++ b/libmemcached/server.c @@ -19,6 +19,7 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r uint32_t weight, memcached_connection_t type) { self->options.sockaddr_inited= false; + self->options.is_shutting_down= false; self->number_of_hosts= 0; self->cursor_active= 0; self->port= port; @@ -28,6 +29,9 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r self->server_failure_counter= 0; self->weight= weight; self->state.is_corked= false; + self->state.is_dead= false; + WATCHPOINT_SET(self->io_wait_count.read= 0); + WATCHPOINT_SET(self->io_wait_count.write= 0); self->major_version= 0; self->micro_version= 0; self->minor_version= 0; @@ -53,7 +57,7 @@ static inline void _server_init(memcached_server_st *self, const memcached_st *r if (hostname == NULL) self->hostname[0]= 0; else - strncpy(self->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1); + strncpy(self->hostname, hostname, NI_MAXHOST - 1); } static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc) @@ -77,7 +81,8 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc return self; } -memcached_server_st *memcached_server_create_with(const memcached_st *memc, memcached_server_st *self, +memcached_server_st *memcached_server_create_with(const memcached_st *memc, + memcached_server_write_instance_st self, const char *hostname, in_port_t port, uint32_t weight, memcached_connection_t type) { @@ -100,7 +105,7 @@ memcached_server_st *memcached_server_create_with(const memcached_st *memc, memc void memcached_server_free(memcached_server_st *self) { - memcached_quit_server(self, 0); + memcached_quit_server(self, false); if (self->cached_server_error) free(self->cached_server_error); @@ -143,24 +148,21 @@ memcached_server_st *memcached_server_clone(memcached_server_st *destination, } -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) { - uint32_t y; - - for (y= 0; y < memcached_server_count(ptr); y++) + for (uint32_t x= 0; x < memcached_server_count(ptr); x++) { - uint32_t x; - memcached_server_instance_st *instance= - memcached_server_instance_fetch(ptr, y); + memcached_server_instance_st instance= + memcached_server_instance_by_position(ptr, x); - for (x= 0; x < number_of_callbacks; x++) + for (uint32_t y= 0; y < number_of_callbacks; y++) { unsigned int iferror; - iferror= (*callback[x])(ptr, instance, context); + iferror= (*callback[y])(ptr, instance, context); if (iferror) continue; @@ -170,10 +172,13 @@ memcached_return_t memcached_server_cursor(memcached_st *ptr, return MEMCACHED_SUCCESS; } -memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key, size_t key_length, memcached_return_t *error) +memcached_server_instance_st memcached_server_by_key(const memcached_st *ptr, + const char *key, + size_t key_length, + memcached_return_t *error) { uint32_t server_key; - memcached_server_instance_st *instance; + memcached_server_instance_st instance; *error= memcached_validate_key_length(key_length, ptr->flags.binary_protocol); @@ -193,17 +198,10 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key } server_key= memcached_generate_hash(ptr, key, key_length); - instance= memcached_server_instance_fetch(ptr, server_key); - - return memcached_server_clone(NULL, instance); + instance= memcached_server_instance_by_position(ptr, server_key); -} + return instance; -const char *memcached_server_error(memcached_server_st *ptr) -{ - return ptr - ? ptr->cached_server_error - : NULL; } void memcached_server_error_reset(memcached_server_st *ptr) @@ -211,19 +209,66 @@ void memcached_server_error_reset(memcached_server_st *ptr) ptr->cached_server_error[0]= 0; } -memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr) +memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr) { return ptr->last_disconnected_server; } -uint32_t memcached_server_list_count(memcached_server_st *ptr) +void memcached_server_list_free(memcached_server_list_st self) +{ + if (self == NULL) + return; + + const memcached_st *root= self->root; + + for (uint32_t x= 0; x < memcached_server_list_count(self); x++) + { + if (self[x].address_info) + { + freeaddrinfo(self[x].address_info); + self[x].address_info= NULL; + } + } + + if (root) + { + libmemcached_free(root, self); + } + else + { + free(self); + } +} + +uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count) +{ + return servers->number_of_hosts= count; +} + +uint32_t memcached_server_count(const memcached_st *self) +{ + return self->number_of_hosts; +} + +const char *memcached_server_name(memcached_server_instance_st self) { - return (ptr == NULL) - ? 0 - : memcached_servers_count(ptr); + return self->hostname; } -void memcached_server_list_free(memcached_server_st *ptr) +in_port_t memcached_server_port(memcached_server_instance_st self) { - server_list_free(NULL, ptr); + return self->port; } + +uint32_t memcached_server_response_count(memcached_server_instance_st self) +{ + return self->cursor_active; +} + +const char *memcached_server_error(memcached_server_instance_st ptr) +{ + return ptr + ? ptr->cached_server_error + : NULL; +} +