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
/
memcached.h
diff --git
a/libmemcached-1.0/struct/memcached.h
b/libmemcached-1.0/struct/memcached.h
index 152f310330c8402428df3500a5a39731372c2269..624887b74daee55bbedc839ac81b3540d176dc4e 100644
(file)
--- a/
libmemcached-1.0/struct/memcached.h
+++ b/
libmemcached-1.0/struct/memcached.h
@@
-45,6
+45,7
@@
struct memcached_st {
bool is_purging:1;
bool is_processing_input:1;
bool is_time_for_rebuild:1;
bool is_purging:1;
bool is_processing_input:1;
bool is_time_for_rebuild:1;
+ bool is_parsing:1;
} state;
struct {
} state;
struct {
@@
-54,7
+55,7
@@
struct memcached_st {
bool buffer_requests:1;
bool hash_with_namespace:1;
bool no_block:1; // Don't block
bool buffer_requests:1;
bool hash_with_namespace:1;
bool no_block:1; // Don't block
- bool
no_
reply:1;
+ bool reply:1;
bool randomize_replica_read:1;
bool support_cas:1;
bool tcp_nodelay:1;
bool randomize_replica_read:1;
bool support_cas:1;
bool tcp_nodelay:1;
@@
-62,6
+63,9
@@
struct memcached_st {
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
+ bool is_aes:1;
+ bool is_fetching_version:1;
+ bool not_used:1;
} flags;
memcached_server_distribution_t distribution;
} flags;
memcached_server_distribution_t distribution;
@@
-70,8
+74,13
@@
struct memcached_st {
unsigned int version;
} server_info;
uint32_t number_of_hosts;
unsigned int version;
} server_info;
uint32_t number_of_hosts;
- memcached_server_st *servers;
- memcached_server_st *last_disconnected_server;
+#ifdef __cplusplus
+ org::libmemcached::Instance* servers;
+ org::libmemcached::Instance* last_disconnected_server;
+#else
+ void *servers;
+ void *last_disconnected_server;
+#endif
int32_t snd_timeout;
int32_t rcv_timeout;
uint32_t server_failure_limit;
int32_t snd_timeout;
int32_t rcv_timeout;
uint32_t server_failure_limit;
@@
-82,6
+91,7
@@
struct memcached_st {
int32_t poll_timeout;
int32_t connect_timeout; // How long we will wait on connect() before we will timeout
int32_t retry_timeout;
int32_t poll_timeout;
int32_t connect_timeout; // How long we will wait on connect() before we will timeout
int32_t retry_timeout;
+ int32_t dead_timeout;
int send_size;
int recv_size;
void *user_data;
int send_size;
int recv_size;
void *user_data;
@@
-90,11
+100,11
@@
struct memcached_st {
memcached_result_st result;
struct {
memcached_result_st result;
struct {
- bool weighted;
+ bool weighted
_
;
uint32_t continuum_count; // Ketama
uint32_t continuum_points_counter; // Ketama
time_t next_distribution_rebuild; // Ketama
uint32_t continuum_count; // Ketama
uint32_t continuum_points_counter; // Ketama
time_t next_distribution_rebuild; // Ketama
- memcached_continuum_item_st *continuum; // Ketama
+
struct
memcached_continuum_item_st *continuum; // Ketama
} ketama;
struct memcached_virtual_bucket_t *virtual_bucket;
} ketama;
struct memcached_virtual_bucket_t *virtual_bucket;