Merge Thomason's cork patch.

[awesomized/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index d8e9daa849674666ee01e496da9088e4ec9dd412..0051e0617a0c53f2192c1f8cb007ee423e3ab4e0 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -21,7 +21,7 @@ struct memcached_server_st {
     bool is_allocated:1;
     bool sockaddr_inited:1;
   } options;
-  uint16_t count;
+  uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
   int cached_errno;
@@ -29,6 +29,9 @@ struct memcached_server_st {
   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;
@@ -47,10 +50,25 @@ struct memcached_server_st {
   char hostname[MEMCACHED_MAX_HOST_LENGTH];
 };
 
+// Local Only Inline
+static inline uint32_t memcached_servers_count(memcached_server_st *servers)
+{
+  return servers->number_of_hosts;
+}
+
+// Local Only Inline
+static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
+{
+  return servers->number_of_hosts= count;
+}
+
+
+
 #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)->hosts
+#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
 
 LIBMEMCACHED_API
@@ -74,10 +92,10 @@ 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_API
+LIBMEMCACHED_LOCAL
 memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_server_st *memcached_server_create_with(memcached_st *memc,
                                                   memcached_server_st *host,
                                                   const char *hostname,
@@ -88,7 +106,7 @@ memcached_server_st *memcached_server_create_with(memcached_st *memc,
 LIBMEMCACHED_API
 void memcached_server_free(memcached_server_st *ptr);
 
-LIBMEMCACHED_API
+LIBMEMCACHED_LOCAL
 memcached_server_st *memcached_server_clone(memcached_server_st *clone,
                                             memcached_server_st *ptr);