X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=fd731e0e1445d4b52ec4125b032bfbb2e3879c52;hb=f285e1b3821f56a8983b5ce9fb1a0070e7bb0a1c;hp=7d0be18906284f5c83ff97fc92f8b522fa6b4bea;hpb=9a00fe7032d5b9521004198479a4656f77bd4e3c;p=awesomized%2Flibmemcached

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 7d0be189..fd731e0e 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;
@@ -61,7 +63,7 @@ memcached_return_t memcached_server_cursor(const memcached_st *ptr,
                                            uint32_t number_of_callbacks);
 
 LIBMEMCACHED_API
-  memcached_server_instance_st *memcached_server_by_key(const memcached_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);
@@ -77,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_instance_st *memcached_server_get_last_disconnect(const memcached_st *ptr);
+memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr);
 
 
 LIBMEMCACHED_API
@@ -107,56 +106,21 @@ 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.
 */
 LIBMEMCACHED_API
-uint32_t memcached_server_response_count(memcached_server_instance_st *self);
+uint32_t memcached_server_response_count(memcached_server_instance_st self);
 
 LIBMEMCACHED_API
-const char *memcached_server_name(memcached_server_instance_st *self);
+const char *memcached_server_name(memcached_server_instance_st self);
 
 LIBMEMCACHED_API
-in_port_t memcached_server_port(memcached_server_instance_st *self);
+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_error(memcached_server_instance_st ptr);