X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=a7d95af71617c0b827f7156cae634d6cf4bbf94e;hb=29251f6f205e2323a473c181aaee98786fc90dca;hp=1d77ba1674891c01a94a42af89fbda3fc66b0a0d;hpb=55b5455291498ef63c1c34976552d58708a74732;p=m6w6%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 1d77ba16..a7d95af7 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -13,8 +13,8 @@
   Common include file for libmemached
 */
 
-#ifndef LIBMEMCACHED_COMMON_H
-#define LIBMEMCACHED_COMMON_H
+#ifndef __LIBMEMCACHED_COMMON_H__
+#define __LIBMEMCACHED_COMMON_H__
 
 #include "config.h"
 
@@ -24,16 +24,10 @@
 #include <strings.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/un.h>
-#include <netinet/tcp.h>
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -54,10 +48,22 @@
 #include "libmemcached/memcached.h"
 #include "libmemcached/watchpoint.h"
 
-typedef struct memcached_server_st memcached_server_instance_st;
+typedef struct memcached_server_st * memcached_server_write_instance_st;
+
+typedef memcached_return_t (*memcached_server_execute_fn)(memcached_st *ptr, memcached_server_write_instance_st server, void *context);
+
+LIBMEMCACHED_LOCAL
+memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key);
+
+LIBMEMCACHED_LOCAL
+memcached_return_t memcached_server_execute(memcached_st *ptr,
+                                            memcached_server_execute_fn callback,
+                                            void *context);
+
 
 /* These are private not to be installed headers */
 #include "libmemcached/io.h"
+#include "libmemcached/do.h"
 #include "libmemcached/internal.h"
 #include "libmemcached/libmemcached_probes.h"
 #include "libmemcached/memcached/protocol_binary.h"
@@ -75,7 +81,7 @@ struct memcached_continuum_item_st
 typedef enum {
   MEM_NOT= -1,
   MEM_FALSE= false,
-  MEM_TRUE= true,
+  MEM_TRUE= true
 } memcached_ternary_t;
 
 
@@ -95,52 +101,49 @@ typedef enum {
 #define SMALL_STRING_LEN 1024
 #define HUGE_STRING_LEN 8196
 
-/* Hashing algo */
-
-LIBMEMCACHED_LOCAL
-void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
-LIBMEMCACHED_LOCAL
-uint32_t hash_crc32(const char *data,
-                    size_t data_len);
-#ifdef HAVE_HSIEH_HASH
-LIBMEMCACHED_LOCAL
-uint32_t hsieh_hash(const char *key, size_t key_length);
+#ifdef __cplusplus
+extern "C" {
 #endif
-LIBMEMCACHED_LOCAL
-uint32_t murmur_hash(const char *key, size_t key_length);
-LIBMEMCACHED_LOCAL
-uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval);
 
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_connect(memcached_server_instance_st *ptr);
+memcached_return_t memcached_connect(memcached_server_write_instance_st ptr);
+
 LIBMEMCACHED_LOCAL
-void memcached_quit_server(memcached_server_instance_st *ptr, uint8_t io_death);
+memcached_return_t run_distribution(memcached_st *ptr);
 
 #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
 
+// These are private 
+#define memcached_is_allocated(__object) ((__object)->options.is_allocated)
+#define memcached_is_initialized(__object) ((__object)->options.is_initialized)
+#define memcached_is_purging(__object) ((__object)->state.is_purging)
+#define memcached_is_processing_input(__object) ((__object)->state.is_processing_input)
+#define memcached_set_purging(__object, __value) ((__object)->state.is_purging= (__value))
+#define memcached_set_processing_input(__object, __value) ((__object)->state.is_processing_input= (__value))
+#define memcached_set_initialized(__object, __value) ((__object)->options.is_initialized(= (__value))
+#define memcached_set_allocated(__object, __value) ((__object)->options.is_allocated(= (__value))
+
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_do(memcached_server_instance_st *ptr, const void *commmand,
-                                size_t command_length, uint8_t with_flush);
-LIBMEMCACHED_LOCAL
-memcached_return_t value_fetch(memcached_server_instance_st *ptr,
-                               char *buffer,
-                               memcached_result_st *result);
-LIBMEMCACHED_LOCAL
-void server_list_free(memcached_st *ptr, memcached_server_instance_st *servers);
+void set_last_disconnected_host(memcached_server_write_instance_st ptr);
 
 LIBMEMCACHED_LOCAL
 memcached_return_t memcached_key_test(const char * const *keys,
                                       const size_t *key_length,
                                       size_t number_of_keys);
 
-
 LIBMEMCACHED_LOCAL
-uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length);
+memcached_return_t memcached_purge(memcached_server_write_instance_st ptr);
 
 LIBMEMCACHED_LOCAL
-memcached_return_t memcached_purge(memcached_server_instance_st *ptr);
+memcached_server_st *memcached_server_create_with(const memcached_st *memc,
+                                                  memcached_server_write_instance_st host,
+                                                  const char *hostname,
+                                                  in_port_t port,
+                                                  uint32_t weight,
+                                                  memcached_connection_t type);
+
 
 static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool binary)
 {
@@ -168,11 +171,11 @@ static inline memcached_return_t memcached_validate_key_length(size_t key_length
 #endif
 
 /*
-  cork_switch() tries to enable TCP_CORK. IF TCP_CORK is not an option
+  test_cork() tries to enable TCP_CORK. IF TCP_CORK is not an option
   on the system it returns false but sets errno to 0. Otherwise on
   failure errno is set.
 */
-static inline memcached_ternary_t cork_switch(memcached_server_st *ptr, bool enable)
+static inline memcached_ternary_t test_cork(memcached_server_st *ptr, int enable)
 {
 #ifdef CORK
   if (ptr->type != MEMCACHED_CONNECTION_TCP)
@@ -184,11 +187,11 @@ static inline memcached_ternary_t cork_switch(memcached_server_st *ptr, bool ena
   {
     return MEM_TRUE;
   }
-  else
-  {
-    ptr->cached_errno= errno;
-    return MEM_FALSE;
-  }
+
+  perror(strerror(errno));
+  ptr->cached_errno= errno;
+
+  return MEM_FALSE;
 #else
   (void)ptr;
   (void)enable;
@@ -199,4 +202,28 @@ static inline memcached_ternary_t cork_switch(memcached_server_st *ptr, bool ena
 #endif
 }
 
-#endif /* LIBMEMCACHED_COMMON_H */
+static inline void libmemcached_free(const memcached_st *ptr, void *mem)
+{
+  ptr->allocators.free(ptr, mem, ptr->allocators.context);
+}
+
+static inline void *libmemcached_malloc(const memcached_st *ptr, const size_t size)
+{
+  return ptr->allocators.malloc(ptr, size, ptr->allocators.context);
+}
+
+static inline void *libmemcached_realloc(const memcached_st *ptr, void *mem, const size_t size)
+{
+  return ptr->allocators.realloc(ptr, mem, size, ptr->allocators.context);
+}
+
+static inline void *libmemcached_calloc(const memcached_st *ptr, size_t nelem, size_t size)
+{
+  return ptr->allocators.calloc(ptr, nelem, size, ptr->allocators.context);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LIBMEMCACHED_COMMON_H__ */