X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fcommon.h;h=c36384b2aafc170654a8e3a19d90577c7bdeccfb;hb=b9748819d603f9d5c1dc54730ef38b6ee6d63ca4;hp=df3fd180311895840baae5586bc98b2621fc2fcf;hpb=7ac9bfdb44b36898599b5ba74d6bc376b9326b88;p=awesomized%2Flibmemcached diff --git a/src/libmemcached/common.h b/src/libmemcached/common.h index df3fd180..c36384b2 100644 --- a/src/libmemcached/common.h +++ b/src/libmemcached/common.h @@ -1,43 +1,16 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * LibMemcached - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * Copyright (C) 2006-2009 Brian Aker - * All rights reserved. - * - * 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. - * - */ - /* - Common include file for libmemached + +--------------------------------------------------------------------+ + | libmemcached - C/C++ Client Library for memcached | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted under the terms of the BSD license. | + | You should have received a copy of the license in a bundled file | + | named LICENSE; in case you did not receive a copy you can review | + | the terms online at: https://opensource.org/licenses/BSD-3-Clause | + +--------------------------------------------------------------------+ + | Copyright (c) 2006-2014 Brian Aker https://datadifferential.com/ | + | Copyright (c) 2020 Michael Wallner | + +--------------------------------------------------------------------+ */ #pragma once @@ -45,70 +18,40 @@ #include "mem_config.h" #ifdef __cplusplus -# include -# include -# include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #else -# ifdef HAVE_STDDEF_H # include -# endif -# ifdef HAVE_STDLIB_H # include -# endif -# ifdef HAVE_STDLIB_H # include -# endif -# include -# ifdef HAVE_TIME_H +# include # include -# endif -# ifdef HAVE_ERRNO_H # include -# endif -# ifdef HAVE_LIMITS_H # include -# endif +# include #endif -#ifdef HAVE_SYS_UN_H -# include -#endif +#include "p9y/socket.hpp" #ifdef HAVE_SYS_TIME_H -# include -#endif - -#ifdef HAVE_FCNTL_H -# include -#endif - -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_UNISTD_H -# include +# include #endif -#ifdef HAVE_SYS_SOCKET_H -# include -#endif +#include #ifdef HAVE_STRINGS_H -# include +# include #endif #ifdef HAVE_DLFCN_H -# include -#endif - -#if defined(_WIN32) -# include "libmemcached/windows.hpp" +# include #endif #include "libmemcached-1.0/memcached.h" @@ -116,14 +59,8 @@ #include "libmemcached/is.h" typedef struct memcached_st Memcached; -#ifdef HAVE_POLL_H -# include -#else -# include "libmemcached/poll.h" -#endif - #ifdef __cplusplus -memcached_instance_st* memcached_instance_fetch(memcached_st *ptr, uint32_t server_key); +memcached_instance_st *memcached_instance_fetch(memcached_st *ptr, uint32_t server_key); #endif /* These are private not to be installed headers */ @@ -131,23 +68,22 @@ memcached_instance_st* memcached_instance_fetch(memcached_st *ptr, uint32_t serv #include "libmemcached/memory.h" #include "libmemcached/io.h" #ifdef __cplusplus -# include "libmemcached/string.hpp" -# include "libmemcachedprotocol-0.0/binary.h" -# include "libmemcached/io.hpp" -# include "libmemcached/udp.hpp" -# include "libmemcached/do.hpp" -# include "libmemcached/socket.hpp" -# include "libmemcached/connect.hpp" -# include "libmemcached/allocators.hpp" -# include "libmemcached/hash.hpp" -# include "libmemcached/quit.hpp" -# include "libmemcached/instance.hpp" -# include "libmemcached/server_instance.h" -# include "libmemcached/server.hpp" -# include "libmemcached/flag.hpp" -# include "libmemcached/behavior.hpp" -# include "libmemcached/sasl.hpp" -# include "libmemcached/server_list.hpp" +# include "libmemcached/string.hpp" +# include "libmemcachedprotocol-0.0/binary.h" +# include "libmemcached/io.hpp" +# include "libmemcached/udp.hpp" +# include "libmemcached/do.hpp" +# include "libmemcached/connect.hpp" +# include "libmemcached/allocators.hpp" +# include "libmemcached/hash.hpp" +# include "libmemcached/quit.hpp" +# include "libmemcached/instance.hpp" +# include "libmemcached/server_instance.h" +# include "libmemcached/server.hpp" +# include "libmemcached/flag.hpp" +# include "libmemcached/behavior.hpp" +# include "libmemcached/sasl.hpp" +# include "libmemcached/server_list.hpp" #endif #include "libmemcached/internal.h" @@ -157,38 +93,38 @@ memcached_instance_st* memcached_instance_fetch(memcached_st *ptr, uint32_t serv #include "libmemcached/initialize_query.h" #ifdef __cplusplus -# include "libmemcached/response.h" -# include "libmemcached/namespace.h" +# include "libmemcached/response.h" +# include "libmemcached/namespace.h" #else -# include "libmemcached/virtual_bucket.h" +# include "libmemcached/virtual_bucket.h" #endif #ifdef __cplusplus -# include "libmemcached/backtrace.hpp" -# include "libmemcached/assert.hpp" -# include "libmemcached/server.hpp" -# include "libmemcached/key.hpp" -# include "libmemcached/result.h" -# include "libmemcached/version.hpp" +# include "libmemcached/backtrace.hpp" +# include "libmemcached/assert.hpp" +# include "libmemcached/server.hpp" +# include "libmemcached/key.hpp" +# include "libmemcached/result.h" +# include "libmemcached/version.hpp" #endif #include "libmemcached/continuum.hpp" #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) -#define likely(x) if((x)) -#define unlikely(x) if((x)) +# define likely(x) if ((x)) +# define unlikely(x) if ((x)) #else -#define likely(x) if(__builtin_expect((x) != 0, 1)) -#define unlikely(x) if(__builtin_expect((x) != 0, 0)) +# define likely(x) if (__builtin_expect((x) != 0, 1)) +# define unlikely(x) if (__builtin_expect((x) != 0, 0)) #endif -#define MEMCACHED_BLOCK_SIZE 1024 +#define MEMCACHED_BLOCK_SIZE 1024 #define MEMCACHED_DEFAULT_COMMAND_SIZE 350 -#define SMALL_STRING_LEN 1024 -#define HUGE_STRING_LEN 8196 +#define SMALL_STRING_LEN 1024 +#define HUGE_STRING_LEN 8196 #ifdef __cplusplus extern "C" { @@ -197,25 +133,25 @@ extern "C" { memcached_return_t run_distribution(memcached_st *ptr); #ifdef __cplusplus -static inline void memcached_server_response_increment(memcached_instance_st* instance) -{ +# include "p9y/poll.hpp" +static inline void memcached_server_response_increment(memcached_instance_st *instance) { instance->events(POLLIN); instance->cursor_active_++; } #endif #define memcached_server_response_decrement(A) (A)->cursor_active_-- -#define memcached_server_response_reset(A) (A)->cursor_active_=0 +#define memcached_server_response_reset(A) (A)->cursor_active_ = 0 #define memcached_instance_response_increment(A) (A)->cursor_active_++ #define memcached_instance_response_decrement(A) (A)->cursor_active_-- -#define memcached_instance_response_reset(A) (A)->cursor_active_=0 +#define memcached_instance_response_reset(A) (A)->cursor_active_ = 0 #ifdef __cplusplus } #endif #ifdef __cplusplus -bool memcached_purge(memcached_instance_st*); -memcached_instance_st* memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key); +bool memcached_purge(memcached_instance_st *); +memcached_instance_st *memcached_instance_by_position(const memcached_st *ptr, uint32_t server_key); #endif