projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in fix for makefiles.
[m6w6/libmemcached]
/
libmemcached
/
server.h
diff --git
a/libmemcached/server.h
b/libmemcached/server.h
index 4248e143f7c47e68d0a3c6c82d0a83b2e15458a9..fd731e0e1445d4b52ec4125b032bfbb2e3879c52 100644
(file)
--- a/
libmemcached/server.h
+++ b/
libmemcached/server.h
@@
-17,8
+17,8
@@
struct memcached_server_st {
struct {
bool is_allocated:1;
bool is_initialized:1;
struct {
bool is_allocated:1;
bool is_initialized:1;
- bool sockaddr_inited:1;
bool is_shutting_down:1;
bool is_shutting_down:1;
+ bool is_dead:1;
} options;
uint32_t number_of_hosts;
uint32_t cursor_active;
} options;
uint32_t number_of_hosts;
uint32_t cursor_active;
@@
-28,10
+28,6
@@
struct memcached_server_st {
uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t server_failure_counter;
uint32_t weight;
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:1;
- bool is_dead:1;
- } state;
struct {
uint32_t read;
uint32_t write;
struct {
uint32_t read;
uint32_t write;
@@
-46,6
+42,7
@@
struct memcached_server_st {
size_t read_data_length;
size_t write_buffer_offset;
struct addrinfo *address_info;
size_t read_data_length;
size_t write_buffer_offset;
struct addrinfo *address_info;
+ struct addrinfo *address_info_next;
time_t next_retry;
const memcached_st *root;
uint64_t limit_maxbytes;
time_t next_retry;
const memcached_st *root;
uint64_t limit_maxbytes;