projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Straighten up exection path
[m6w6/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 9b8a104098d30b06ca162f1a7555335932c38797..b8c8acf5279b84930e313157f22669b6c6a66b0d 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-22,11
+22,11
@@
#include <sys/un.h>
#include <netinet/tcp.h>
#include <sys/un.h>
#include <netinet/tcp.h>
-#if TIME_WITH_SYS_TIME
+#if
def
TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# include <sys/time.h>
# include <time.h>
#else
-# if HAVE_SYS_TIME_H
+# if
def
HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# include <sys/time.h>
# else
# include <time.h>
@@
-82,6
+82,7
@@
typedef enum {
/* 11 used for weighted ketama */
MEM_KETAMA_WEIGHTED= (1 << 11),
MEM_BINARY_PROTOCOL= (1 << 12),
/* 11 used for weighted ketama */
MEM_KETAMA_WEIGHTED= (1 << 11),
MEM_BINARY_PROTOCOL= (1 << 12),
+ MEM_HASH_WITH_PREFIX_KEY= (1 << 13)
} memcached_flags;
/* Hashing algo */
} memcached_flags;
/* Hashing algo */
@@
-90,6
+91,7
@@
uint32_t hash_crc32(const char *data,
size_t data_len);
uint32_t hsieh_hash(const char *key, size_t key_length);
uint32_t murmur_hash(const char *key, size_t key_length);
size_t data_len);
uint32_t hsieh_hash(const char *key, size_t key_length);
uint32_t murmur_hash(const char *key, size_t key_length);
+uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval);
memcached_return memcached_connect(memcached_server_st *ptr);
memcached_return memcached_response(memcached_server_st *ptr,
memcached_return memcached_connect(memcached_server_st *ptr);
memcached_return memcached_response(memcached_server_st *ptr,
@@
-118,9
+120,13
@@
memcached_return run_distribution(memcached_st *ptr);
uint32_t generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm);
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
uint32_t generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm);
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
-memcached_return server_remove(memcached_server_st *st_ptr);
+memcached_return
memcached_
server_remove(memcached_server_st *st_ptr);
extern uint64_t ntohll(uint64_t);
extern uint64_t htonll(uint64_t);
extern uint64_t ntohll(uint64_t);
extern uint64_t htonll(uint64_t);
+void host_reset(memcached_st *ptr, memcached_server_st *host,
+ const char *hostname, unsigned int port, uint32_t weight,
+ memcached_connection type);
+
#endif /* __COMMON_H__ */
#endif /* __COMMON_H__ */