projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-115
[m6w6/libmemcached]
/
libmemcached-1.0
/
struct
/
server.h
diff --git
a/libmemcached-1.0/struct/server.h
b/libmemcached-1.0/struct/server.h
index e2be59b87a960dd3c797f522b1fb31cc4e67e681..33bdc0491eb8dd42b4a343812a4821f8efcd259b 100644
(file)
--- a/
libmemcached-1.0/struct/server.h
+++ b/
libmemcached-1.0/struct/server.h
@@
-38,20
+38,20
@@
#pragma once
#pragma once
-#if
ndef WIN32
-#include <netdb.h>
+#if
def HAVE_NETDB_H
+#
include <netdb.h>
#endif
#ifdef NI_MAXHOST
#endif
#ifdef NI_MAXHOST
-#define MEMCACHED_NI_MAXHOST NI_MAXHOST
+#
define MEMCACHED_NI_MAXHOST NI_MAXHOST
#else
#else
-#define MEMCACHED_NI_MAXHOST 1025
+#
define MEMCACHED_NI_MAXHOST 1025
#endif
#ifdef NI_MAXSERV
#endif
#ifdef NI_MAXSERV
-#define MEMCACHED_NI_MAXSERV NI_MAXSERV
+#
define MEMCACHED_NI_MAXSERV NI_MAXSERV
#else
#else
-#define MEMCACHED_NI_MAXSERV 32
+#
define MEMCACHED_NI_MAXSERV 32
#endif
enum memcached_server_state_t {
#endif
enum memcached_server_state_t {
@@
-59,7
+59,8
@@
enum memcached_server_state_t {
MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
MEMCACHED_SERVER_STATE_IN_PROGRESS,
MEMCACHED_SERVER_STATE_CONNECTED,
MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered
MEMCACHED_SERVER_STATE_IN_PROGRESS,
MEMCACHED_SERVER_STATE_CONNECTED,
- MEMCACHED_SERVER_STATE_IN_TIMEOUT
+ MEMCACHED_SERVER_STATE_IN_TIMEOUT,
+ MEMCACHED_SERVER_STATE_DISABLED
};
struct memcached_server_st {
};
struct memcached_server_st {
@@
-72,8
+73,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;
@@
-83,22
+84,15
@@
struct memcached_server_st {
uint32_t read;
uint32_t write;
uint32_t timeouts;
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];
};