projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update changelog
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 760fb04241c5a3ac77a28eee0ba97fdc89bb2e65..10b434f133fcf7df7b6d4f497e24b47f61d86f37 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-5,6
+5,8
@@
#ifndef __COMMON_H__
#define __COMMON_H__
#ifndef __COMMON_H__
#define __COMMON_H__
+#include "libmemcached/libmemcached_config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-22,6
+24,12
@@
#include <sys/un.h>
#include <netinet/tcp.h>
#include <sys/un.h>
#include <netinet/tcp.h>
+
+#include "libmemcached/memcached.h"
+#include "libmemcached/memcached_io.h"
+
+#include "libmemcached/memcached/protocol_binary.h"
+
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
@@
-35,12
+43,6
@@
-#include <memcached.h>
-#include "memcached_io.h"
-
-#include "memcached/protocol_binary.h"
-#include "libmemcached_config.h"
-
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
#define likely(x) if((x))
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
#define likely(x) if((x))
@@
-75,14
+77,19
@@
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)
+ MEM_HASH_WITH_PREFIX_KEY= (1 << 13),
+ MEM_NOREPLY= (1 << 14),
+ MEM_USE_UDP= (1 << 15),
+ MEM_AUTO_EJECT_HOSTS= (1 << 16)
} memcached_flags;
/* Hashing algo */
void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
uint32_t hash_crc32(const char *data,
size_t data_len);
} memcached_flags;
/* Hashing algo */
void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
uint32_t hash_crc32(const char *data,
size_t data_len);
+#ifdef HAVE_HSIEH_HASH
uint32_t hsieh_hash(const char *key, size_t key_length);
uint32_t hsieh_hash(const char *key, size_t key_length);
+#endif
uint32_t murmur_hash(const char *key, size_t key_length);
uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval);
uint32_t murmur_hash(const char *key, size_t key_length);
uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval);
@@
-90,7
+97,6
@@
memcached_return memcached_connect(memcached_server_st *ptr);
memcached_return memcached_response(memcached_server_st *ptr,
char *buffer, size_t buffer_length,
memcached_result_st *result);
memcached_return memcached_response(memcached_server_st *ptr,
char *buffer, size_t buffer_length,
memcached_result_st *result);
-uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_length);
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
#define memcached_server_response_increment(A) (A)->cursor_active++
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death);
#define memcached_server_response_increment(A) (A)->cursor_active++
@@
-105,18
+111,18
@@
memcached_return value_fetch(memcached_server_st *ptr,
memcached_result_st *result);
void server_list_free(memcached_st *ptr, memcached_server_st *servers);
memcached_result_st *result);
void server_list_free(memcached_st *ptr, memcached_server_st *servers);
-memcached_return memcachd_key_test(char **keys, size_t *key_length,
- unsigned int number_of_keys);
+memcached_return memcach
e
d_key_test(char **keys, size_t *key_length,
+
unsigned int number_of_keys);
memcached_return run_distribution(memcached_st *ptr);
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);
memcached_return memcached_server_remove(memcached_server_st *st_ptr);
uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
memcached_return memcached_server_remove(memcached_server_st *st_ptr);
+#ifndef HAVE_HTONLL
extern uint64_t ntohll(uint64_t);
extern uint64_t htonll(uint64_t);
extern uint64_t ntohll(uint64_t);
extern uint64_t htonll(uint64_t);
+#endif
memcached_return memcached_purge(memcached_server_st *ptr);
memcached_return memcached_purge(memcached_server_st *ptr);
@@
-132,7
+138,7
@@
static inline memcached_return memcached_validate_key_length(size_t key_length,
}
else
{
}
else
{
- unlikely (key_length >
250
)
+ unlikely (key_length >
= MEMCACHED_MAX_KEY
)
return MEMCACHED_BAD_KEY_PROVIDED;
}
return MEMCACHED_BAD_KEY_PROVIDED;
}