projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
See if this fixes issue with 64bit Ubuntu
[awesomized/libmemcached]
/
libmemcached
/
server.h
diff --git
a/libmemcached/server.h
b/libmemcached/server.h
index c3e3672b0144d889a2c81ae9c0cae04e06c49da9..98f5ed68553d1d29e069859a7c967d510fd34547 100644
(file)
--- a/
libmemcached/server.h
+++ b/
libmemcached/server.h
@@
-15,25
+15,26
@@
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
is_shutting_down:1
;
+ bool is_
dead:1
;
} options;
uint32_t number_of_hosts;
uint32_t cursor_active;
in_port_t port;
int cached_errno;
} options;
uint32_t number_of_hosts;
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;
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;
- } 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;
@@
-41,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;
@@
-76,9
+78,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);
@@
-94,6
+93,13
@@
LIBMEMCACHED_API
memcached_return_t memcached_server_add(memcached_st *ptr,
const char *hostname, in_port_t port);
memcached_return_t memcached_server_add(memcached_st *ptr,
const char *hostname, in_port_t port);
+LIBMEMCACHED_LOCAL
+ memcached_return_t memcached_server_add_parsed(memcached_st *ptr,
+ const char *hostname,
+ size_t hostname_length,
+ in_port_t port,
+ uint32_t weight);
+
LIBMEMCACHED_API
memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr,
const char *hostname,
LIBMEMCACHED_API
memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr,
const char *hostname,