projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of build.
[awesomized/libmemcached]
/
libmemcached-1.0
/
struct
/
server.h
diff --git
a/libmemcached-1.0/struct/server.h
b/libmemcached-1.0/struct/server.h
index 183b37393226afb9629eea876a68d08782a4b577..fe984d1ce991bd92baf4a334569879b9641691ea 100644
(file)
--- a/
libmemcached-1.0/struct/server.h
+++ b/
libmemcached-1.0/struct/server.h
@@
-48,6
+48,12
@@
#define MEMCACHED_NI_MAXHOST 1025
#endif
#define MEMCACHED_NI_MAXHOST 1025
#endif
+#ifdef NI_MAXSERV
+#define MEMCACHED_NI_MAXSERV NI_MAXSERV
+#else
+#define MEMCACHED_NI_MAXSERV 32
+#endif
+
enum memcached_server_state_t {
MEMCACHED_SERVER_STATE_NEW, // fd == -1, no address lookup has been done
MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
enum memcached_server_state_t {
MEMCACHED_SERVER_STATE_NEW, // fd == -1, no address lookup has been done
MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
@@
-66,8
+72,8
@@
struct memcached_server_st {
uint32_t number_of_hosts;
uint32_t cursor_active;
in_port_t port;
uint32_t number_of_hosts;
uint32_t cursor_active;
in_port_t port;
- memcached_socket_t fd;
uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t io_bytes_sent; /* # bytes sent since last read */
+ uint32_t request_id;
uint32_t server_failure_counter;
uint64_t server_failure_counter_query_id;
uint32_t weight;
uint32_t server_failure_counter;
uint64_t server_failure_counter_query_id;
uint32_t weight;
@@
-76,22
+82,16
@@
struct memcached_server_st {
struct {
uint32_t read;
uint32_t write;
struct {
uint32_t read;
uint32_t write;
+ uint32_t timeouts;
+ size_t _bytes_read;
} io_wait_count;
uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
} 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 micro_version; // ditto
, and note that this is the third, not second version bit
uint8_t minor_version; // ditto
memcached_connection_t type;
uint8_t minor_version; // ditto
memcached_connection_t type;
- char *read_ptr;
- size_t read_buffer_length;
- size_t read_data_length;
- size_t write_buffer_offset;
- struct addrinfo *address_info;
- struct addrinfo *address_info_next;
time_t next_retry;
struct memcached_st *root;
uint64_t limit_maxbytes;
struct memcached_error_t *error_messages;
time_t next_retry;
struct memcached_st *root;
uint64_t limit_maxbytes;
struct memcached_error_t *error_messages;
- char read_buffer[MEMCACHED_MAX_BUFFER];
- char write_buffer[MEMCACHED_MAX_BUFFER];
char hostname[MEMCACHED_NI_MAXHOST];
};
char hostname[MEMCACHED_NI_MAXHOST];
};