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-241
[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 138f9ef9ea623e9c88bc5fcd6ee90d1a07298702..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 {
@@
-63,6
+64,8
@@
struct memcached_st {
bool verify_key:1;
bool tcp_keepalive:1;
bool is_aes: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;
@@
-71,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;
- struct memcached_instance_st *servers;
- struct memcached_instance_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;
@@
-92,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;