X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=8cef723a850e1aa2fceeb2f45f99587166cc4226;hb=c62f7a6ae820d1edf39e72176a08999b8e6d33a5;hp=288f421d4280b83072827f59041cab5c39cff574;hpb=8fce86636639afaeac4ca0e869e8bcd833324a62;p=awesomized%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 288f421d..8cef723a 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16,7 +17,6 @@
 #include <netdb.h>
 #include <unistd.h>
 #include <limits.h>
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/un.h>
@@ -41,18 +41,17 @@
 #include <libmemcached_config.h>
 
 #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(x, expected_value) (x)
-
-#define likely(x)       __builtin_expect((x),1)
-#define unlikely(x)     __builtin_expect((x),0)
-
-#else
 
 #define likely(x)       if((x))
 #define unlikely(x)     if((x))
 
+#else
+
+#define likely(x)       if(__builtin_expect(!!(x), 1))
+#define unlikely(x)     if(__builtin_expect((x), 0))
 #endif
 
+
 #ifdef HAVE_DTRACE
 #define _DTRACE_VERSION 1
 #else
@@ -72,7 +71,7 @@ typedef enum {
   MEM_TCP_NODELAY= (1 << 1),
   MEM_REUSE_MEMORY= (1 << 2),
   MEM_USE_MD5= (1 << 3),
-  MEM_USE_KETAMA= (1 << 4),
+  /* 4 was once Ketama */
   MEM_USE_CRC= (1 << 5),
   MEM_USE_CACHE_LOOKUPS= (1 << 6),
   MEM_SUPPORT_CAS= (1 << 7),
@@ -82,24 +81,24 @@ typedef enum {
 } memcached_flags;
 
 /* Hashing algo */
-void md5_signature(unsigned char *key, unsigned int length, unsigned char *result);
+void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
 uint32_t hash_crc32(const char *data,
                     size_t data_len);
-uint32_t hsieh_hash(char *key, size_t key_length);
-uint32_t murmur_hash(char *key, size_t key_length);
+uint32_t hsieh_hash(const char *key, size_t key_length);
+uint32_t murmur_hash(const char *key, size_t key_length);
 
 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);
-unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length);
+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++
 #define memcached_server_response_decrement(A) (A)->cursor_active--
 #define memcached_server_response_reset(A) (A)->cursor_active=0
 
-memcached_return memcached_do(memcached_server_st *ptr, char *commmand,
+memcached_return memcached_do(memcached_server_st *ptr, const char *commmand,
                               size_t command_length, uint8_t with_flush);
 memcached_return memcached_version(memcached_st *ptr);
 memcached_return value_fetch(memcached_server_st *ptr,
@@ -110,4 +109,7 @@ 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 run_distribution(memcached_st *ptr);
+
+uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
 #endif /* __COMMON_H__ */