projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixes issue where if illegal options caused parsing to fail an incorrect
[awesomized/libmemcached]
/
libmemcached
/
memcached.h
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index 2244c62dc2fa67c3911937d2f7d43046cc316fb5..193eb33c723f8300c5102e962b7f0f31ada1b73a 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,9
+24,12
@@
#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>
+#include <libmemcached/array.h>
+#include <libmemcached/error.h>
#include <libmemcached/stats.h>
#include <libhashkit/hashkit.h>
// Everything above this line must be in the order specified.
#include <libmemcached/stats.h>
#include <libhashkit/hashkit.h>
// Everything above this line must be in the order specified.
@@
-44,6
+45,7
@@
#include <libmemcached/flush_buffers.h>
#include <libmemcached/get.h>
#include <libmemcached/hash.h>
#include <libmemcached/flush_buffers.h>
#include <libmemcached/get.h>
#include <libmemcached/hash.h>
+#include <libmemcached/options.h>
#include <libmemcached/parse.h>
#include <libmemcached/quit.h>
#include <libmemcached/result.h>
#include <libmemcached/parse.h>
#include <libmemcached/quit.h>
#include <libmemcached/result.h>
@@
-62,6
+64,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
+74,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;
@@
-82,6
+85,7
@@
struct memcached_st {
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
bool use_udp:1;
bool verify_key:1;
bool tcp_keepalive:1;
+ bool ping_service:1;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
} flags;
memcached_server_distribution_t distribution;
hashkit_st hashkit;
@@
-105,7
+109,6
@@
struct memcached_st {
int recv_size;
void *user_data;
time_t next_distribution_rebuild; // Ketama
int recv_size;
void *user_data;
time_t next_distribution_rebuild; // Ketama
- size_t prefix_key_length;
uint32_t number_of_replicas;
hashkit_st distribution_hashkit;
memcached_result_st result;
uint32_t number_of_replicas;
hashkit_st distribution_hashkit;
memcached_result_st result;
@@
-124,18
+127,12
@@
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 memcached_sasl_st sasl;
+ struct memcached_error_st *error_messages;
+ struct memcached_array_st *prefix_key;
struct {
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
- char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
+ struct memcached_array_st *filename;
+ } configure;
struct {
bool is_allocated:1;
} options;
struct {
bool is_allocated:1;
} options;
@@
-152,9
+149,18
@@
void memcached_servers_reset(memcached_st *ptr);
LIBMEMCACHED_API
memcached_st *memcached_create(memcached_st *ptr);
LIBMEMCACHED_API
memcached_st *memcached_create(memcached_st *ptr);
+LIBMEMCACHED_API
+memcached_st *memcached_create_with_options(const char *string, size_t length);
+
LIBMEMCACHED_API
void memcached_free(memcached_st *ptr);
LIBMEMCACHED_API
void memcached_free(memcached_st *ptr);
+LIBMEMCACHED_API
+memcached_return_t memcached_reset(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);