projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This patch creates a couple of tests around how autoeject works.
[awesomized/libmemcached]
/
libmemcached
/
server.h
diff --git
a/libmemcached/server.h
b/libmemcached/server.h
index aeb493fe9cdf0edf6461acc6f1c98f5e8642806c..3afb5202f6eb95dcabf55cf0a73f688dd931ec13 100644
(file)
--- a/
libmemcached/server.h
+++ b/
libmemcached/server.h
@@
-38,11
+38,16
@@
#pragma once
#pragma once
+#ifndef WIN32
+#include <netdb.h>
+#endif
+
enum memcached_server_state_t {
enum memcached_server_state_t {
- MEMCACHED_SERVER_STATE_NEW,
- MEMCACHED_SERVER_STATE_ADDRINFO,
+ MEMCACHED_SERVER_STATE_NEW,
// fd == -1, no address lookup has been done
+ MEMCACHED_SERVER_STATE_ADDRINFO,
// ADDRRESS information has been gathered
MEMCACHED_SERVER_STATE_IN_PROGRESS,
MEMCACHED_SERVER_STATE_IN_PROGRESS,
- MEMCACHED_SERVER_STATE_CONNECTED
+ MEMCACHED_SERVER_STATE_CONNECTED,
+ MEMCACHED_SERVER_STATE_IN_TIMEOUT
};
struct memcached_server_st {
};
struct memcached_server_st {
@@
-55,11
+60,12
@@
struct memcached_server_st {
uint32_t number_of_hosts;
uint32_t cursor_active;
in_port_t port;
uint32_t number_of_hosts;
uint32_t cursor_active;
in_port_t port;
- int cached_errno;
memcached_socket_t fd;
uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t server_failure_counter;
memcached_socket_t fd;
uint32_t io_bytes_sent; /* # bytes sent since last read */
uint32_t server_failure_counter;
+ uint64_t server_failure_counter_query_id;
uint32_t weight;
uint32_t weight;
+ uint32_t version;
enum memcached_server_state_t state;
struct {
uint32_t read;
enum memcached_server_state_t state;
struct {
uint32_t read;
@@
-70,7
+76,6
@@
struct memcached_server_st {
uint8_t minor_version; // ditto
memcached_connection_t type;
char *read_ptr;
uint8_t minor_version; // ditto
memcached_connection_t type;
char *read_ptr;
- char *cached_server_error;
size_t read_buffer_length;
size_t read_data_length;
size_t write_buffer_offset;
size_t read_buffer_length;
size_t read_data_length;
size_t write_buffer_offset;
@@
-79,6
+84,7
@@
struct memcached_server_st {
time_t next_retry;
memcached_st *root;
uint64_t limit_maxbytes;
time_t next_retry;
memcached_st *root;
uint64_t limit_maxbytes;
+ struct memcached_error_t *error_messages;
char read_buffer[MEMCACHED_MAX_BUFFER];
char write_buffer[MEMCACHED_MAX_BUFFER];
char hostname[NI_MAXHOST];
char read_buffer[MEMCACHED_MAX_BUFFER];
char write_buffer[MEMCACHED_MAX_BUFFER];
char hostname[NI_MAXHOST];
@@
-109,7
+115,7
@@
void memcached_server_free(memcached_server_st *ptr);
LIBMEMCACHED_LOCAL
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
LIBMEMCACHED_LOCAL
memcached_server_st *memcached_server_clone(memcached_server_st *destination,
-
const
memcached_server_st *source);
+ memcached_server_st *source);
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);
@@
-126,6
+132,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,
@@
-144,18
+157,20
@@
memcached_return_t memcached_server_add_with_weight(memcached_st *ptr, const cha
Operations on Single Servers.
*/
LIBMEMCACHED_API
Operations on Single Servers.
*/
LIBMEMCACHED_API
-uint32_t memcached_server_response_count(memcached_server_instance_st self);
+uint32_t memcached_server_response_count(
const
memcached_server_instance_st self);
LIBMEMCACHED_API
LIBMEMCACHED_API
-const char *memcached_server_name(memcached_server_instance_st self);
+const char *memcached_server_name(
const
memcached_server_instance_st self);
LIBMEMCACHED_API
LIBMEMCACHED_API
-in_port_t memcached_server_port(memcached_server_instance_st self);
+in_port_t memcached_server_port(
const
memcached_server_instance_st self);
LIBMEMCACHED_API
LIBMEMCACHED_API
-const char *memcached_server_
error(
memcached_server_instance_st ptr);
+const char *memcached_server_
type(const
memcached_server_instance_st ptr);
+LIBMEMCACHED_LOCAL
+void __server_free(memcached_server_st *);
#ifdef __cplusplus
} // extern "C"
#ifdef __cplusplus
} // extern "C"