projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Ignore *.exe
[awesomized/libmemcached]
/
libmemcached
/
memcached.h
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index 81120c5427c472eabd1c2b67fa0957438c138d80..58f9f673165aa666b794dbb869fc9a267176b74e 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-14,8
+14,6
@@
#define __LIBMEMCACHED_MEMCACHED_H__
#include <inttypes.h>
#define __LIBMEMCACHED_MEMCACHED_H__
#include <inttypes.h>
-#include <netdb.h>
-#include <netinet/in.h>
#include <stdlib.h>
#include <sys/types.h>
#include <stdlib.h>
#include <sys/types.h>
@@
-26,6
+24,7
@@
#include <libmemcached/visibility.h>
#include <libmemcached/configure.h>
#include <libmemcached/visibility.h>
#include <libmemcached/configure.h>
+#include <libmemcached/platform.h>
#include <libmemcached/constants.h>
#include <libmemcached/types.h>
#include <libmemcached/string.h>
#include <libmemcached/constants.h>
#include <libmemcached/types.h>
#include <libmemcached/string.h>
@@
-62,6
+61,7
@@
struct memcached_st {
struct {
bool is_purging:1;
bool is_processing_input:1;
struct {
bool is_purging:1;
bool is_processing_input:1;
+ bool is_time_for_rebuild:1;
} state;
struct {
// Everything below here is pretty static.
} state;
struct {
// Everything below here is pretty static.
@@
-71,7
+71,7
@@
struct memcached_st {
bool cork:1;
bool hash_with_prefix_key:1;
bool ketama_weighted:1;
bool cork:1;
bool hash_with_prefix_key:1;
bool ketama_weighted:1;
- bool no_block:1;
+ bool no_block:1;
// Don't block
bool no_reply:1;
bool randomize_replica_read:1;
bool reuse_memory:1;
bool no_reply:1;
bool randomize_replica_read:1;
bool reuse_memory:1;
@@
-81,6
+81,7
@@
struct memcached_st {
bool use_sort_hosts:1;
bool use_udp:1;
bool verify_key:1;
bool use_sort_hosts:1;
bool use_udp:1;
bool verify_key:1;
+ bool tcp_keepalive:1;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
@@
-94,6
+95,7
@@
struct memcached_st {
uint32_t io_msg_watermark;
uint32_t io_bytes_watermark;
uint32_t io_key_prefetch;
uint32_t io_msg_watermark;
uint32_t io_bytes_watermark;
uint32_t io_key_prefetch;
+ uint32_t tcp_keepidle;
int cached_errno;
int32_t poll_timeout;
int32_t connect_timeout;
int cached_errno;
int32_t poll_timeout;
int32_t connect_timeout;
@@
-122,17
+124,7
@@
struct memcached_st {
memcached_trigger_key_fn get_key_failure;
memcached_trigger_delete_key_fn delete_trigger;
memcached_callback_st *callbacks;
memcached_trigger_key_fn get_key_failure;
memcached_trigger_delete_key_fn delete_trigger;
memcached_callback_st *callbacks;
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
- struct {
- const sasl_callback_t *callbacks;
- /*
- ** Did we allocate data inside the callbacks, or did the user
- ** supply that.
- */
- bool is_allocated:1;
- } sasl;
-
-#endif
+ struct memcached_sasl_st *sasl;
char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
struct {
bool is_allocated:1;
char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
struct {
bool is_allocated:1;
@@
-153,6
+145,9
@@
memcached_st *memcached_create(memcached_st *ptr);
LIBMEMCACHED_API
void memcached_free(memcached_st *ptr);
LIBMEMCACHED_API
void memcached_free(memcached_st *ptr);
+LIBMEMCACHED_API
+void memcached_reset_last_disconnected_server(memcached_st *ptr);
+
LIBMEMCACHED_API
memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);
LIBMEMCACHED_API
memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);