X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=ec58fd8e2cc9c4b89cdb34c28c991cce11b66f03;hb=fd151d70d25ba4cae4f90a1e57435a8cc72e9c09;hp=c1cd0d8dc0316b4ca6c78e352b42529ec3c54d12;hpb=284978b1dc258cb8cd2a32d6a0f25f2f9b284149;p=m6w6%2Flibmemcached diff --git a/libmemcached/common.h b/libmemcached/common.h index c1cd0d8d..ec58fd8e 100644 --- a/libmemcached/common.h +++ b/libmemcached/common.h @@ -1,11 +1,38 @@ -/* LibMemcached - * Copyright (C) 2006-2009 Brian Aker - * All rights reserved. +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * LibMemcached * - * Use and distribution licensed under the BSD license. See - * the COPYING file in the parent directory for full text. + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2006-2009 Brian Aker + * All rights reserved. * - * Summary: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ @@ -13,10 +40,9 @@ Common include file for libmemached */ -#ifndef __LIBMEMCACHED_COMMON_H__ -#define __LIBMEMCACHED_COMMON_H__ +#pragma once -#include "config.h" +#include #include #include @@ -24,16 +50,10 @@ #include #include #include -#include -#include -#include -#include #include #include #include #include -#include -#include #ifdef TIME_WITH_SYS_TIME # include # include @@ -45,24 +65,42 @@ # endif #endif -/* Define this here, which will turn on the visibilty controls while we're - * building libmemcached. - */ -#define BUILDING_LIBMEMCACHED 1 +#include +#include +#include -#include "libmemcached/memcached.h" -#include "libmemcached/watchpoint.h" +#ifdef __cplusplus +extern "C" { +#endif + +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); +#ifdef __cplusplus +} // extern "C" +#endif -typedef struct memcached_server_st memcached_server_instance_st; /* These are private not to be installed headers */ -#include "libmemcached/io.h" -#include "libmemcached/internal.h" -#include "libmemcached/libmemcached_probes.h" -#include "libmemcached/memcached/protocol_binary.h" -#include "libmemcached/byteorder.h" -#include "libmemcached/response.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* string value */ struct memcached_continuum_item_st @@ -71,14 +109,6 @@ struct memcached_continuum_item_st uint32_t value; }; -/* Yum, Fortran.... can you make the reference? */ -typedef enum { - MEM_NOT= -1, - MEM_FALSE= false, - MEM_TRUE= true, -} memcached_ternary_t; - - #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) #define likely(x) if((x)) @@ -100,9 +130,7 @@ extern "C" { #endif LIBMEMCACHED_LOCAL -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); +memcached_return_t memcached_connect(memcached_server_write_instance_st ptr); LIBMEMCACHED_LOCAL memcached_return_t run_distribution(memcached_st *ptr); @@ -111,38 +139,25 @@ memcached_return_t run_distribution(memcached_st *ptr); #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) { @@ -163,44 +178,6 @@ static inline memcached_return_t memcached_validate_key_length(size_t key_length return MEMCACHED_SUCCESS; } -#ifdef TCP_CORK - #define CORK TCP_CORK -#elif defined TCP_NOPUSH - #define CORK TCP_NOPUSH -#endif - -/* - 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 test_cork(memcached_server_st *ptr, int enable) -{ -#ifdef CORK - if (ptr->type != MEMCACHED_CONNECTION_TCP) - return MEM_FALSE; - - int err= setsockopt(ptr->fd, IPPROTO_TCP, CORK, - &enable, (socklen_t)sizeof(int)); - if (! err) - { - return MEM_TRUE; - } - - perror(strerror(errno)); - ptr->cached_errno= errno; - - return MEM_FALSE; -#else - (void)ptr; - (void)enable; - - ptr->cached_errno= 0; - - return MEM_NOT; -#endif -} - static inline void libmemcached_free(const memcached_st *ptr, void *mem) { ptr->allocators.free(ptr, mem, ptr->allocators.context); @@ -224,5 +201,3 @@ static inline void *libmemcached_calloc(const memcached_st *ptr, size_t nelem, s #ifdef __cplusplus } #endif - -#endif /* __LIBMEMCACHED_COMMON_H__ */