Merge.

[awesomized/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index 891c9c73ab596cfd8ded2d60c91cdbe7b822a52a..8b60a384f1781b69b4a3fdbed484469b2a16b4ef 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 struct memcached_server_st {
-  memcached_allocated is_allocated;
+  bool is_allocated;
   char hostname[MEMCACHED_MAX_HOST_LENGTH];
   unsigned int port;
   int fd;
@@ -26,7 +26,7 @@ struct memcached_server_st {
   size_t read_data_length;
   size_t read_buffer_length;
   char *read_ptr;
-  memcached_allocated sockaddr_inited;
+  bool sockaddr_inited;
   struct addrinfo *address_info;
   memcached_connection type;
   uint8_t major_version;
@@ -37,6 +37,8 @@ struct memcached_server_st {
   memcached_st *root;
   uint64_t limit_maxbytes;
   uint32_t server_failure_counter;
+  uint32_t io_bytes_sent; /* # bytes sent since last read */
+  uint32_t weight;
 };
 
 #define memcached_server_count(A) (A)->number_of_hosts
@@ -55,6 +57,11 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key
 
 /* These should not currently be used by end users */
 memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr);
+
+memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host, 
+                                                  const char *hostname, unsigned int port, 
+                                                  uint32_t weight, memcached_connection type);
+
 void memcached_server_free(memcached_server_st *ptr);
 memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);