X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=a45616a1010109f2f814f8682381e0dba98514f0;hb=5a9c49c1e9f1950045eb845277c370324ac9ef16;hp=2fc25f6969710093df66627b0b1f1b30bdc0650d;hpb=c29c787187baac1f403668a5dbf8ba481b9a8c8e;p=m6w6%2Flibmemcached diff --git a/libmemcached/server.h b/libmemcached/server.h index 2fc25f69..a45616a1 100644 --- a/libmemcached/server.h +++ b/libmemcached/server.h @@ -1,49 +1,83 @@ -/* LibMemcached - * Copyright (C) 2006-2009 Brian Aker - * All rights reserved. +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Libmemcached library * - * Use and distribution licensed under the BSD license. See - * the COPYING file in the parent directory for full text. + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2006-2009 Brian Aker All rights reserved. * - * Summary: String structure used for libmemcached. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -#ifndef __LIBMEMCACHED_SERVER_H__ -#define __LIBMEMCACHED_SERVER_H__ +#pragma once + +enum memcached_server_state_t { + MEMCACHED_SERVER_STATE_NEW, // fd == -1, no address lookup has been done + MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered + MEMCACHED_SERVER_STATE_IN_PROGRESS, + MEMCACHED_SERVER_STATE_CONNECTED +}; 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; + enum memcached_server_state_t state; + 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; size_t read_buffer_length; 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; + memcached_st *root; uint64_t limit_maxbytes; + struct memcached_error_t *error_messages; char read_buffer[MEMCACHED_MAX_BUFFER]; char write_buffer[MEMCACHED_MAX_BUFFER]; char hostname[NI_MAXHOST]; @@ -76,9 +110,6 @@ LIBMEMCACHED_LOCAL 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_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr); @@ -94,6 +125,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, @@ -107,41 +145,6 @@ 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 */ - -LIBMEMCACHED_API -void memcached_server_list_free(memcached_server_st *ptr); - - -LIBMEMCACHED_API -memcached_return_t memcached_server_push(memcached_st *ptr, const 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 -uint32_t memcached_server_list_count(const memcached_server_st *ptr); - -LIBMEMCACHED_API -uint32_t memcached_server_count(const memcached_st *); - - -LIBMEMCACHED_LOCAL -uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count); - -LIBMEMCACHED_API -memcached_server_st *memcached_server_list(memcached_st *); - -LIBMEMCACHED_LOCAL -void memcached_server_list_set(memcached_st *self, memcached_server_st *list); /** Operations on Single Servers. @@ -156,12 +159,12 @@ LIBMEMCACHED_API in_port_t memcached_server_port(memcached_server_instance_st self); LIBMEMCACHED_API -const char *memcached_server_error(memcached_server_instance_st ptr); +const char *memcached_server_type(memcached_server_instance_st ptr); +LIBMEMCACHED_LOCAL +void __server_free(memcached_server_st *); #ifdef __cplusplus } // extern "C" #endif - -#endif /* __LIBMEMCACHED_SERVER_H__ */