projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for interface issues (Bug 571909 <571909@bugs.launchpad.net>)
[m6w6/libmemcached]
/
libmemcached
/
server.h
diff --git
a/libmemcached/server.h
b/libmemcached/server.h
index c3e3672b0144d889a2c81ae9c0cae04e06c49da9..eabf7f0ff95725cf506f892810c68f09a6697711 100644
(file)
--- a/
libmemcached/server.h
+++ b/
libmemcached/server.h
@@
-15,10
+15,10
@@
struct memcached_server_st {
struct {
struct memcached_server_st {
struct {
- bool is_allocated
MEMCACHED_BITFIELD
;
- bool is_initialized
MEMCACHED_BITFIELD
;
- bool sockaddr_inited
MEMCACHED_BITFIELD
;
- bool is_shutting_down
MEMCACHED_BITFIELD
;
+ bool is_allocated
:1
;
+ bool is_initialized
:1
;
+ bool sockaddr_inited
:1
;
+ bool is_shutting_down
:1
;
} options;
uint32_t number_of_hosts;
uint32_t cursor_active;
} options;
uint32_t number_of_hosts;
uint32_t cursor_active;
@@
-29,8
+29,13
@@
struct memcached_server_st {
uint32_t server_failure_counter;
uint32_t weight;
struct { // Place any "state" sort variables in here.
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;
+ struct {
+ uint32_t read;
+ uint32_t write;
+ } io_wait_count;
uint8_t major_version;
uint8_t micro_version;
uint8_t minor_version;
uint8_t major_version;
uint8_t micro_version;
uint8_t minor_version;
@@
-76,9
+81,6
@@
LIBMEMCACHED_LOCAL
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
const memcached_server_st *source);
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
const memcached_server_st *source);
-LIBMEMCACHED_API
-memcached_return_t memcached_server_remove(memcached_server_st *st_ptr);
-
LIBMEMCACHED_API
memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr);
LIBMEMCACHED_API
memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr);