Small cleanup for loop.

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 1d77ba1674891c01a94a42af89fbda3fc66b0a0d..66dd43bc8e6d5f3289b668cd9d39f3f001020f24 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -116,10 +116,24 @@ memcached_return_t memcached_connect(memcached_server_instance_st *ptr);
 LIBMEMCACHED_LOCAL
 void memcached_quit_server(memcached_server_instance_st *ptr, uint8_t io_death);
 
+LIBMEMCACHED_LOCAL
+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);
@@ -168,11 +182,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 +198,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 +213,25 @@ static inline memcached_ternary_t cork_switch(memcached_server_st *ptr, bool ena
 #endif
 }
 
+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);
+}
+
+
 #endif /* LIBMEMCACHED_COMMON_H */