Small updates/wins around non-block IO

[m6w6/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index 8a9b7a3663cbf90128da55a90040ac12593947c8..eabf7f0ff95725cf506f892810c68f09a6697711 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -15,10 +15,10 @@
 
 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 sockaddr_inited:1;
+    bool is_shutting_down:1;
   } options;
   uint32_t number_of_hosts;
   uint32_t cursor_active;
@@ -29,8 +29,13 @@ struct memcached_server_st {
   uint32_t server_failure_counter;
   uint32_t weight;
   struct { // Place any "state" sort variables in here.
-    bool is_corked;
+    bool is_corked:1;
+    bool is_dead:1;
   } state;
+  struct {
+    uint32_t read;
+    uint32_t write;
+  } io_wait_count;
   uint8_t major_version;
   uint8_t micro_version;
   uint8_t minor_version;
@@ -61,13 +66,10 @@ memcached_return_t memcached_server_cursor(const memcached_st *ptr,
                                            uint32_t number_of_callbacks);
 
 LIBMEMCACHED_API
-  const memcached_server_st *memcached_server_by_key(const memcached_st *ptr,
-                                                     const char *key,
-                                                     size_t key_length,
-                                                     memcached_return_t *error);
-
-LIBMEMCACHED_API
-const char *memcached_server_error(const 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);
@@ -80,10 +82,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
@@ -110,50 +109,22 @@ 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);
 
+/**
+  Operations on Single Servers.
+*/
 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);
+uint32_t memcached_server_response_count(memcached_server_instance_st self);
 
 LIBMEMCACHED_API
-memcached_server_st *memcached_server_list(memcached_st *);
-
-LIBMEMCACHED_LOCAL
-void memcached_server_list_set(memcached_st *self, memcached_server_st *list);
+const char *memcached_server_name(memcached_server_instance_st self);
 
 LIBMEMCACHED_API
-uint32_t memcached_server_response_count(const memcached_server_st *self);
+in_port_t memcached_server_port(memcached_server_instance_st self);
 
 LIBMEMCACHED_API
-const char *memcached_server_name(const memcached_server_st *self);
+const char *memcached_server_error(memcached_server_instance_st ptr);
 
-LIBMEMCACHED_API
-in_port_t memcached_server_port(const memcached_server_st *self);
 
 
 #ifdef __cplusplus