Merging Trond

[awesomized/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index ca81b0d32caba2b2df4f4958acaa8843eedb041b..1d68f24e614fb3b0b0393471bf7a2a2ca0147731 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -14,31 +14,31 @@ extern "C" {
 #endif
 
 struct memcached_server_st {
-  memcached_allocated is_allocated;
-  char hostname[MEMCACHED_MAX_HOST_LENGTH];
+  bool is_allocated;
+  bool sockaddr_inited;
+  uint16_t count;
+  unsigned int cursor_active;
   unsigned int port;
-  int fd;
   int cached_errno;
-  unsigned int cursor_active;
-  char write_buffer[MEMCACHED_MAX_BUFFER];
-  size_t write_buffer_offset;
-  char read_buffer[MEMCACHED_MAX_BUFFER];
-  size_t read_data_length;
-  size_t read_buffer_length;
-  char *read_ptr;
-  memcached_allocated sockaddr_inited;
-  struct addrinfo *address_info;
-  memcached_connection type;
+  int fd;
+  uint32_t io_bytes_sent; /* # bytes sent since last read */
+  uint32_t server_failure_counter;
+  uint32_t weight;
   uint8_t major_version;
-  uint8_t minor_version;
   uint8_t micro_version;
-  uint16_t count;
+  uint8_t minor_version;
+  memcached_connection type;
+  char *read_ptr;
+  size_t read_buffer_length;
+  size_t read_data_length;
+  size_t write_buffer_offset;
+  struct addrinfo *address_info;
   time_t next_retry;
   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;
+  char read_buffer[MEMCACHED_MAX_BUFFER];
+  char write_buffer[MEMCACHED_MAX_BUFFER];
+  char hostname[MEMCACHED_MAX_HOST_LENGTH];
 };
 
 #define memcached_server_count(A) (A)->number_of_hosts
@@ -64,6 +64,8 @@ memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_
 
 void memcached_server_free(memcached_server_st *ptr);
 memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);
+memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *stat,
+                                         memcached_return *error);
 
 
 #ifdef __cplusplus