projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Rollup merge.
[awesomized/libmemcached]
/
libmemcached
/
server.h
diff --git
a/libmemcached/server.h
b/libmemcached/server.h
index 92e6d88888d9594df71076ddc76ea721da60684e..4248e143f7c47e68d0a3c6c82d0a83b2e15458a9 100644
(file)
--- a/
libmemcached/server.h
+++ b/
libmemcached/server.h
@@
-24,16
+24,21
@@
struct memcached_server_st {
uint32_t cursor_active;
in_port_t port;
int cached_errno;
uint32_t cursor_active;
in_port_t port;
int cached_errno;
-
in
t fd;
+
memcached_socket_
t fd;
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.
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;
+ bool is_corked:1;
+ bool is_dead:1;
} state;
} state;
- uint8_t major_version;
- uint8_t micro_version;
- uint8_t minor_version;
+ struct {
+ uint32_t read;
+ uint32_t write;
+ } 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 minor_version; // ditto
memcached_connection_t type;
char *read_ptr;
char *cached_server_error;
memcached_connection_t type;
char *read_ptr;
char *cached_server_error;