|
[-]
[+]
|
Changed |
libmemcached.changes
|
|
|
|
[-]
[+]
|
Changed |
libmemcached.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.14.tar.bz2/example/t
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.14.tar.bz2/example/t/include.am
^
|
| @@ -1,40 +0,0 @@
-# vim:ft=automake
-# Copyright (C) 2012 Data Differential
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license. See
-# the COPYING file in the parent directory for full text.
-#
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-MEMCACHED_LIGHT_TESTS_LDADDS= \
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
- libtest/libtest.la
-
-example_t_memcached_light_CXXFLAGS=
-example_t_memcached_light_DEPENDENCIES=
-example_t_memcached_light_LDADD=
-example_t_memcached_light_SOURCES=
-
-example_t_memcached_light_SOURCES+= example/t/memcached_light.cc
-example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/memcached_get.cc
-example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/print.cc
-example_t_memcached_light_SOURCES+= tests/libmemcached-1.0/setup_and_teardowns.cc
-example_t_memcached_light_CXXFLAGS+= $(AM_CXXFLAGS)
-example_t_memcached_light_DEPENDENCIES+= $(MEMCACHED_LIGHT_TESTS_LDADDS)
-example_t_memcached_light_DEPENDENCIES+= example/memcached_light
-example_t_memcached_light_LDADD+= $(MEMCACHED_LIGHT_TESTS_LDADDS)
-example_t_memcached_light_LDADD+= $(LIBUUID_LDFLAGS)
-check_PROGRAMS+= example/t/memcached_light
-noinst_PROGRAMS+= example/t/memcached_light
-
-test-memcached_light: example/t/memcached_light example/memcached_light
- @example/t/memcached_light
-
-gdb-memcached_light: example/t/memcached_light example/memcached_light
- @$(DEBUG_COMMAND) example/t/memcached_light
-
-valgrind-memcached_light: example/t/memcached_light example/memcached_light
- $(VALGRIND_COMMAND) example/t/memcached_light
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.14.tar.bz2/example/t/memcached_light.cc
^
|
| @@ -1,248 +0,0 @@
-/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * Test memcat
- *
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *
- * 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.
- *
- */
-
-
-/*
- Test that we are cycling the servers we are creating during testing.
-*/
-
-#include <mem_config.h>
-
-#include <libtest/test.hpp>
-#include <libmemcached-1.0/memcached.h>
-
-#include "tests/libmemcached-1.0/memcached_get.h"
-
-using namespace libtest;
-
-#ifndef __INTEL_COMPILER
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-
-static std::string executable("example/memcached_light");
-
-static test_return_t help_TEST(void *)
-{
- const char *args[]= { "--help", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t verbose_TEST(void *)
-{
- const char *args[]= { "--help", "--verbose", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t daemon_TEST(void *)
-{
- const char *args[]= { "--help", "--daemon", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t protocol_TEST(void *)
-{
- const char *args[]= { "--help", "--protocol", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t version_TEST(void *)
-{
- const char *args[]= { "--help", "--version", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t port_TEST(void *)
-{
- const char *args[]= { "--help", "--port=9090", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t pid_file_TEST(void *)
-{
- const char *args[]= { "--help", "--pid-file=/tmp/foo.pid", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t log_file_TEST(void *)
-{
- const char *args[]= { "--help", "--log-file=/tmp/foo.log", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-static test_return_t max_connections_file_TEST(void *)
-{
- const char *args[]= { "--help", "--max-connections=/tmp/foo.max_connections", 0 };
-
- test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
-
- return TEST_SUCCESS;
-}
-
-typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
-
-static test_return_t _runner_default(libmemcached_test_callback_fn func, void *object)
-{
- if (func)
- {
- test_true(object);
- test_return_t ret;
- try {
- ret= func((memcached_st*)object);
- }
- catch (std::exception& e)
- {
- libtest::Error << e.what();
- return TEST_FAILURE;
- }
-
- return ret;
- }
-
- return TEST_SUCCESS;
-}
-
-class MemcachedLightRunner : public libtest::Runner {
-public:
- test_return_t run(test_callback_fn* func, void *object)
- {
- return _runner_default(libmemcached_test_callback_fn(func), object);
- }
-};
-
-test_st cmdline_option_TESTS[] ={
- {"--help", true, help_TEST },
- {"--verbose", true, verbose_TEST },
- {"--daemon", true, daemon_TEST },
- {"--protocol", true, protocol_TEST },
- {"--version", true, version_TEST },
- {"--port", true, port_TEST },
- {"--pid-file", true, pid_file_TEST },
- {"--log-file", true, log_file_TEST },
- {"--max-connections", true, max_connections_file_TEST },
- {0, 0, 0}
-};
-
-/* Clean the server before beginning testing */
-test_st basic_TESTS[] ={
-#if 0
- {"memcached_get()", true, (test_callback_fn*)get_test },
- {"memcached_get() test 2", false, (test_callback_fn*)get_test2 },
- {"memcached_get() test 3", false, (test_callback_fn*)get_test3 },
- {"memcached_get() test 4", false, (test_callback_fn*)get_test4 },
- {"memcached_get() test 5", false, (test_callback_fn*)get_test5 },
-#endif
- {0, 0, 0}
-};
-
-collection_st collection[] ={
- {"command line options", 0, 0, cmdline_option_TESTS },
- {"basic", 0, 0, basic_TESTS },
- {0, 0, 0, 0}
-};
-
-static void *world_create(server_startup_st& servers, test_return_t& error)
-{
- if (access(executable.c_str(), X_OK) != 0)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
-
- if (HAVE_MEMCACHED_LIGHT_BINARY == 0)
- {
- error= TEST_SKIPPED;
- return NULL;
- }
-
- if (server_startup(servers, "memcached-light", libtest::default_port(), 0, NULL) == 0)
- {
- error= TEST_FAILURE;
- return NULL;
- }
-
-
- char buffer[1024];
- int length= snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(libtest::default_port()));
- fatal_assert(length > 0);
-
- memcached_st *memc= memcached(buffer, length);
-
- fatal_assert(memc);
-
- return (void*)memc;
-}
-
-static bool world_destroy(void *object)
-{
- memcached_st *memc= (memcached_st*)object;
- memcached_free(memc);
-
- return TEST_SUCCESS;
-}
-
-
-void get_world(libtest::Framework* world)
-{
- world->create(world_create);
- world->destroy(world_destroy);
- world->collections(collection);
- world->set_runner(new MemcachedLightRunner);
-}
-
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.14.tar.bz2/libmemcached/instance.h
^
|
| @@ -1,139 +0,0 @@
-/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * Libmemcached library
- *
- * Copyright (C) 2012 Data Differential, http://datadifferential.com/
- * 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.
- *
- */
-
-
-#pragma once
-
-#ifndef WIN32
-# ifdef HAVE_NETDB_H
-# include <netdb.h>
-# endif
-#endif
-
-#ifdef NI_MAXHOST
-# define MEMCACHED_NI_MAXHOST NI_MAXHOST
-#else
-# define MEMCACHED_NI_MAXHOST 1025
-#endif
-
-#ifdef NI_MAXSERV
-# define MEMCACHED_NI_MAXSERV NI_MAXSERV
-#else
-# define MEMCACHED_NI_MAXSERV 32
-#endif
-
-#ifdef __cplusplus
-
-namespace org {
-namespace libmemcached {
-
-// @todo Complete class transformation
-struct Instance {
- in_port_t port() const
- {
- return port_;
- }
-
- void port(in_port_t arg)
- {
- port_= arg;
- }
-
- void mark_server_as_clean()
- {
- server_failure_counter= 0;
- next_retry= 0;
- }
-
- void disable()
- {
- }
-
- void enable()
- {
- }
-
- uint32_t response_count() const
- {
- return cursor_active_;
- }
-
- struct {
- bool is_allocated:1;
- bool is_initialized:1;
- bool is_shutting_down:1;
- bool is_dead:1;
- } options;
- uint32_t cursor_active_;
- in_port_t port_;
- memcached_socket_t fd;
- uint32_t io_bytes_sent; /* # bytes sent since last read */
- uint32_t request_id;
- uint32_t server_failure_counter;
- uint64_t server_failure_counter_query_id;
- uint32_t weight;
- uint32_t version;
- enum memcached_server_state_t state;
- struct {
- uint32_t read;
- uint32_t write;
- uint32_t timeouts;
- size_t _bytes_read;
- } io_wait_count;
- uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
- uint8_t micro_version; // ditto, and note that this is the third, not second version bit
- uint8_t minor_version; // ditto
- memcached_connection_t type;
- char *read_ptr;
- size_t read_buffer_length;
- size_t read_data_length;
- size_t write_buffer_offset;
- struct addrinfo *address_info;
- struct addrinfo *address_info_next;
- time_t next_retry;
- struct memcached_st *root;
- uint64_t limit_maxbytes;
- struct memcached_error_t *error_messages;
- char read_buffer[MEMCACHED_MAX_BUFFER];
- char write_buffer[MEMCACHED_MAX_BUFFER];
- char hostname[MEMCACHED_NI_MAXHOST];
-};
-
-} // namespace libmemcached
-} // namespace org
-
-#endif
|
|
[-]
[+]
|
Deleted |
libmemcached-1.0.14.tar.bz2/tests/memc.h
^
|
| @@ -1,80 +0,0 @@
-/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * Gearmand client and server library.
- *
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
- * 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.
- *
- */
-
-#pragma once
-
-class Memc {
-public:
- Memc()
- {
- _memc= memcached_create(NULL);
-
- if (_memc == NULL)
- {
- throw "memcached_create() failed";
- }
- }
-
- Memc(memcached_st* arg)
- {
- _memc= memcached_clone(NULL, arg);
-
- if (_memc == NULL)
- {
- throw "memcached_clone() failed";
- }
- }
-
- memcached_st* operator&() const
- {
- return _memc;
- }
-
- memcached_st* operator->() const
- {
- return _memc;
- }
-
- ~Memc()
- {
- memcached_free(_memc);
- }
-
-private:
- memcached_st *_memc;
-
-};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,7 @@
+1.0.15 Mon Dec 17 07:25:44 EST 2012
+* Added support for Murmur3 (HASHKIT_HASH_MURMUR3)
+* Portability fixes.
+
1.0.14 Wed Nov 14 04:56:25 EST 2012
* CLIENT_ERROR fixed to not be treated as a fatal error.
* Compiler fixes for older Ubuntu releases.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/Makefile.in
^
|
| @@ -76,16 +76,6 @@
# All paths should be given relative to the root
# vim:ft=automake
-# Copyright (C) 2012 Data Differential
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license. See
-# the COPYING file in the parent directory for full text.
-#
-# included from Top Level Makefile.am
-# All paths should be given relative to the root
-
-# vim:ft=automake
# included from Top Level Makefile.am
# All paths should be given relative to the root
#
@@ -231,11 +221,9 @@
clients/memstat$(EXEEXT) $(am__EXEEXT_1)
noinst_PROGRAMS = libtest/unittest$(EXEEXT) libtest/skiptest$(EXEEXT) \
libtest/wait$(EXEEXT) libtest/core-count$(EXEEXT) \
- libtest/abort$(EXEEXT) libmemcached-1.0/t/c_test$(EXEEXT) \
- libmemcached-1.0/t/cc_test$(EXEEXT) \
- libmemcached-1.0/t/c_sasl_test$(EXEEXT) $(am__EXEEXT_3) \
- $(am__EXEEXT_2) tests/cycle$(EXEEXT) \
- tests/libmemcached-1.0/internals$(EXEEXT) \
+ libtest/abort$(EXEEXT) libtest/backtrace$(EXEEXT) \
+ $(am__EXEEXT_2) libmemcached-1.0/t/cc_test$(EXEEXT) \
+ $(am__EXEEXT_4) tests/cycle$(EXEEXT) $(am__EXEEXT_3) \
tests/libmemcached-1.0/testapp$(EXEEXT) \
tests/libmemcached-1.0/testsocket$(EXEEXT) \
tests/libmemcached-1.0/sasl$(EXEEXT) \
@@ -249,10 +237,8 @@
tests/memcat$(EXEEXT) tests/memerror$(EXEEXT) \
tests/memslap$(EXEEXT) tests/memdump$(EXEEXT)
check_PROGRAMS = libtest/unittest$(EXEEXT) libtest/skiptest$(EXEEXT) \
- libmemcached-1.0/t/c_test$(EXEEXT) \
- libmemcached-1.0/t/cc_test$(EXEEXT) \
- libmemcached-1.0/t/c_sasl_test$(EXEEXT) $(am__EXEEXT_2) \
- tests/cycle$(EXEEXT) tests/libmemcached-1.0/internals$(EXEEXT) \
+ $(am__EXEEXT_2) libmemcached-1.0/t/cc_test$(EXEEXT) \
+ tests/cycle$(EXEEXT) $(am__EXEEXT_3) \
tests/libmemcached-1.0/testapp$(EXEEXT) \
tests/libmemcached-1.0/testsocket$(EXEEXT) \
tests/libmemcached-1.0/sasl$(EXEEXT) tests/testudp$(EXEEXT) \
@@ -269,7 +255,7 @@
$(dist_aclocal_DATA) $(dist_man_MANS) $(include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/clients/include.am $(srcdir)/docs/include.am \
- $(srcdir)/example/include.am $(srcdir)/example/t/include.am \
+ $(srcdir)/example/include.am \
$(srcdir)/libhashkit-1.0/include.am \
$(srcdir)/libhashkit/include.am \
$(srcdir)/libmemcached-1.0/include.am \
@@ -294,8 +280,10 @@
$(srcdir)/win32/include.am $(top_srcdir)/configure \
$(top_srcdir)/docs/conf.py.in \
$(top_srcdir)/libhashkit-1.0/configure.h.in \
+ $(top_srcdir)/libhashkit/hashkitcon.h.in \
$(top_srcdir)/libmemcached-1.0/configure.h.in \
$(top_srcdir)/libtest/version.h.in \
+ $(top_srcdir)/libtest/yatlcon.h.in \
$(top_srcdir)/support/libmemcached.pc.in \
$(top_srcdir)/support/libmemcached.spec.in AUTHORS COPYING \
ChangeLog NEWS THANKS TODO build-aux/config.guess \
@@ -303,183 +291,64 @@
build-aux/ltmain.sh build-aux/missing
# We are either building in tree, or with
-@BUILDING_LIBMEMCACHED_TRUE@am__append_1 = \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcached.la \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcachedutil.la
-@BUILDING_LIBMEMCACHED_TRUE@am__append_2 = \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcached.la \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcachedutil.la
-@BUILDING_LIBMEMCACHED_TRUE@am__append_3 = libtest/memcached.cc
+@BUILDING_LIBMEMCACHED_TRUE@am__append_1 = libmemcached/libmemcached.la
+@BUILDING_LIBMEMCACHED_TRUE@am__append_2 = libtest/memcached.cc
+@BUILDING_LIBMEMCACHED_TRUE@am__append_3 = -DHAVE_LIBMEMCACHED
@BUILDING_LIBMEMCACHED_TRUE@am__append_4 = -DHAVE_LIBMEMCACHED
-@BUILDING_LIBMEMCACHED_TRUE@am__append_5 = -DHAVE_LIBMEMCACHED
-@BUILDING_LIBMEMCACHED_TRUE@am__append_6 = \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcached.la \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcachedutil.la
-@BUILDING_LIBMEMCACHED_TRUE@am__append_7 = \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcached.la \
-@BUILDING_LIBMEMCACHED_TRUE@ libmemcached/libmemcachedutil.la
-@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__append_8 = $(LIBMEMCACHED_UTIL_LDFLAGS)
-@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__append_9 = libtest/memcached.cc
-@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_FALSE@am__append_10 = -DHAVE_LIBMEMCACHED=0
-@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_FALSE@am__append_11 = -DHAVE_LIBMEMCACHED=0
-@HAVE_LIBDRIZZLE_TRUE@am__append_12 = $(libdrizzle_LIBS)
-@HAVE_LIBDRIZZLE_TRUE@am__append_13 = $(libdrizzle_CFLAGS)
-@BUILDING_GEARMAN_TRUE@am__append_14 = libgearman/libgearman.la
-@BUILDING_GEARMAN_TRUE@am__append_15 = libgearman/libgearman.la
-@BUILDING_GEARMAN_TRUE@am__append_16 = libtest/blobslap_worker.cc \
+@BUILDING_LIBMEMCACHED_TRUE@am__append_5 = libmemcached/libmemcached.la
+@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__append_6 = $(LIBMEMCACHED_UTIL_LDFLAGS)
+@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__append_7 = libtest/memcached.cc
+@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_FALSE@am__append_8 = -DHAVE_LIBMEMCACHED=0
+@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_FALSE@am__append_9 = -DHAVE_LIBMEMCACHED=0
+@HAVE_LIBDRIZZLE_TRUE@am__append_10 = $(libdrizzle_LIBS)
+@HAVE_LIBDRIZZLE_TRUE@am__append_11 = $(libdrizzle_CFLAGS)
+@BUILDING_GEARMAN_TRUE@am__append_12 = libtest/blobslap_worker.cc \
@BUILDING_GEARMAN_TRUE@ libtest/gearmand.cc util/instance.cc \
@BUILDING_GEARMAN_TRUE@ util/operation.cc
-@BUILDING_GEARMAN_TRUE@am__append_17 = libgearman/libgearman.la
-@BUILDING_GEARMAN_TRUE@am__append_18 = libgearman/libgearman.la \
-@BUILDING_GEARMAN_TRUE@ gearmand/gearmand
-@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_19 = libgearman/libgearman.la
-@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_20 = $(libgearman_LIBS)
-@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_21 = libtest/blobslap_worker.cc \
+@BUILDING_GEARMAN_TRUE@am__append_13 = libgearman/libgearman.la
+@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@am__append_14 = libtest/blobslap_worker.cc \
@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@ libtest/gearmand.cc \
@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@ util/instance.cc \
@BUILDING_GEARMAN_FALSE@@HAVE_LIBGEARMAN_TRUE@ util/operation.cc
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_22 = \
+@SHARED_ENABLED_TRUE@am__append_15 = libmemcached-1.0/t/c_test \
+@SHARED_ENABLED_TRUE@ libmemcached-1.0/t/c_sasl_test
+@SHARED_ENABLED_TRUE@am__append_16 = libmemcached-1.0/t/c_test \
+@SHARED_ENABLED_TRUE@ libmemcached-1.0/t/c_sasl_test
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_17 = \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol-0.0/binary.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol-0.0/callback.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol-0.0/handler.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol-0.0/vbucket.h
-@BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_23 = clients/memaslap
-@HAVE_RECENT_SPHINX_TRUE@am__append_24 = $(dist_man_MANS)
-@HAVE_RECENT_SPHINX_TRUE@am__append_25 = man/memaslap.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcapable.1 man/memcat.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcp.1 man/memdump.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memerror.1 man/memexist.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memflush.1 man/memparse.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memping.1 man/memrm.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memslap.1 man/memstat.1 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memtouch.1 man/hashkit_clone.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_crc32.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_create.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_fnv1_32.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_fnv1_64.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_fnv1a_32.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_fnv1a_64.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_free.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_functions.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_hsieh.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_is_allocated.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_jenkins.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_md5.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_murmur.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/hashkit_value.3 man/libhashkit.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/libmemcached.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/libmemcached_check_configuration.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/libmemcached_configuration.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/libmemcached_examples.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/libmemcachedutil.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached.3 man/memcached_add.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_add_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_analyze.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_append.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_append_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_behavior_get.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_behavior_set.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_callback_get.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_callback_set.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_cas.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_cas_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_clone.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_create.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_decrement.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_decrement_with_initial.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_delete.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_delete_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_destroy_sasl_auth_data.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_dump.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_exist.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_exist_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_fetch.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_fetch_execute.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_fetch_result.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_flush_buffers.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_free.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_generate_hash.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_generate_hash_value.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_get.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_get_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_get_memory_allocators.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_get_sasl_callbacks.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_get_user_data.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_increment.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_increment_with_initial.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_last_error_message.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_lib_version.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_mget.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_mget_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_mget_execute.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_mget_execute_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_behavior_get.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_behavior_set.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_create.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_destroy.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_fetch.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_pop.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_push.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_release.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_pool_st.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_prepend.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_prepend_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_quit.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_replace.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_replace_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_sasl_set_auth_data.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_add.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_count.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_cursor.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_list.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_list_append.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_list_count.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_list_free.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_server_push.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_servers_parse.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_set.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_set_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_set_memory_allocators.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_set_sasl_callbacks.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_set_user_data.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_stat.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_stat_execute.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_stat_get_keys.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_stat_get_value.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_stat_servername.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_strerror.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_touch.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_touch_by_key.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_verbosity.3 \
-@HAVE_RECENT_SPHINX_TRUE@ man/memcached_version.3
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__append_26 = example/memcached_light
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_27 = example/byteorder.h \
+@BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_18 = clients/memaslap
+@HAVE_RECENT_SPHINX_TRUE@@IS_VCS_CHECKOUT_TRUE@am__append_19 = $(dist_man_MANS)
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__append_20 = example/memcached_light
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_21 = example/byteorder.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ example/memcached_light.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ example/storage.h
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_28 = example/t/memcached_light
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_29 = example/t/memcached_light
-@INCLUDE_HSIEH_SRC_TRUE@am__append_30 = libhashkit/hsieh.cc
-@INCLUDE_HSIEH_SRC_FALSE@am__append_31 = libhashkit/nohsieh.cc
-@HAVE_SASL_TRUE@am__append_32 = @PTHREAD_CFLAGS@
-@HAVE_SASL_TRUE@am__append_33 = @PTHREAD_LIBS@ @SASL_LDFLAGS@
-@HAVE_DTRACE_TRUE@am__append_34 = libmemcached/dtrace_probes.h
-@HAVE_DTRACE_TRUE@am__append_35 = libmemcached/dtrace_probes.h \
+@INCLUDE_HSIEH_SRC_TRUE@am__append_22 = libhashkit/hsieh.cc
+@INCLUDE_HSIEH_SRC_FALSE@am__append_23 = libhashkit/nohsieh.cc
+@HAVE_LIBSASL_TRUE@@HAVE_SASL_TRUE@am__append_24 = @PTHREAD_CFLAGS@
+@HAVE_LIBSASL_TRUE@@HAVE_SASL_TRUE@am__append_25 = @PTHREAD_LIBS@ \
+@HAVE_LIBSASL_TRUE@@HAVE_SASL_TRUE@ @LIBSASL_LIB@ $(am__empty)
+@HAVE_DTRACE_TRUE@am__append_26 = libmemcached/dtrace_probes.h
+@HAVE_DTRACE_TRUE@am__append_27 = libmemcached/dtrace_probes.h \
@HAVE_DTRACE_TRUE@ libmemcached/libmemcached_probes.o
-@HAVE_DTRACE_TRUE@am__append_36 = libmemcached/libmemcached_probes.o
-@HAVE_DTRACE_TRUE@am__append_37 = libmemcached/libmemcached_probes.o
-@HAVE_DTRACE_TRUE@am__append_38 = libmemcached/libmemcached_probes.d
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_39 = libmemcached/libmemcachedprotocol.la
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_40 = libmemcachedprotocol/ascii_handler.h \
+@HAVE_DTRACE_TRUE@am__append_28 = libmemcached/libmemcached_probes.o
+@HAVE_DTRACE_TRUE@am__append_29 = libmemcached/libmemcached_probes.o
+@HAVE_DTRACE_TRUE@am__append_30 = libmemcached/libmemcached_probes.d
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_31 = libmemcached/libmemcachedprotocol.la
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__append_32 = libmemcachedprotocol/ascii_handler.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol/binary_handler.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol/cache.h \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol/common.h
-@BUILD_POLL_TRUE@am__append_41 = poll/poll.c
-@BUILD_WIN32_WRAPPERS_TRUE@am__append_42 = -no-undefined
-@BUILD_WIN32_WRAPPERS_TRUE@am__append_43 = -no-undefined
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@BUILD_WIN32_WRAPPERS_TRUE@am__append_44 = -no-undefined
-@BUILD_WIN32_WRAPPERS_TRUE@am__append_45 = -no-undefined
+@BUILD_POLL_TRUE@am__append_33 = poll/poll.c
+@HAVE_DTRACE_FALSE@am__append_34 = tests/libmemcached-1.0/internals
+@HAVE_DTRACE_FALSE@am__append_35 = tests/libmemcached-1.0/internals
+@BUILD_WIN32_WRAPPERS_TRUE@am__append_36 = -no-undefined
+@BUILD_WIN32_WRAPPERS_TRUE@am__append_37 = -no-undefined
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@BUILD_WIN32_WRAPPERS_TRUE@am__append_38 = -no-undefined
+@BUILD_WIN32_WRAPPERS_TRUE@am__append_39 = -no-undefined
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_add_am_macro.m4 \
@@ -498,11 +367,14 @@
$(top_srcdir)/m4/ax_count_cpus.m4 \
$(top_srcdir)/m4/ax_cxx_gcc_abi_demangle.m4 \
$(top_srcdir)/m4/ax_cxx_header_stdcxx_98.m4 \
- $(top_srcdir)/m4/ax_debug.m4 $(top_srcdir)/m4/ax_endian.m4 \
+ $(top_srcdir)/m4/ax_debug.m4 $(top_srcdir)/m4/ax_dlopen.m4 \
+ $(top_srcdir)/m4/ax_endian.m4 \
$(top_srcdir)/m4/ax_file_escapes.m4 \
+ $(top_srcdir)/m4/ax_gcc_atomic_builtins.m4 \
$(top_srcdir)/m4/ax_harden_compiler_flags.m4 \
$(top_srcdir)/m4/ax_hex_version.m4 \
$(top_srcdir)/m4/ax_libevent.m4 \
+ $(top_srcdir)/m4/ax_libmemcached.m4 \
$(top_srcdir)/m4/ax_platform.m4 \
$(top_srcdir)/m4/ax_print_to_file.m4 \
$(top_srcdir)/m4/ax_prog_sphinx_build.m4 \
@@ -539,7 +411,8 @@
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = mem_config.h
-CONFIG_CLEAN_FILES = libhashkit-1.0/configure.h libtest/version.h \
+CONFIG_CLEAN_FILES = libhashkit/hashkitcon.h \
+ libhashkit-1.0/configure.h libtest/version.h libtest/yatlcon.h \
docs/conf.py libmemcached-1.0/configure.h \
support/libmemcached.pc support/libmemcached.spec
CONFIG_CLEAN_VPATH_FILES =
@@ -590,7 +463,8 @@
libhashkit/fnv_32.cc libhashkit/fnv_64.cc \
libhashkit/function.cc libhashkit/has.cc libhashkit/hashkit.cc \
libhashkit/jenkins.cc libhashkit/ketama.cc libhashkit/md5.cc \
- libhashkit/murmur.cc libhashkit/one_at_a_time.cc \
+ libhashkit/murmur.cc libhashkit/murmur3.cc \
+ libhashkit/murmur3_api.cc libhashkit/one_at_a_time.cc \
libhashkit/rijndael.cc libhashkit/str_algorithm.cc \
libhashkit/strerror.cc libhashkit/string.cc \
libhashkit/hsieh.cc libhashkit/nohsieh.cc
@@ -612,6 +486,8 @@
libhashkit/libhashkit_libhashkit_la-ketama.lo \
libhashkit/libhashkit_libhashkit_la-md5.lo \
libhashkit/libhashkit_libhashkit_la-murmur.lo \
+ libhashkit/libhashkit_libhashkit_la-murmur3.lo \
+ libhashkit/libhashkit_libhashkit_la-murmur3_api.lo \
libhashkit/libhashkit_libhashkit_la-one_at_a_time.lo \
libhashkit/libhashkit_libhashkit_la-rijndael.lo \
libhashkit/libhashkit_libhashkit_la-str_algorithm.lo \
@@ -631,30 +507,46 @@
libhashkit/fnv_32.cc libhashkit/fnv_64.cc \
libhashkit/function.cc libhashkit/has.cc libhashkit/hashkit.cc \
libhashkit/jenkins.cc libhashkit/ketama.cc libhashkit/md5.cc \
- libhashkit/murmur.cc libhashkit/one_at_a_time.cc \
+ libhashkit/murmur.cc libhashkit/murmur3.cc \
+ libhashkit/murmur3_api.cc libhashkit/one_at_a_time.cc \
libhashkit/rijndael.cc libhashkit/str_algorithm.cc \
libhashkit/strerror.cc libhashkit/string.cc \
libhashkit/hsieh.cc libhashkit/nohsieh.cc
-@INCLUDE_HSIEH_SRC_TRUE@am__objects_3 = libhashkit/hsieh.lo
-@INCLUDE_HSIEH_SRC_FALSE@am__objects_4 = libhashkit/nohsieh.lo
-am__objects_5 = libhashkit/aes.lo libhashkit/algorithm.lo \
- libhashkit/behavior.lo libhashkit/crc32.lo \
- libhashkit/digest.lo libhashkit/encrypt.lo \
- libhashkit/fnv_32.lo libhashkit/fnv_64.lo \
- libhashkit/function.lo libhashkit/has.lo libhashkit/hashkit.lo \
- libhashkit/jenkins.lo libhashkit/ketama.lo libhashkit/md5.lo \
- libhashkit/murmur.lo libhashkit/one_at_a_time.lo \
- libhashkit/rijndael.lo libhashkit/str_algorithm.lo \
- libhashkit/strerror.lo libhashkit/string.lo $(am__objects_3) \
- $(am__objects_4)
+@INCLUDE_HSIEH_SRC_TRUE@am__objects_3 = libhashkit/libhashkit_libhashkitinc_la-hsieh.lo
+@INCLUDE_HSIEH_SRC_FALSE@am__objects_4 = libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo
+am__objects_5 = libhashkit/libhashkit_libhashkitinc_la-aes.lo \
+ libhashkit/libhashkit_libhashkitinc_la-algorithm.lo \
+ libhashkit/libhashkit_libhashkitinc_la-behavior.lo \
+ libhashkit/libhashkit_libhashkitinc_la-crc32.lo \
+ libhashkit/libhashkit_libhashkitinc_la-digest.lo \
+ libhashkit/libhashkit_libhashkitinc_la-encrypt.lo \
+ libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo \
+ libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo \
+ libhashkit/libhashkit_libhashkitinc_la-function.lo \
+ libhashkit/libhashkit_libhashkitinc_la-has.lo \
+ libhashkit/libhashkit_libhashkitinc_la-hashkit.lo \
+ libhashkit/libhashkit_libhashkitinc_la-jenkins.lo \
+ libhashkit/libhashkit_libhashkitinc_la-ketama.lo \
+ libhashkit/libhashkit_libhashkitinc_la-md5.lo \
+ libhashkit/libhashkit_libhashkitinc_la-murmur.lo \
+ libhashkit/libhashkit_libhashkitinc_la-murmur3.lo \
+ libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo \
+ libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo \
+ libhashkit/libhashkit_libhashkitinc_la-rijndael.lo \
+ libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo \
+ libhashkit/libhashkit_libhashkitinc_la-strerror.lo \
+ libhashkit/libhashkit_libhashkitinc_la-string.lo \
+ $(am__objects_3) $(am__objects_4)
am_libhashkit_libhashkitinc_la_OBJECTS = $(am__objects_5)
libhashkit_libhashkitinc_la_OBJECTS = \
$(am_libhashkit_libhashkitinc_la_OBJECTS)
libhashkit_libhashkitinc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(libhashkit_libhashkitinc_la_LDFLAGS) $(LDFLAGS) -o $@
+ $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
am__DEPENDENCIES_1 =
+libmemcached_libmemcached_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__append_29)
am__libmemcached_libmemcached_la_SOURCES_DIST = \
libmemcached/csl/context.cc libmemcached/csl/parser.cc \
libmemcached/csl/scanner.cc libmemcached/instance.cc \
@@ -664,7 +556,8 @@
libhashkit/fnv_32.cc libhashkit/fnv_64.cc \
libhashkit/function.cc libhashkit/has.cc libhashkit/hashkit.cc \
libhashkit/jenkins.cc libhashkit/ketama.cc libhashkit/md5.cc \
- libhashkit/murmur.cc libhashkit/one_at_a_time.cc \
+ libhashkit/murmur.cc libhashkit/murmur3.cc \
+ libhashkit/murmur3_api.cc libhashkit/one_at_a_time.cc \
libhashkit/rijndael.cc libhashkit/str_algorithm.cc \
libhashkit/strerror.cc libhashkit/string.cc \
libhashkit/hsieh.cc libhashkit/nohsieh.cc \
@@ -710,6 +603,8 @@
libhashkit/libmemcached_libmemcached_la-ketama.lo \
libhashkit/libmemcached_libmemcached_la-md5.lo \
libhashkit/libmemcached_libmemcached_la-murmur.lo \
+ libhashkit/libmemcached_libmemcached_la-murmur3.lo \
+ libhashkit/libmemcached_libmemcached_la-murmur3_api.lo \
libhashkit/libmemcached_libmemcached_la-one_at_a_time.lo \
libhashkit/libmemcached_libmemcached_la-rijndael.lo \
libhashkit/libmemcached_libmemcached_la-str_algorithm.lo \
@@ -777,8 +672,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) \
$(libmemcached_libmemcached_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@libmemcached_libmemcachedprotocol_la_DEPENDENCIES = \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(am__DEPENDENCIES_1)
+libmemcached_libmemcachedprotocol_la_DEPENDENCIES =
am__libmemcached_libmemcachedprotocol_la_SOURCES_DIST = \
libmemcached/byteorder.cc libmemcachedprotocol/ascii_handler.c \
libmemcachedprotocol/binary_handler.c \
@@ -799,6 +693,8 @@
$(LDFLAGS) -o $@
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am_libmemcached_libmemcachedprotocol_la_rpath = \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ -rpath $(libdir)
+libmemcached_libmemcachedutil_la_DEPENDENCIES = \
+ libmemcached/libmemcached.la
am_libmemcached_libmemcachedutil_la_OBJECTS = \
libmemcached/libmemcached_libmemcachedutil_la-backtrace.lo \
libmemcachedutil/libmemcached_libmemcachedutil_la-flush.lo \
@@ -813,7 +709,9 @@
$(CXXLD) $(libmemcached_libmemcachedutil_la_CXXFLAGS) \
$(CXXFLAGS) $(libmemcached_libmemcachedutil_la_LDFLAGS) \
$(LDFLAGS) -o $@
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__append_37)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__append_29)
+@HAVE_DTRACE_FALSE@libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES = \
+@HAVE_DTRACE_FALSE@ $(am__DEPENDENCIES_2)
am__libmemcachedinternal_libmemcachedinternal_la_SOURCES_DIST = \
libmemcached/csl/context.cc libmemcached/csl/parser.cc \
libmemcached/csl/scanner.cc libmemcached/instance.cc \
@@ -823,7 +721,8 @@
libhashkit/fnv_32.cc libhashkit/fnv_64.cc \
libhashkit/function.cc libhashkit/has.cc libhashkit/hashkit.cc \
libhashkit/jenkins.cc libhashkit/ketama.cc libhashkit/md5.cc \
- libhashkit/murmur.cc libhashkit/one_at_a_time.cc \
+ libhashkit/murmur.cc libhashkit/murmur3.cc \
+ libhashkit/murmur3_api.cc libhashkit/one_at_a_time.cc \
libhashkit/rijndael.cc libhashkit/str_algorithm.cc \
libhashkit/strerror.cc libhashkit/string.cc \
libhashkit/hsieh.cc libhashkit/nohsieh.cc \
@@ -869,6 +768,8 @@
libhashkit/libmemcachedinternal_libmemcachedinternal_la-ketama.lo \
libhashkit/libmemcachedinternal_libmemcachedinternal_la-md5.lo \
libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur.lo \
+ libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo \
+ libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo \
libhashkit/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.lo \
libhashkit/libmemcachedinternal_libmemcachedinternal_la-rijndael.lo \
libhashkit/libmemcachedinternal_libmemcachedinternal_la-str_algorithm.lo \
@@ -927,17 +828,17 @@
libmemcached/libmemcachedinternal_libmemcachedinternal_la-udp.lo \
libmemcached/libmemcachedinternal_libmemcachedinternal_la-virtual_bucket.lo \
$(am__objects_9) $(am__objects_14)
-am_libmemcachedinternal_libmemcachedinternal_la_OBJECTS = \
- $(am__objects_15)
+@HAVE_DTRACE_FALSE@am_libmemcachedinternal_libmemcachedinternal_la_OBJECTS = \
+@HAVE_DTRACE_FALSE@ $(am__objects_15)
libmemcachedinternal_libmemcachedinternal_la_OBJECTS = \
$(am_libmemcachedinternal_libmemcachedinternal_la_OBJECTS)
libmemcachedinternal_libmemcachedinternal_la_LINK = $(LIBTOOL) \
$(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) \
$(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) \
- $(CXXFLAGS) \
- $(libmemcachedinternal_libmemcachedinternal_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES = \
+ libmemcachedinternal/libmemcachedinternal.la
am__objects_16 = libmemcached/libmemcachedinternal_libmemcachedutilinternal_la-backtrace.lo \
libmemcachedutil/libmemcachedinternal_libmemcachedutilinternal_la-flush.lo \
libmemcachedutil/libmemcachedinternal_libmemcachedutilinternal_la-pid.lo \
@@ -952,6 +853,9 @@
--mode=link $(CXXLD) \
$(libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+libtest_libtest_la_DEPENDENCIES = $(am__append_1) \
+ $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1)
am__libtest_libtest_la_SOURCES_DIST = libtest/alarm.cc \
libtest/binaries.cc libtest/cmdline.cc libtest/collection.cc \
libtest/comparison.cc libtest/core.cc libtest/cpu.cc \
@@ -959,12 +863,13 @@
libtest/fatal.cc libtest/formatter.cc libtest/client.cc \
libtest/framework.cc libtest/has.cc libtest/http.cc \
libtest/is_local.cc libtest/killpid.cc libtest/libtool.cc \
- libtest/main.cc libtest/port.cc libtest/runner.cc \
- libtest/server.cc libtest/server_container.cc \
- libtest/signal.cc libtest/socket.cc libtest/strerror.cc \
- libtest/timer.cc libtest/tmpfile.cc libtest/vchar.cc \
- libtest/memcached.cc libtest/blobslap_worker.cc \
- libtest/gearmand.cc util/instance.cc util/operation.cc
+ libtest/main.cc libtest/port.cc libtest/result.cc \
+ libtest/runner.cc libtest/server.cc \
+ libtest/server_container.cc libtest/signal.cc \
+ libtest/socket.cc libtest/strerror.cc libtest/timer.cc \
+ libtest/tmpfile.cc libtest/vchar.cc libtest/memcached.cc \
+ libtest/blobslap_worker.cc libtest/gearmand.cc \
+ util/instance.cc util/operation.cc
@BUILDING_LIBMEMCACHED_TRUE@am__objects_17 = libtest/libtest_libtest_la-memcached.lo
@BUILDING_LIBMEMCACHED_FALSE@@HAVE_LIBMEMCACHED_TRUE@am__objects_18 = libtest/libtest_libtest_la-memcached.lo
@BUILDING_GEARMAN_TRUE@am__objects_19 = libtest/libtest_libtest_la-blobslap_worker.lo \
@@ -996,6 +901,7 @@
libtest/libtest_libtest_la-libtool.lo \
libtest/libtest_libtest_la-main.lo \
libtest/libtest_libtest_la-port.lo \
+ libtest/libtest_libtest_la-result.lo \
libtest/libtest_libtest_la-runner.lo \
libtest/libtest_libtest_la-server.lo \
libtest/libtest_libtest_la-server_container.lo \
@@ -1012,8 +918,12 @@
$(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@BUILD_MEMASLAP_TRUE@@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memaslap$(EXEEXT)
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am__EXEEXT_2 = example/t/memcached_light$(EXEEXT)
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = example/memcached_light$(EXEEXT)
+@SHARED_ENABLED_TRUE@am__EXEEXT_2 = \
+@SHARED_ENABLED_TRUE@ libmemcached-1.0/t/c_test$(EXEEXT) \
+@SHARED_ENABLED_TRUE@ libmemcached-1.0/t/c_sasl_test$(EXEEXT)
+@HAVE_DTRACE_FALSE@am__EXEEXT_3 = \
+@HAVE_DTRACE_FALSE@ tests/libmemcached-1.0/internals$(EXEEXT)
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_4 = example/memcached_light$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_clients_memaslap_OBJECTS = clients/memaslap.$(OBJEXT) \
clients/ms_conn.$(OBJEXT) clients/ms_setting.$(OBJEXT) \
@@ -1059,7 +969,7 @@
clients/clients_memslap-generator.$(OBJEXT) \
clients/clients_memslap-execute.$(OBJEXT)
clients_memslap_OBJECTS = $(am_clients_memslap_OBJECTS)
-clients_memslap_DEPENDENCIES = $(CLIENTS_LDADDS) $(am__DEPENDENCIES_1)
+clients_memslap_DEPENDENCIES = $(CLIENTS_LDADDS)
clients_memslap_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(clients_memslap_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
@@ -1089,36 +999,35 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(example_memcached_light_LDFLAGS) \
$(LDFLAGS) -o $@
-am__example_t_memcached_light_SOURCES_DIST = \
- example/t/memcached_light.cc \
- tests/libmemcached-1.0/memcached_get.cc \
- tests/libmemcached-1.0/print.cc \
- tests/libmemcached-1.0/setup_and_teardowns.cc
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@am_example_t_memcached_light_OBJECTS = example/t/example_t_memcached_light-memcached_light.$(OBJEXT) \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ tests/libmemcached-1.0/example_t_memcached_light-memcached_get.$(OBJEXT) \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ tests/libmemcached-1.0/example_t_memcached_light-print.$(OBJEXT) \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.$(OBJEXT)
-example_t_memcached_light_OBJECTS = \
- $(am_example_t_memcached_light_OBJECTS)
-example_t_memcached_light_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_libmemcached_1_0_t_c_sasl_test_OBJECTS = \
- libmemcached-1.0/t/c_sasl_test.$(OBJEXT)
+am__libmemcached_1_0_t_c_sasl_test_SOURCES_DIST = \
+ libmemcached-1.0/t/c_sasl_test.c
+@SHARED_ENABLED_TRUE@am_libmemcached_1_0_t_c_sasl_test_OBJECTS = \
+@SHARED_ENABLED_TRUE@ libmemcached-1.0/t/c_sasl_test.$(OBJEXT)
libmemcached_1_0_t_c_sasl_test_OBJECTS = \
$(am_libmemcached_1_0_t_c_sasl_test_OBJECTS)
-am_libmemcached_1_0_t_c_test_OBJECTS = \
- libmemcached-1.0/t/c_test.$(OBJEXT)
+@SHARED_ENABLED_TRUE@libmemcached_1_0_t_c_sasl_test_DEPENDENCIES = \
+@SHARED_ENABLED_TRUE@ libmemcached/libmemcached.la
+am__libmemcached_1_0_t_c_test_SOURCES_DIST = \
+ libmemcached-1.0/t/c_test.c
+@SHARED_ENABLED_TRUE@am_libmemcached_1_0_t_c_test_OBJECTS = \
+@SHARED_ENABLED_TRUE@ libmemcached-1.0/t/c_test.$(OBJEXT)
libmemcached_1_0_t_c_test_OBJECTS = \
$(am_libmemcached_1_0_t_c_test_OBJECTS)
+@SHARED_ENABLED_TRUE@libmemcached_1_0_t_c_test_DEPENDENCIES = \
+@SHARED_ENABLED_TRUE@ libmemcached/libmemcached.la
am_libmemcached_1_0_t_cc_test_OBJECTS = \
libmemcached-1.0/t/cc_test.$(OBJEXT)
libmemcached_1_0_t_cc_test_OBJECTS = \
$(am_libmemcached_1_0_t_cc_test_OBJECTS)
+libmemcached_1_0_t_cc_test_DEPENDENCIES = \
+ libmemcached/libmemcached.la
am_libtest_abort_OBJECTS = libtest/abort.$(OBJEXT)
libtest_abort_OBJECTS = $(am_libtest_abort_OBJECTS)
libtest_abort_LDADD = $(LDADD)
+am_libtest_backtrace_OBJECTS = libtest/backtrace_test.$(OBJEXT) \
+ libmemcached/backtrace.$(OBJEXT)
+libtest_backtrace_OBJECTS = $(am_libtest_backtrace_OBJECTS)
+libtest_backtrace_DEPENDENCIES =
am_libtest_core_count_OBJECTS = libtest/cpu.$(OBJEXT) \
libtest/core_count.$(OBJEXT)
libtest_core_count_OBJECTS = $(am_libtest_core_count_OBJECTS)
@@ -1129,6 +1038,8 @@
am_libtest_unittest_OBJECTS = \
libtest/libtest_unittest-unittest.$(OBJEXT)
libtest_unittest_OBJECTS = $(am_libtest_unittest_OBJECTS)
+libtest_unittest_DEPENDENCIES = $(am__append_5) $(am__append_13) \
+ libtest/libtest.la
libtest_unittest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(libtest_unittest_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
@@ -1146,8 +1057,10 @@
tests/libmemcached-1.0/generate.$(OBJEXT) \
tests/libmemcached-1.0/print.$(OBJEXT)
tests_atomsmasher_OBJECTS = $(am_tests_atomsmasher_OBJECTS)
+tests_atomsmasher_DEPENDENCIES = $(TESTS_LDADDS)
am_tests_cycle_OBJECTS = tests/tests_cycle-cycle.$(OBJEXT)
tests_cycle_OBJECTS = $(am_tests_cycle_OBJECTS)
+tests_cycle_DEPENDENCIES = $(TESTS_LDADDS) $(am__DEPENDENCIES_1)
tests_cycle_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tests_cycle_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -1159,6 +1072,7 @@
tests/libmemcached-1.0/tests_failure-generate.$(OBJEXT) \
tests/libmemcached-1.0/tests_failure-print.$(OBJEXT)
tests_failure_OBJECTS = $(am_tests_failure_OBJECTS)
+tests_failure_DEPENDENCIES = $(TESTS_LDADDS)
tests_failure_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_failure_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
@@ -1166,14 +1080,21 @@
am_tests_hash_plus_OBJECTS = \
tests/tests_hash_plus-hash_plus.$(OBJEXT)
tests_hash_plus_OBJECTS = $(am_tests_hash_plus_OBJECTS)
+tests_hash_plus_DEPENDENCIES = $(tests_testhashkit_LDADD)
tests_hash_plus_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_hash_plus_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-am_tests_libmemcached_1_0_internals_OBJECTS = tests/libmemcached-1.0/tests_libmemcached_1_0_internals-internals.$(OBJEXT) \
- tests/libmemcached-1.0/tests_libmemcached_1_0_internals-string.$(OBJEXT)
+am__tests_libmemcached_1_0_internals_SOURCES_DIST = \
+ tests/libmemcached-1.0/internals.cc \
+ tests/libmemcached-1.0/string.cc
+@HAVE_DTRACE_FALSE@am_tests_libmemcached_1_0_internals_OBJECTS = tests/libmemcached-1.0/tests_libmemcached_1_0_internals-internals.$(OBJEXT) \
+@HAVE_DTRACE_FALSE@ tests/libmemcached-1.0/tests_libmemcached_1_0_internals-string.$(OBJEXT)
tests_libmemcached_1_0_internals_OBJECTS = \
$(am_tests_libmemcached_1_0_internals_OBJECTS)
+@HAVE_DTRACE_FALSE@tests_libmemcached_1_0_internals_DEPENDENCIES = libmemcachedinternal/libmemcachedinternal.la \
+@HAVE_DTRACE_FALSE@ libmemcachedinternal/libmemcachedutilinternal.la \
+@HAVE_DTRACE_FALSE@ libtest/libtest.la
tests_libmemcached_1_0_internals_LINK = $(LIBTOOL) $(AM_V_lt) \
--tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
$(CXXLD) $(tests_libmemcached_1_0_internals_CXXFLAGS) \
@@ -1197,6 +1118,9 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_sasl-generate.$(OBJEXT)
tests_libmemcached_1_0_sasl_OBJECTS = \
$(am_tests_libmemcached_1_0_sasl_OBJECTS)
+tests_libmemcached_1_0_sasl_DEPENDENCIES = \
+ libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
+ libtest/libtest.la libhashkit/libhashkit.la
tests_libmemcached_1_0_sasl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_libmemcached_1_0_sasl_CXXFLAGS) $(CXXFLAGS) \
@@ -1232,6 +1156,9 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_testapp-virtual_buckets.$(OBJEXT)
tests_libmemcached_1_0_testapp_OBJECTS = \
$(am_tests_libmemcached_1_0_testapp_OBJECTS)
+tests_libmemcached_1_0_testapp_DEPENDENCIES = \
+ libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
+ libtest/libtest.la libhashkit/libhashkit.la
tests_libmemcached_1_0_testapp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_libmemcached_1_0_testapp_CXXFLAGS) $(CXXFLAGS) \
@@ -1267,6 +1194,9 @@
tests/libmemcached-1.0/tests_libmemcached_1_0_testsocket-virtual_buckets.$(OBJEXT)
tests_libmemcached_1_0_testsocket_OBJECTS = \
$(am_tests_libmemcached_1_0_testsocket_OBJECTS)
+tests_libmemcached_1_0_testsocket_DEPENDENCIES = \
+ libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
+ libtest/libtest.la libhashkit/libhashkit.la
tests_libmemcached_1_0_testsocket_LINK = $(LIBTOOL) $(AM_V_lt) \
--tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
$(CXXLD) $(tests_libmemcached_1_0_testsocket_CXXFLAGS) \
@@ -1274,74 +1204,88 @@
am_tests_memcapable_OBJECTS = \
tests/tests_memcapable-memcapable.$(OBJEXT)
tests_memcapable_OBJECTS = $(am_tests_memcapable_OBJECTS)
+tests_memcapable_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memcapable_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memcapable_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_tests_memcat_OBJECTS = tests/tests_memcat-memcat.$(OBJEXT)
tests_memcat_OBJECTS = $(am_tests_memcat_OBJECTS)
+tests_memcat_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memcat_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tests_memcat_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_tests_memcp_OBJECTS = tests/tests_memcp-memcp.$(OBJEXT)
tests_memcp_OBJECTS = $(am_tests_memcp_OBJECTS)
+tests_memcp_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memcp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tests_memcp_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_tests_memdump_OBJECTS = tests/tests_memdump-memdump.$(OBJEXT)
tests_memdump_OBJECTS = $(am_tests_memdump_OBJECTS)
+tests_memdump_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memdump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memdump_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
am_tests_memerror_OBJECTS = tests/tests_memerror-memerror.$(OBJEXT)
tests_memerror_OBJECTS = $(am_tests_memerror_OBJECTS)
+tests_memerror_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memerror_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memerror_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_tests_memexist_OBJECTS = tests/tests_memexist-memexist.$(OBJEXT)
tests_memexist_OBJECTS = $(am_tests_memexist_OBJECTS)
+tests_memexist_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memexist_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memexist_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_tests_memflush_OBJECTS = tests/tests_memflush-memflush.$(OBJEXT)
tests_memflush_OBJECTS = $(am_tests_memflush_OBJECTS)
+tests_memflush_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memflush_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memflush_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_tests_memrm_OBJECTS = tests/tests_memrm-memrm.$(OBJEXT)
tests_memrm_OBJECTS = $(am_tests_memrm_OBJECTS)
+tests_memrm_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memrm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tests_memrm_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_tests_memslap_OBJECTS = tests/tests_memslap-memslap.$(OBJEXT)
tests_memslap_OBJECTS = $(am_tests_memslap_OBJECTS)
+tests_memslap_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memslap_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memslap_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
am_tests_memstat_OBJECTS = tests/tests_memstat-memstat.$(OBJEXT)
tests_memstat_OBJECTS = $(am_tests_memstat_OBJECTS)
+tests_memstat_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memstat_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memstat_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@
am_tests_memtouch_OBJECTS = tests/tests_memtouch-memtouch.$(OBJEXT)
tests_memtouch_OBJECTS = $(am_tests_memtouch_OBJECTS)
+tests_memtouch_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS)
tests_memtouch_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_memtouch_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
am_tests_parser_OBJECTS = tests/tests_parser-parser.$(OBJEXT)
tests_parser_OBJECTS = $(am_tests_parser_OBJECTS)
+tests_parser_DEPENDENCIES = $(TESTS_LDADDS)
tests_parser_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tests_parser_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_tests_testhashkit_OBJECTS = tests/hashkit_functions.$(OBJEXT)
tests_testhashkit_OBJECTS = $(am_tests_testhashkit_OBJECTS)
+tests_testhashkit_DEPENDENCIES = libtest/libtest.la \
+ libhashkit/libhashkit.la $(TESTS_LDADDS)
am_tests_testplus_OBJECTS = clients/tests_testplus-execute.$(OBJEXT) \
clients/tests_testplus-generator.$(OBJEXT) \
tests/libmemcached-1.0/tests_testplus-callback_counter.$(OBJEXT) \
@@ -1350,6 +1294,7 @@
tests/libmemcached-1.0/tests_testplus-plus.$(OBJEXT) \
tests/libmemcached-1.0/tests_testplus-print.$(OBJEXT)
tests_testplus_OBJECTS = $(am_tests_testplus_OBJECTS)
+tests_testplus_DEPENDENCIES = $(TESTS_LDADDS)
tests_testplus_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(tests_testplus_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
@@ -1361,6 +1306,7 @@
tests/libmemcached-1.0/generate.$(OBJEXT) \
tests/libmemcached-1.0/print.$(OBJEXT) tests/mem_udp.$(OBJEXT)
tests_testudp_OBJECTS = $(am_tests_testudp_OBJECTS)
+tests_testudp_DEPENDENCIES = $(TESTS_LDADDS)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -1419,14 +1365,14 @@
$(clients_memping_SOURCES) $(clients_memrm_SOURCES) \
$(clients_memslap_SOURCES) $(clients_memstat_SOURCES) \
$(clients_memtouch_SOURCES) $(example_memcached_light_SOURCES) \
- $(example_t_memcached_light_SOURCES) \
$(libmemcached_1_0_t_c_sasl_test_SOURCES) \
$(libmemcached_1_0_t_c_test_SOURCES) \
$(libmemcached_1_0_t_cc_test_SOURCES) $(libtest_abort_SOURCES) \
- $(libtest_core_count_SOURCES) $(libtest_skiptest_SOURCES) \
- $(libtest_unittest_SOURCES) $(libtest_wait_SOURCES) \
- $(tests_atomsmasher_SOURCES) $(tests_cycle_SOURCES) \
- $(tests_failure_SOURCES) $(tests_hash_plus_SOURCES) \
+ $(libtest_backtrace_SOURCES) $(libtest_core_count_SOURCES) \
+ $(libtest_skiptest_SOURCES) $(libtest_unittest_SOURCES) \
+ $(libtest_wait_SOURCES) $(tests_atomsmasher_SOURCES) \
+ $(tests_cycle_SOURCES) $(tests_failure_SOURCES) \
+ $(tests_hash_plus_SOURCES) \
$(tests_libmemcached_1_0_internals_SOURCES) \
$(tests_libmemcached_1_0_sasl_SOURCES) \
$(tests_libmemcached_1_0_testapp_SOURCES) \
@@ -1456,15 +1402,15 @@
$(clients_memrm_SOURCES) $(clients_memslap_SOURCES) \
$(clients_memstat_SOURCES) $(clients_memtouch_SOURCES) \
$(am__example_memcached_light_SOURCES_DIST) \
- $(am__example_t_memcached_light_SOURCES_DIST) \
- $(libmemcached_1_0_t_c_sasl_test_SOURCES) \
- $(libmemcached_1_0_t_c_test_SOURCES) \
+ $(am__libmemcached_1_0_t_c_sasl_test_SOURCES_DIST) \
+ $(am__libmemcached_1_0_t_c_test_SOURCES_DIST) \
$(libmemcached_1_0_t_cc_test_SOURCES) $(libtest_abort_SOURCES) \
- $(libtest_core_count_SOURCES) $(libtest_skiptest_SOURCES) \
- $(libtest_unittest_SOURCES) $(libtest_wait_SOURCES) \
- $(tests_atomsmasher_SOURCES) $(tests_cycle_SOURCES) \
- $(tests_failure_SOURCES) $(tests_hash_plus_SOURCES) \
- $(tests_libmemcached_1_0_internals_SOURCES) \
+ $(libtest_backtrace_SOURCES) $(libtest_core_count_SOURCES) \
+ $(libtest_skiptest_SOURCES) $(libtest_unittest_SOURCES) \
+ $(libtest_wait_SOURCES) $(tests_atomsmasher_SOURCES) \
+ $(tests_cycle_SOURCES) $(tests_failure_SOURCES) \
+ $(tests_hash_plus_SOURCES) \
+ $(am__tests_libmemcached_1_0_internals_SOURCES_DIST) \
$(tests_libmemcached_1_0_sasl_SOURCES) \
$(tests_libmemcached_1_0_testapp_SOURCES) \
$(tests_libmemcached_1_0_testsocket_SOURCES) \
@@ -1550,28 +1496,29 @@
libtest/http.hpp libtest/is_pid.hpp libtest/is_local.hpp \
libtest/killpid.h libtest/libtool.hpp libtest/memcached.h \
libtest/memcached.hpp libtest/poll_error.hpp libtest/port.h \
- libtest/runner.h libtest/server.h libtest/server_container.h \
- libtest/signal.h libtest/socket.hpp libtest/stream.h \
- libtest/strerror.h libtest/string.hpp libtest/test.h \
- libtest/test.hpp libtest/tmpfile.hpp libtest/vchar.hpp \
- libtest/version.h libtest/visibility.h libtest/wait.h \
- clients/client_options.h clients/execute.h clients/generator.h \
- clients/ms_atomic.h clients/ms_conn.h clients/ms_memslap.h \
- clients/ms_setting.h clients/ms_sigsegv.h clients/ms_stats.h \
- clients/ms_task.h clients/ms_thread.h clients/utilities.h \
- example/byteorder.h example/memcached_light.h \
- example/storage.h libhashkit/aes.h libhashkit/common.h \
- libhashkit/is.h libhashkit/rijndael.hpp libhashkit/string.h \
- libmemcached/csl/common.h libmemcached/csl/context.h \
- libmemcached/csl/parser.h libmemcached/csl/scanner.h \
- libmemcached/csl/server.h libmemcached/csl/symbol.h \
- libmemcached/array.h libmemcached/assert.hpp \
- libmemcached/backtrace.hpp libmemcached/behavior.hpp \
- libmemcached/byteorder.h libmemcached/common.h \
- libmemcached/connect.hpp libmemcached/continuum.hpp \
- libmemcached/do.hpp libmemcached/encoding_key.h \
- libmemcached/error.hpp libmemcached/flag.hpp \
- libmemcached/initialize_query.h libmemcached/instance.h \
+ libtest/result.hpp libtest/runner.h libtest/server.h \
+ libtest/server_container.h libtest/signal.h libtest/socket.hpp \
+ libtest/stream.h libtest/strerror.h libtest/string.hpp \
+ libtest/test.h libtest/test.hpp libtest/thread.hpp \
+ libtest/tmpfile.hpp libtest/vchar.hpp libtest/version.h \
+ libtest/visibility.h libtest/wait.h clients/client_options.h \
+ clients/execute.h clients/generator.h clients/ms_atomic.h \
+ clients/ms_conn.h clients/ms_memslap.h clients/ms_setting.h \
+ clients/ms_sigsegv.h clients/ms_stats.h clients/ms_task.h \
+ clients/ms_thread.h clients/utilities.h example/byteorder.h \
+ example/memcached_light.h example/storage.h libhashkit/aes.h \
+ libhashkit/algorithm.h libhashkit/murmur3.h \
+ libhashkit/common.h libhashkit/is.h libhashkit/rijndael.hpp \
+ libhashkit/string.h libmemcached/csl/common.h \
+ libmemcached/csl/context.h libmemcached/csl/parser.h \
+ libmemcached/csl/scanner.h libmemcached/csl/server.h \
+ libmemcached/csl/symbol.h libmemcached/array.h \
+ libmemcached/assert.hpp libmemcached/backtrace.hpp \
+ libmemcached/behavior.hpp libmemcached/byteorder.h \
+ libmemcached/common.h libmemcached/connect.hpp \
+ libmemcached/continuum.hpp libmemcached/do.hpp \
+ libmemcached/encoding_key.h libmemcached/error.hpp \
+ libmemcached/flag.hpp libmemcached/initialize_query.h \
libmemcached/instance.hpp libmemcached/internal.h \
libmemcached/io.h libmemcached/io.hpp libmemcached/is.h \
libmemcached/key.hpp libmemcached/libmemcached_probes.h \
@@ -1589,8 +1536,8 @@
libmemcachedprotocol/cache.h libmemcachedprotocol/common.h \
poll/poll.h tests/exist.h tests/hash_results.h tests/keys.hpp \
tests/libmemcached_test_container.h tests/libmemcached_world.h \
- tests/libmemcached_world_socket.h tests/memc.h tests/runner.h \
- tests/basic.h tests/callbacks.h tests/debug.h \
+ tests/libmemcached_world_socket.h tests/memc.hpp \
+ tests/runner.h tests/basic.h tests/callbacks.h tests/debug.h \
tests/deprecated.h tests/error_conditions.h tests/ketama.h \
tests/ketama_test_cases.h tests/ketama_test_cases_spy.h \
tests/libmemcached-1.0/all_tests.h \
@@ -1652,6 +1599,7 @@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
+AUTOHEADER_FILE = @AUTOHEADER_FILE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
@@ -1673,6 +1621,8 @@
DEPDIR = @DEPDIR@
DEPRECATED = @DEPRECATED@
DLLTOOL = @DLLTOOL@
+DL_CPPFLAGS = @DL_CPPFLAGS@
+DL_LDFLAGS = @DL_LDFLAGS@
DL_LIB = @DL_LIB@
DPKG_GENSYMBOLS = @DPKG_GENSYMBOLS@
DSYMUTIL = @DSYMUTIL@
@@ -1700,11 +1650,16 @@
LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
-LIBEVENT_LDFLAGS = @LIBEVENT_LDFLAGS@
+LIBEVENT_LIB = @LIBEVENT_LIB@
LIBGEARMAN_CPPFLAGS = @LIBGEARMAN_CPPFLAGS@
LIBGEARMAN_LDFLAGS = @LIBGEARMAN_LDFLAGS@
+LIBGEARMAN_LIB = @LIBGEARMAN_LIB@
LIBHASHKIT_VERSION_HEX = @LIBHASHKIT_VERSION_HEX@
LIBHASHKIT_VERSION_STRING = @LIBHASHKIT_VERSION_STRING@
+LIBM = @LIBM@
+LIBMEMCACHED_CFLAGS = @LIBMEMCACHED_CFLAGS@
+LIBMEMCACHED_LDFLAGS = @LIBMEMCACHED_LDFLAGS@
+LIBMEMCACHED_UTIL_LDFLAGS = @LIBMEMCACHED_UTIL_LDFLAGS@
LIBMEMCACHED_VERSION_HEX = @LIBMEMCACHED_VERSION_HEX@
LIBMEMCACHED_VERSION_STRING = @LIBMEMCACHED_VERSION_STRING@
LIBMEMCACHED_WITH_SASL_SUPPORT = @LIBMEMCACHED_WITH_SASL_SUPPORT@
@@ -1712,9 +1667,10 @@
LIBS = @LIBS@
LIBSASL_CPPFLAGS = @LIBSASL_CPPFLAGS@
LIBSASL_LDFLAGS = @LIBSASL_LDFLAGS@
+LIBSASL_LIB = @LIBSASL_LIB@
LIBTEST_VERSION = @LIBTEST_VERSION@
LIBTOOL = @LIBTOOL@
-LIBUUID_LDFLAGS = @LIBUUID_LDFLAGS@
+LIBUUID_LIB = @LIBUUID_LIB@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -1728,6 +1684,7 @@
MYSQLD = @MYSQLD@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
+MYSQL_INCLUDE = @MYSQL_INCLUDE@
MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
MYSQL_VERSION = @MYSQL_VERSION@
NM = @NM@
@@ -1750,7 +1707,7 @@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
RT_LIB = @RT_LIB@
-SASL_LDFLAGS = @SASL_LDFLAGS@
+SASL_LIB = @SASL_LIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1821,7 +1778,7 @@
# includes append to these:
SUFFIXES = .d
.PHONY =
-CLEANFILES = tmp_chroot $(am__append_35)
+CLEANFILES = $(am__append_27)
DISTCLEANFILES = aminclude.am libmemcached/csl/parser.output \
config/top.h
@@ -1843,27 +1800,28 @@
libtest/http.hpp libtest/is_pid.hpp libtest/is_local.hpp \
libtest/killpid.h libtest/libtool.hpp libtest/memcached.h \
libtest/memcached.hpp libtest/poll_error.hpp libtest/port.h \
- libtest/runner.h libtest/server.h libtest/server_container.h \
- libtest/signal.h libtest/socket.hpp libtest/stream.h \
- libtest/strerror.h libtest/string.hpp libtest/test.h \
- libtest/test.hpp libtest/tmpfile.hpp libtest/vchar.hpp \
- libtest/version.h libtest/visibility.h libtest/wait.h \
- clients/client_options.h clients/execute.h clients/generator.h \
- clients/ms_atomic.h clients/ms_conn.h clients/ms_memslap.h \
- clients/ms_setting.h clients/ms_sigsegv.h clients/ms_stats.h \
- clients/ms_task.h clients/ms_thread.h clients/utilities.h \
- $(am__append_27) libhashkit/aes.h libhashkit/common.h \
- libhashkit/is.h libhashkit/rijndael.hpp libhashkit/string.h \
- libmemcached/csl/common.h libmemcached/csl/context.h \
- libmemcached/csl/parser.h libmemcached/csl/scanner.h \
- libmemcached/csl/server.h libmemcached/csl/symbol.h \
- libmemcached/array.h libmemcached/assert.hpp \
- libmemcached/backtrace.hpp libmemcached/behavior.hpp \
- libmemcached/byteorder.h libmemcached/common.h \
- libmemcached/connect.hpp libmemcached/continuum.hpp \
- libmemcached/do.hpp libmemcached/encoding_key.h \
- libmemcached/error.hpp libmemcached/flag.hpp \
- libmemcached/initialize_query.h libmemcached/instance.h \
+ libtest/result.hpp libtest/runner.h libtest/server.h \
+ libtest/server_container.h libtest/signal.h libtest/socket.hpp \
+ libtest/stream.h libtest/strerror.h libtest/string.hpp \
+ libtest/test.h libtest/test.hpp libtest/thread.hpp \
+ libtest/tmpfile.hpp libtest/vchar.hpp libtest/version.h \
+ libtest/visibility.h libtest/wait.h clients/client_options.h \
+ clients/execute.h clients/generator.h clients/ms_atomic.h \
+ clients/ms_conn.h clients/ms_memslap.h clients/ms_setting.h \
+ clients/ms_sigsegv.h clients/ms_stats.h clients/ms_task.h \
+ clients/ms_thread.h clients/utilities.h $(am__append_21) \
+ libhashkit/aes.h libhashkit/algorithm.h libhashkit/murmur3.h \
+ libhashkit/common.h libhashkit/is.h libhashkit/rijndael.hpp \
+ libhashkit/string.h libmemcached/csl/common.h \
+ libmemcached/csl/context.h libmemcached/csl/parser.h \
+ libmemcached/csl/scanner.h libmemcached/csl/server.h \
+ libmemcached/csl/symbol.h libmemcached/array.h \
+ libmemcached/assert.hpp libmemcached/backtrace.hpp \
+ libmemcached/behavior.hpp libmemcached/byteorder.h \
+ libmemcached/common.h libmemcached/connect.hpp \
+ libmemcached/continuum.hpp libmemcached/do.hpp \
+ libmemcached/encoding_key.h libmemcached/error.hpp \
+ libmemcached/flag.hpp libmemcached/initialize_query.h \
libmemcached/instance.hpp libmemcached/internal.h \
libmemcached/io.h libmemcached/io.hpp libmemcached/is.h \
libmemcached/key.hpp libmemcached/libmemcached_probes.h \
@@ -1876,11 +1834,11 @@
libmemcached/string.hpp libmemcached/udp.hpp \
libmemcached/version.hpp libmemcached/virtual_bucket.h \
libmemcached/watchpoint.h libmemcachedutil/common.h \
- $(am__append_40) poll/poll.h tests/exist.h \
+ $(am__append_32) poll/poll.h tests/exist.h \
tests/hash_results.h tests/keys.hpp \
tests/libmemcached_test_container.h tests/libmemcached_world.h \
- tests/libmemcached_world_socket.h tests/memc.h tests/runner.h \
- tests/basic.h tests/callbacks.h tests/debug.h \
+ tests/libmemcached_world_socket.h tests/memc.hpp \
+ tests/runner.h tests/basic.h tests/callbacks.h tests/debug.h \
tests/deprecated.h tests/error_conditions.h tests/exist.h \
tests/ketama.h tests/ketama_test_cases.h \
tests/ketama_test_cases_spy.h \
@@ -1904,7 +1862,7 @@
util/pidfile.hpp win32/wrappers.h
lib_LTLIBRARIES = libhashkit/libhashkit.la \
libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
- $(am__append_39)
+ $(am__append_31)
man_MANS =
# library used for testing
@@ -1965,7 +1923,7 @@
libmemcached-1.0/strerror.h libmemcached-1.0/touch.h \
libmemcached-1.0/triggers.h libmemcached-1.0/types.h \
libmemcached-1.0/verbosity.h libmemcached-1.0/version.h \
- libmemcached-1.0/visibility.h $(am__append_22) \
+ libmemcached-1.0/visibility.h $(am__append_17) \
libmemcachedutil-1.0/flush.h libmemcachedutil-1.0/ostream.hpp \
libmemcachedutil-1.0/pid.h libmemcachedutil-1.0/ping.h \
libmemcachedutil-1.0/pool.h libmemcachedutil-1.0/util.h \
@@ -1974,16 +1932,77 @@
libmemcached/util.h
EXTRA_HEADERS =
BUILT_SOURCES = libtest/version.h libhashkit-1.0/configure.h \
- libmemcached-1.0/configure.h $(am__append_24) \
- libmemcached/csl/parser.h libmemcached/csl/scanner.h \
- $(am__append_34)
+ libmemcached-1.0/configure.h $(am__append_19) \
+ libmemcached/csl/parser.cc libmemcached/csl/parser.h \
+ libmemcached/csl/scanner.cc libmemcached/csl/scanner.h \
+ $(am__append_26)
EXTRA_DIST = .quickly README.FIRST README.win32 libtest/run.gdb \
libtest/version.h libhashkit-1.0/configure.h.in \
libmemcached-1.0/configure.h.in libmemcached/csl/parser.yy \
libmemcached/csl/scanner.l libmemcached/libmemcached_probes.d \
libmemcached/memcached/README.txt support/libmemcached.spec \
support/set_benchmark.sh tests/cpp_example.cc
-dist_man_MANS = $(am__append_25)
+dist_man_MANS = man/memaslap.1 man/memcapable.1 man/memcat.1 \
+ man/memcp.1 man/memdump.1 man/memerror.1 man/memexist.1 \
+ man/memflush.1 man/memparse.1 man/memping.1 man/memrm.1 \
+ man/memslap.1 man/memstat.1 man/memtouch.1 man/hashkit_clone.3 \
+ man/hashkit_crc32.3 man/hashkit_create.3 man/hashkit_fnv1_32.3 \
+ man/hashkit_fnv1_64.3 man/hashkit_fnv1a_32.3 \
+ man/hashkit_fnv1a_64.3 man/hashkit_free.3 \
+ man/hashkit_functions.3 man/hashkit_hsieh.3 \
+ man/hashkit_is_allocated.3 man/hashkit_jenkins.3 \
+ man/hashkit_md5.3 man/hashkit_murmur.3 man/hashkit_value.3 \
+ man/libhashkit.3 man/libmemcached.3 \
+ man/libmemcached_check_configuration.3 \
+ man/libmemcached_configuration.3 man/libmemcached_examples.3 \
+ man/libmemcachedutil.3 man/memcached.3 man/memcached_add.3 \
+ man/memcached_add_by_key.3 man/memcached_analyze.3 \
+ man/memcached_append.3 man/memcached_append_by_key.3 \
+ man/memcached_behavior_get.3 man/memcached_behavior_set.3 \
+ man/memcached_callback_get.3 man/memcached_callback_set.3 \
+ man/memcached_cas.3 man/memcached_cas_by_key.3 \
+ man/memcached_clone.3 man/memcached_create.3 \
+ man/memcached_decrement.3 \
+ man/memcached_decrement_with_initial.3 man/memcached_delete.3 \
+ man/memcached_delete_by_key.3 \
+ man/memcached_destroy_sasl_auth_data.3 man/memcached_dump.3 \
+ man/memcached_exist.3 man/memcached_exist_by_key.3 \
+ man/memcached_fetch.3 man/memcached_fetch_execute.3 \
+ man/memcached_fetch_result.3 man/memcached_flush_buffers.3 \
+ man/memcached_free.3 man/memcached_generate_hash.3 \
+ man/memcached_generate_hash_value.3 man/memcached_get.3 \
+ man/memcached_get_by_key.3 \
+ man/memcached_get_memory_allocators.3 \
+ man/memcached_get_sasl_callbacks.3 \
+ man/memcached_get_user_data.3 man/memcached_increment.3 \
+ man/memcached_increment_with_initial.3 \
+ man/memcached_last_error_message.3 man/memcached_lib_version.3 \
+ man/memcached_mget.3 man/memcached_mget_by_key.3 \
+ man/memcached_mget_execute.3 \
+ man/memcached_mget_execute_by_key.3 man/memcached_pool.3 \
+ man/memcached_pool_behavior_get.3 \
+ man/memcached_pool_behavior_set.3 man/memcached_pool_create.3 \
+ man/memcached_pool_destroy.3 man/memcached_pool_fetch.3 \
+ man/memcached_pool_pop.3 man/memcached_pool_push.3 \
+ man/memcached_pool_release.3 man/memcached_pool_st.3 \
+ man/memcached_prepend.3 man/memcached_prepend_by_key.3 \
+ man/memcached_quit.3 man/memcached_replace.3 \
+ man/memcached_replace_by_key.3 \
+ man/memcached_sasl_set_auth_data.3 man/memcached_server_add.3 \
+ man/memcached_server_count.3 man/memcached_server_cursor.3 \
+ man/memcached_server_list.3 man/memcached_server_list_append.3 \
+ man/memcached_server_list_count.3 \
+ man/memcached_server_list_free.3 man/memcached_server_push.3 \
+ man/memcached_servers_parse.3 man/memcached_set.3 \
+ man/memcached_set_by_key.3 \
+ man/memcached_set_memory_allocators.3 \
+ man/memcached_set_sasl_callbacks.3 \
+ man/memcached_set_user_data.3 man/memcached_stat.3 \
+ man/memcached_stat_execute.3 man/memcached_stat_get_keys.3 \
+ man/memcached_stat_get_value.3 man/memcached_stat_servername.3 \
+ man/memcached_strerror.3 man/memcached_touch.3 \
+ man/memcached_touch_by_key.3 man/memcached_verbosity.3 \
+ man/memcached_version.3
MAINTAINERCLEANFILES = libmemcached/csl/parser.h \
libmemcached/csl/parser.cc libmemcached/csl/scanner.h \
libmemcached/csl/scanner.cc
@@ -1997,14 +2016,14 @@
MASSIF_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=massif
GDB_COMMAND = $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
PTRCHECK_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1
-libtest_libtest_la_CXXFLAGS = -DBUILDING_LIBTEST $(PTHREAD_CFLAGS) \
- -DLIBTEST_TEMP="\"tmp_chroot\"" $(CURL_CFLAGS) $(am__append_4) \
- $(am__append_10) $(am__append_13)
-libtest_libtest_la_DEPENDENCIES = libtest_tmp_dir libtest/abort \
- libtest/wait $(am__append_1) $(am__append_14) $(am__append_19)
-libtest_libtest_la_LIBADD = $(PTHREAD_LIBS) $(CURL_LIBS) $(RT_LIB) \
- $(am__append_2) $(am__append_8) $(am__append_12) \
- $(am__append_15) $(am__append_20)
+PAHOLE_COMMAND = $(LIBTOOL_COMMAND) --mode=execute pahole
+libtest_libtest_la_CXXFLAGS = -DBUILDING_LIBTEST @PTHREAD_CFLAGS@ \
+ -DLIBTEST_TEMP="\"tmp_chroot\"" $(CURL_CFLAGS) $(am__append_3) \
+ $(am__append_8) $(am__append_11)
+EXTRA_libtest_libtest_la_DEPENDENCIES = libtest_tmp_dir libtest/abort \
+ libtest/wait
+libtest_libtest_la_LIBADD = @PTHREAD_LIBS@ $(CURL_LIBS) @RT_LIB@ \
+ $(am__append_1) $(am__append_6) $(am__append_10)
libtest_libtest_la_SOURCES = libtest/alarm.cc libtest/binaries.cc \
libtest/cmdline.cc libtest/collection.cc libtest/comparison.cc \
libtest/core.cc libtest/cpu.cc libtest/dns.cc libtest/dream.cc \
@@ -2012,40 +2031,39 @@
libtest/client.cc libtest/framework.cc libtest/has.cc \
libtest/http.cc libtest/is_local.cc libtest/killpid.cc \
libtest/libtool.cc libtest/main.cc libtest/port.cc \
- libtest/runner.cc libtest/server.cc \
+ libtest/result.cc libtest/runner.cc libtest/server.cc \
libtest/server_container.cc libtest/signal.cc \
libtest/socket.cc libtest/strerror.cc libtest/timer.cc \
- libtest/tmpfile.cc libtest/vchar.cc $(am__append_3) \
- $(am__append_9) $(am__append_16) $(am__append_21)
+ libtest/tmpfile.cc libtest/vchar.cc $(am__append_2) \
+ $(am__append_7) $(am__append_12) $(am__append_14)
# Declare unittest so that we can append to it
-libtest_unittest_CXXFLAGS = $(am__append_5) $(am__append_11)
-libtest_unittest_LDADD = $(am__append_6) $(am__append_17) \
- libtest/libtest.la
-libtest_unittest_DEPENDENCIES = $(am__append_7) $(am__append_18) \
+libtest_unittest_CXXFLAGS = $(am__append_4) $(am__append_9)
+libtest_unittest_LDADD = $(am__append_5) $(am__append_13) \
libtest/libtest.la
+TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
libtest_unittest_SOURCES = libtest/unittest.cc
libtest_skiptest_LDADD = libtest/libtest.la
libtest_skiptest_SOURCES = libtest/skiptest.cc
libtest_wait_SOURCES = libtest/wait.cc libtest/dream.cc
libtest_core_count_SOURCES = libtest/cpu.cc libtest/core_count.cc
libtest_abort_SOURCES = libtest/abort.cc
+libtest_backtrace_SOURCES = libtest/backtrace_test.cc \
+ libmemcached/backtrace.cc
+libtest_backtrace_LDADD = @DL_LIB@
LIBMEMCACHED_1_0_TEST_PATH = libmemcached-1.0/t
# Test linking with C application
-libmemcached_1_0_t_c_test_SOURCES = libmemcached-1.0/t/c_test.c
-libmemcached_1_0_t_c_test_LDADD = libmemcached/libmemcached.la
-libmemcached_1_0_t_c_test_DEPENDENCIES = libmemcached/libmemcached.la
+@SHARED_ENABLED_TRUE@libmemcached_1_0_t_c_test_SOURCES = libmemcached-1.0/t/c_test.c
+@SHARED_ENABLED_TRUE@libmemcached_1_0_t_c_test_LDADD = libmemcached/libmemcached.la
+
+# Test linking with C application/SASL include
+@SHARED_ENABLED_TRUE@libmemcached_1_0_t_c_sasl_test_SOURCES = libmemcached-1.0/t/c_sasl_test.c
+@SHARED_ENABLED_TRUE@libmemcached_1_0_t_c_sasl_test_LDADD = libmemcached/libmemcached.la
# Test linking with C++ application
libmemcached_1_0_t_cc_test_SOURCES = libmemcached-1.0/t/cc_test.cc
libmemcached_1_0_t_cc_test_LDADD = libmemcached/libmemcached.la
-libmemcached_1_0_t_cc_test_DEPENDENCIES = libmemcached/libmemcached.la
-
-# Test linking with C application/SASL include
-libmemcached_1_0_t_c_sasl_test_SOURCES = libmemcached-1.0/t/c_sasl_test.c
-libmemcached_1_0_t_c_sasl_test_LDADD = libmemcached/libmemcached.la
-libmemcached_1_0_t_c_sasl_test_DEPENDENCIES = libmemcached/libmemcached.la
CLIENTS_LDADDS = clients/libutilities.la libmemcached/libmemcached.la
clients_libutilities_la_SOURCES = clients/utilities.cc
clients_memcat_SOURCES = clients/memcat.cc
@@ -2072,13 +2090,13 @@
clients_memerror_LDADD = $(CLIENTS_LDADDS)
clients_memslap_SOURCES = clients/memslap.cc clients/generator.cc \
clients/execute.cc
-clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS}
-clients_memslap_LDADD = $(CLIENTS_LDADDS) $(PTHREAD_LIBS)
+clients_memslap_CXXFLAGS = @PTHREAD_CFLAGS@
+clients_memslap_LDADD = $(CLIENTS_LDADDS) @PTHREAD_LIBS@
clients_memaslap_SOURCES = clients/memaslap.c clients/ms_conn.c \
clients/ms_setting.c clients/ms_sigsegv.c clients/ms_stats.c \
clients/ms_task.c clients/ms_thread.c clients/generator.cc \
clients/execute.cc
-clients_memaslap_LDADD = $(LTLIBEVENT) $(CLIENTS_LDADDS)
+clients_memaslap_LDADD = @LIBEVENT_LIB@ $(CLIENTS_LDADDS)
clients_memcapable_SOURCES = clients/memcapable.cc \
libmemcached/byteorder.cc
clients_memcapable_LDADD = $(CLIENTS_LDADDS)
@@ -2102,38 +2120,25 @@
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@example_memcached_light_LDFLAGS = \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @LIBEVENT_LDFLAGS@ \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(am__empty)
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@MEMCACHED_LIGHT_TESTS_LDADDS = \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcached/libmemcached.la \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcached/libmemcachedutil.la \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libtest/libtest.la
-
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@example_t_memcached_light_CXXFLAGS = \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(AM_CXXFLAGS)
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@example_t_memcached_light_DEPENDENCIES = $(MEMCACHED_LIGHT_TESTS_LDADDS) \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ example/memcached_light
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@example_t_memcached_light_LDADD = $(MEMCACHED_LIGHT_TESTS_LDADDS) \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(LIBUUID_LDFLAGS)
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@example_t_memcached_light_SOURCES = example/t/memcached_light.cc \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ tests/libmemcached-1.0/memcached_get.cc \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ tests/libmemcached-1.0/print.cc \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ tests/libmemcached-1.0/setup_and_teardowns.cc
+libhashkit_libhashkit_la_LIBADD =
libhashkit_libhashkit_la_SOURCES = libhashkit/aes.cc \
libhashkit/algorithm.cc libhashkit/behavior.cc \
libhashkit/crc32.cc libhashkit/digest.cc libhashkit/encrypt.cc \
libhashkit/fnv_32.cc libhashkit/fnv_64.cc \
libhashkit/function.cc libhashkit/has.cc libhashkit/hashkit.cc \
libhashkit/jenkins.cc libhashkit/ketama.cc libhashkit/md5.cc \
- libhashkit/murmur.cc libhashkit/one_at_a_time.cc \
+ libhashkit/murmur.cc libhashkit/murmur3.cc \
+ libhashkit/murmur3_api.cc libhashkit/one_at_a_time.cc \
libhashkit/rijndael.cc libhashkit/str_algorithm.cc \
- libhashkit/strerror.cc libhashkit/string.cc $(am__append_30) \
- $(am__append_31)
+ libhashkit/strerror.cc libhashkit/string.cc $(am__append_22) \
+ $(am__append_23)
libhashkit_libhashkit_la_CXXFLAGS = -DBUILDING_HASHKIT
-libhashkit_libhashkit_la_LIBADD =
+libhashkit_libhashkit_la_CFLAGS = -DBUILDING_HASHKIT
libhashkit_libhashkit_la_LDFLAGS = -version-info \
- $(HASHKIT_LIBRARY_VERSION) $(am__append_42)
+ $(HASHKIT_LIBRARY_VERSION) $(am__append_36)
libhashkit_libhashkitinc_la_SOURCES = ${libhashkit_libhashkit_la_SOURCES}
libhashkit_libhashkitinc_la_CFLAGS = ${libhashkit_libhashkit_la_CFLAGS}
-libhashkit_libhashkitinc_la_LDFLAGS = $(LIBM)
+libhashkit_libhashkitinc_la_CXXFLAGS = ${libhashkit_libhashkit_la_CXXFLAGS}
libmemcached_libmemcached_la_SOURCES = libmemcached/csl/context.cc \
libmemcached/csl/parser.cc libmemcached/csl/scanner.cc \
libmemcached/instance.cc ${libhashkit_libhashkit_la_SOURCES} \
@@ -2160,16 +2165,16 @@
libmemcached/strerror.cc libmemcached/string.cc \
libmemcached/touch.cc libmemcached/verbosity.cc \
libmemcached/version.cc libmemcached/udp.cc \
- libmemcached/virtual_bucket.c $(am__append_38) \
- $(am__append_41)
+ libmemcached/virtual_bucket.c $(am__append_30) \
+ $(am__append_33)
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES = $(am__append_28)
+libmemcached_libmemcached_la_LIBADD = @DL_LIB@ $(am__append_25) \
+ $(am__append_29)
+libmemcached_libmemcached_la_LDFLAGS = -version-info \
+ ${MEMCACHED_LIBRARY_VERSION} $(am__append_37)
libmemcached_libmemcached_la_CFLAGS = -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_CXXFLAGS = -DBUILDING_LIBMEMCACHED \
- $(am__append_32)
-libmemcached_libmemcached_la_DEPENDENCIES = $(am__append_36)
-libmemcached_libmemcached_la_LIBADD = $(am__append_33) \
- $(am__append_37)
-libmemcached_libmemcached_la_LDFLAGS = -version-info \
- ${MEMCACHED_LIBRARY_VERSION} $(DL_LIB) $(am__append_43)
+ $(am__append_24)
libmemcached_libmemcachedutil_la_SOURCES = \
libmemcached/backtrace.cc \
libmemcachedutil/flush.cc \
@@ -2178,13 +2183,12 @@
libmemcachedutil/pool.cc \
libmemcachedutil/version.cc
-libmemcached_libmemcachedutil_la_CXXFLAGS = ${AM_CXXFLAGS} \
- ${NO_CONVERSION} -DBUILDING_LIBMEMCACHED ${PTHREAD_CFLAGS}
libmemcached_libmemcachedutil_la_LIBADD = \
- libmemcached/libmemcached.la ${PTHREAD_LIBS}
+ libmemcached/libmemcached.la @PTHREAD_LIBS@
libmemcached_libmemcachedutil_la_LDFLAGS = ${AM_LDFLAGS} -version-info \
- ${MEMCACHED_UTIL_LIBRARY_VERSION} $(am__append_45)
-libmemcached_libmemcachedutil_la_DEPENDENCIES = libmemcached/libmemcached.la
+ ${MEMCACHED_UTIL_LIBRARY_VERSION} $(am__append_39)
+libmemcached_libmemcachedutil_la_CXXFLAGS = ${AM_CXXFLAGS} \
+ ${NO_CONVERSION} -DBUILDING_LIBMEMCACHED @PTHREAD_CFLAGS@
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@libmemcached_libmemcachedprotocol_la_SOURCES = \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcached/byteorder.cc \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ libmemcachedprotocol/ascii_handler.c \
@@ -2196,69 +2200,65 @@
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${AM_CFLAGS} \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${NO_CONVERSION} \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ -DBUILDING_LIBMEMCACHED \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${PTHREAD_CFLAGS}
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @PTHREAD_CFLAGS@ \
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(am__empty)
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@libmemcached_libmemcachedprotocol_la_CXXFLAGS = \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${AM_CXXFLAGS} \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ -DBUILDING_LIBMEMCACHED \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${PTHREAD_CFLAGS}
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@libmemcached_libmemcachedprotocol_la_LIBADD = ${PTHREAD_LIBS}
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @PTHREAD_CFLAGS@ \
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(am__empty)
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@libmemcached_libmemcachedprotocol_la_LIBADD = \
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @LIBEVENT_LIB@ \
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @PTHREAD_LIBS@ $(am__empty)
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@libmemcached_libmemcachedprotocol_la_LDFLAGS = \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${AM_LDFLAGS} -version-info \
@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ ${MEMCACHED_PROTOCAL_LIBRARY_VERSION} \
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(am__append_44)
-libmemcachedinternal_libmemcachedinternal_la_SOURCES = $(libmemcached_libmemcached_la_SOURCES)
-libmemcachedinternal_libmemcachedinternal_la_CFLAGS = \
- ${AM_CFLAGS} \
- ${NO_CONVERSION} \
- -DBUILDING_LIBMEMCACHEDINTERNAL
-
-libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS = \
- ${AM_CPPFLAGS} \
- ${NO_CONVERSION} \
- -DBUILDING_LIBMEMCACHEDINTERNAL
-
-libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS = \
- ${AM_CXXFLAGS} \
- ${NO_CONVERSION} \
- -DBUILDING_LIBMEMCACHEDINTERNAL
-
-libmemcachedinternal_libmemcachedinternal_la_LDFLAGS = ${AM_LDFLAGS}
-libmemcachedinternal_libmemcachedinternal_la_LIBADD = $(libmemcached_libmemcached_la_LIBADD)
-libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES = $(libmemcached_libmemcached_la_DEPENDENCIES)
+@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(am__append_38)
+@HAVE_DTRACE_FALSE@libmemcachedinternal_libmemcachedinternal_la_SOURCES = $(libmemcached_libmemcached_la_SOURCES)
+@HAVE_DTRACE_FALSE@libmemcachedinternal_libmemcachedinternal_la_CFLAGS = \
+@HAVE_DTRACE_FALSE@ ${AM_CFLAGS} \
+@HAVE_DTRACE_FALSE@ ${NO_CONVERSION} \
+@HAVE_DTRACE_FALSE@ -DBUILDING_LIBMEMCACHEDINTERNAL
+
+@HAVE_DTRACE_FALSE@libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS = \
+@HAVE_DTRACE_FALSE@ ${AM_CPPFLAGS} \
+@HAVE_DTRACE_FALSE@ ${NO_CONVERSION} \
+@HAVE_DTRACE_FALSE@ -DBUILDING_LIBMEMCACHEDINTERNAL
+
+@HAVE_DTRACE_FALSE@libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS = \
+@HAVE_DTRACE_FALSE@ ${AM_CXXFLAGS} \
+@HAVE_DTRACE_FALSE@ ${NO_CONVERSION} \
+@HAVE_DTRACE_FALSE@ -DBUILDING_LIBMEMCACHEDINTERNAL
+
+@HAVE_DTRACE_FALSE@libmemcachedinternal_libmemcachedinternal_la_LIBADD = $(libmemcached_libmemcached_la_LIBADD)
+@HAVE_DTRACE_FALSE@EXTRA_libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES = $(EXTRA_libmemcached_libmemcached_la_DEPENDENCIES)
libmemcachedinternal_libmemcachedutilinternal_la_SOURCES = $(libmemcached_libmemcachedutil_la_SOURCES)
libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS = \
${AM_CXXFLAGS} ${NO_CONVERSION} \
- -DBUILDING_LIBMEMCACHEDINTERNAL ${PTHREAD_CFLAGS}
-libmemcachedinternal_libmemcachedutilinternal_la_LIBADD = libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS}
-libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES = libmemcachedinternal/libmemcachedinternal.la
+ -DBUILDING_LIBMEMCACHEDINTERNAL @PTHREAD_CFLAGS@
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD = \
+ libmemcachedinternal/libmemcachedinternal.la @PTHREAD_LIBS@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = support/libmemcached.pc
TESTS_LDADDS = libmemcached/libmemcached.la \
libmemcached/libmemcachedutil.la libtest/libtest.la
-DEBUG_COMMAND = $(LIBTOOL) --mode=execute gdb
-PAHOLE_COMMAND = $(LIBTOOL) --mode=execute pahole
# Cycle should always run first
tests_cycle_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
tests_cycle_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
tests_cycle_SOURCES = tests/cycle.cc
-tests_cycle_DEPENDENCIES = $(TESTS_LDADDS)
-tests_cycle_LDADD = $(tests_cycle_DEPENDENCIES) ${PTHREAD_LIBS}
+tests_cycle_LDADD = $(TESTS_LDADDS) ${PTHREAD_LIBS}
# Test internals
-tests_libmemcached_1_0_internals_CXXFLAGS = $(AM_CXXFLAGS) \
- @PTHREAD_CFLAGS@ $(am__empty)
-tests_libmemcached_1_0_internals_DEPENDENCIES = \
- libmemcachedinternal/libmemcachedinternal.la \
- libtest/libtest.la \
- libmemcachedinternal/libmemcachedutilinternal.la
-tests_libmemcached_1_0_internals_LDADD = \
- libmemcachedinternal/libmemcachedinternal.la @PTHREAD_LIBS@ \
- libmemcachedinternal/libmemcachedutilinternal.la \
- libtest/libtest.la
-tests_libmemcached_1_0_internals_SOURCES = \
- tests/libmemcached-1.0/internals.cc \
- tests/libmemcached-1.0/string.cc
+@HAVE_DTRACE_FALSE@tests_libmemcached_1_0_internals_CXXFLAGS = \
+@HAVE_DTRACE_FALSE@ $(AM_CXXFLAGS) @PTHREAD_CFLAGS@
+@HAVE_DTRACE_FALSE@tests_libmemcached_1_0_internals_LDADD = libmemcachedinternal/libmemcachedinternal.la \
+@HAVE_DTRACE_FALSE@ @PTHREAD_LIBS@ \
+@HAVE_DTRACE_FALSE@ libmemcachedinternal/libmemcachedutilinternal.la \
+@HAVE_DTRACE_FALSE@ libtest/libtest.la
+@HAVE_DTRACE_FALSE@tests_libmemcached_1_0_internals_SOURCES = \
+@HAVE_DTRACE_FALSE@ tests/libmemcached-1.0/internals.cc \
+@HAVE_DTRACE_FALSE@ tests/libmemcached-1.0/string.cc
tests_libmemcached_1_0_testapp_CXXFLAGS = $(AM_CXXFLAGS) \
@PTHREAD_CFLAGS@ $(am__empty)
tests_libmemcached_1_0_testapp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) \
@@ -2288,13 +2288,9 @@
tests/libmemcached-1.0/setup_and_teardowns.cc \
tests/libmemcached-1.0/stat.cc tests/libmemcached-1.0/touch.cc \
tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_testapp_DEPENDENCIES = \
- libmemcached/libmemcached.la libtest/libtest.la \
- libhashkit/libhashkit.la libmemcached/libmemcachedutil.la
-tests_libmemcached_1_0_testapp_LDADD = @LIBUUID_LDFLAGS@ \
- @PTHREAD_LIBS@ libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la libtest/libtest.la \
- libhashkit/libhashkit.la
+tests_libmemcached_1_0_testapp_LDADD = @LIBUUID_LIB@ @PTHREAD_LIBS@ \
+ libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
+ libtest/libtest.la libhashkit/libhashkit.la
tests_libmemcached_1_0_testsocket_CXXFLAGS = @PTHREAD_CFLAGS@ \
$(AM_CXXFLAGS)
tests_libmemcached_1_0_testsocket_CFLAGS = $(AM_CFLAGS) \
@@ -2325,13 +2321,9 @@
tests/libmemcached-1.0/setup_and_teardowns.cc \
tests/libmemcached-1.0/stat.cc tests/libmemcached-1.0/touch.cc \
tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_testsocket_DEPENDENCIES = \
- libmemcached/libmemcached.la libtest/libtest.la \
- libhashkit/libhashkit.la libmemcached/libmemcachedutil.la
-tests_libmemcached_1_0_testsocket_LDADD = @LIBUUID_LDFLAGS@ \
- @PTHREAD_LIBS@ libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la libtest/libtest.la \
- libhashkit/libhashkit.la
+tests_libmemcached_1_0_testsocket_LDADD = @LIBUUID_LIB@ @PTHREAD_LIBS@ \
+ libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
+ libtest/libtest.la libhashkit/libhashkit.la
tests_libmemcached_1_0_sasl_SOURCES = tests/libmemcached-1.0/basic.cc \
tests/libmemcached-1.0/debug.cc \
tests/libmemcached-1.0/deprecated.cc \
@@ -2347,8 +2339,6 @@
tests/libmemcached-1.0/callback_counter.cc \
tests/libmemcached-1.0/fetch_all_results.cc \
tests/libmemcached-1.0/generate.cc
-tests_libmemcached_1_0_sasl_DEPENDENCIES = \
- libmemcached/libmemcached.la libtest/libtest.la
tests_libmemcached_1_0_sasl_LDADD = @PTHREAD_LIBS@ \
libmemcached/libmemcached.la libmemcached/libmemcachedutil.la \
libtest/libtest.la libhashkit/libhashkit.la
@@ -2362,8 +2352,7 @@
tests/libmemcached-1.0/fetch_all_results.cc \
tests/libmemcached-1.0/generate.cc \
tests/libmemcached-1.0/print.cc
-tests_atomsmasher_DEPENDENCIES = $(TESTS_LDADDS)
-tests_atomsmasher_LDADD = $(tests_atomsmasher_DEPENDENCIES)
+tests_atomsmasher_LDADD = $(TESTS_LDADDS)
tests_testudp_CFLAGS = $(AM_CFLAGS) $(NO_CONVERSION) \
$(NO_STRICT_ALIASING)
tests_testudp_SOURCES = clients/execute.cc clients/generator.cc \
@@ -2371,8 +2360,7 @@
tests/libmemcached-1.0/fetch_all_results.cc \
tests/libmemcached-1.0/generate.cc \
tests/libmemcached-1.0/print.cc tests/mem_udp.cc
-tests_testudp_DEPENDENCIES = $(TESTS_LDADDS)
-tests_testudp_LDADD = $(tests_testudp_DEPENDENCIES)
+tests_testudp_LDADD = $(TESTS_LDADDS)
tests_testplus_SOURCES = clients/execute.cc clients/generator.cc \
tests/libmemcached-1.0/callback_counter.cc \
tests/libmemcached-1.0/fetch_all_results.cc \
@@ -2380,12 +2368,10 @@
tests/libmemcached-1.0/plus.cpp \
tests/libmemcached-1.0/print.cc
tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES = $(TESTS_LDADDS)
-tests_testplus_LDADD = $(tests_testplus_DEPENDENCIES)
+tests_testplus_LDADD = $(TESTS_LDADDS)
tests_parser_SOURCES = tests/parser.cc
tests_parser_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_parser_DEPENDENCIES = $(TESTS_LDADDS)
-tests_parser_LDADD = $(tests_parser_DEPENDENCIES)
+tests_parser_LDADD = $(TESTS_LDADDS)
tests_failure_SOURCES = tests/failure.cc clients/execute.cc \
clients/generator.cc \
tests/libmemcached-1.0/callback_counter.cc \
@@ -2393,58 +2379,55 @@
tests/libmemcached-1.0/generate.cc \
tests/libmemcached-1.0/print.cc
tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
-tests_failure_DEPENDENCIES = $(TESTS_LDADDS)
-tests_failure_LDADD = $(tests_failure_DEPENDENCIES)
+tests_failure_LDADD = $(TESTS_LDADDS)
tests_testhashkit_SOURCES = tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)
+tests_testhashkit_LDADD = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
tests_hash_plus_SOURCES = tests/hash_plus.cc
tests_hash_plus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hash_plus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
-tests_hash_plus_LDADD = $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD = $(tests_testhashkit_LDADD)
tests_memcapable_SOURCES = tests/memcapable.cc
tests_memcapable_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcapable_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memcapable
+EXTRA_tests_memcapable_DEPENDENCIES = clients/memcapable
tests_memcapable_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memstat_SOURCES = tests/memstat.cc
tests_memstat_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memstat_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memstat
+EXTRA_tests_memstat_DEPENDENCIES = clients/memstat
tests_memstat_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memcp_SOURCES = tests/memcp.cc
tests_memcp_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcp_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memcp
+EXTRA_tests_memcp_DEPENDENCIES = clients/memcp
tests_memcp_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memflush_SOURCES = tests/memflush.cc
tests_memflush_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memflush_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memflush
+EXTRA_tests_memflush_DEPENDENCIES = clients/memflush
tests_memflush_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memrm_SOURCES = tests/memrm.cc
tests_memrm_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memrm_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memrm
+EXTRA_tests_memrm_DEPENDENCIES = clients/memrm
tests_memrm_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memexist_SOURCES = tests/memexist.cc
tests_memexist_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memexist_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memexist
+EXTRA_tests_memexist_DEPENDENCIES = clients/memexist
tests_memexist_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memtouch_SOURCES = tests/memtouch.cc
tests_memtouch_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memtouch_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memtouch
+EXTRA_tests_memtouch_DEPENDENCIES = clients/memtouch
tests_memtouch_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memcat_SOURCES = tests/memcat.cc
tests_memcat_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcat_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memcat
+EXTRA_tests_memcat_DEPENDENCIES = clients/memcat
tests_memcat_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memerror_SOURCES = tests/memerror.cc
tests_memerror_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memerror_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memerror
+EXTRA_tests_memerror_DEPENDENCIES = clients/memerror
tests_memerror_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memslap_SOURCES = tests/memslap.cc
tests_memslap_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memslap_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memslap
+EXTRA_tests_memslap_DEPENDENCIES = clients/memslap
tests_memslap_LDADD = libtest/libtest.la $(TESTS_LDADDS)
tests_memdump_SOURCES = tests/memdump.cc
tests_memdump_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memdump_DEPENDENCIES = libtest/libtest.la $(TESTS_LDADDS) clients/memdump
+EXTRA_tests_memdump_DEPENDENCIES = clients/memdump
tests_memdump_LDADD = libtest/libtest.la $(TESTS_LDADDS)
all: $(BUILT_SOURCES) mem_config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -2453,7 +2436,7 @@
.SUFFIXES: .d .c .cc .cpp .lo .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/libtest/include.am $(srcdir)/libhashkit-1.0/include.am $(srcdir)/libmemcached-1.0/include.am $(srcdir)/libmemcached-1.0/struct/include.am $(srcdir)/libmemcached-1.0/types/include.am $(srcdir)/libmemcached-1.0/t/include.am $(srcdir)/libmemcachedprotocol-0.0/include.am $(srcdir)/libmemcachedutil-1.0/include.am $(srcdir)/clients/include.am $(srcdir)/docs/include.am $(srcdir)/man/include.am $(srcdir)/example/include.am $(srcdir)/example/t/include.am $(srcdir)/libhashkit/include.am $(srcdir)/libmemcached/include.am $(srcdir)/libmemcached/csl/include.am $(srcdir)/libmemcachedutil/include.am $(srcdir)/libmemcachedprotocol/include.am $(srcdir)/libmemcachedinternal/include.am $(srcdir)/libmemcachedinternal/util/include.am $(srcdir)/poll/include.am $(srcdir)/rpm/include.am $(srcdir)/support/include.am $(srcdir)/tests/include.am $(srcdir)/tests/libmemcached-1.0/include.am $(srcdir)/tests/parser.am $(srcdir)/tests/cli.am $(srcdir)/util/include.am $(srcdir)/win32/include.am $(srcdir)/m4/include.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/libtest/include.am $(srcdir)/libhashkit-1.0/include.am $(srcdir)/libmemcached-1.0/include.am $(srcdir)/libmemcached-1.0/struct/include.am $(srcdir)/libmemcached-1.0/types/include.am $(srcdir)/libmemcached-1.0/t/include.am $(srcdir)/libmemcachedprotocol-0.0/include.am $(srcdir)/libmemcachedutil-1.0/include.am $(srcdir)/clients/include.am $(srcdir)/docs/include.am $(srcdir)/man/include.am $(srcdir)/example/include.am $(srcdir)/libhashkit/include.am $(srcdir)/libmemcached/include.am $(srcdir)/libmemcached/csl/include.am $(srcdir)/libmemcachedutil/include.am $(srcdir)/libmemcachedprotocol/include.am $(srcdir)/libmemcachedinternal/include.am $(srcdir)/libmemcachedinternal/util/include.am $(srcdir)/poll/include.am $(srcdir)/rpm/include.am $(srcdir)/support/include.am $(srcdir)/tests/include.am $(srcdir)/tests/libmemcached-1.0/include.am $(srcdir)/tests/parser.am $(srcdir)/tests/cli.am $(srcdir)/util/include.am $(srcdir)/win32/include.am $(srcdir)/m4/include.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -2476,7 +2459,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/libtest/include.am $(srcdir)/libhashkit-1.0/include.am $(srcdir)/libmemcached-1.0/include.am $(srcdir)/libmemcached-1.0/struct/include.am $(srcdir)/libmemcached-1.0/types/include.am $(srcdir)/libmemcached-1.0/t/include.am $(srcdir)/libmemcachedprotocol-0.0/include.am $(srcdir)/libmemcachedutil-1.0/include.am $(srcdir)/clients/include.am $(srcdir)/docs/include.am $(srcdir)/man/include.am $(srcdir)/example/include.am $(srcdir)/example/t/include.am $(srcdir)/libhashkit/include.am $(srcdir)/libmemcached/include.am $(srcdir)/libmemcached/csl/include.am $(srcdir)/libmemcachedutil/include.am $(srcdir)/libmemcachedprotocol/include.am $(srcdir)/libmemcachedinternal/include.am $(srcdir)/libmemcachedinternal/util/include.am $(srcdir)/poll/include.am $(srcdir)/rpm/include.am $(srcdir)/support/include.am $(srcdir)/tests/include.am $(srcdir)/tests/libmemcached-1.0/include.am $(srcdir)/tests/parser.am $(srcdir)/tests/cli.am $(srcdir)/util/include.am $(srcdir)/win32/include.am $(srcdir)/m4/include.am:
+$(srcdir)/libtest/include.am $(srcdir)/libhashkit-1.0/include.am $(srcdir)/libmemcached-1.0/include.am $(srcdir)/libmemcached-1.0/struct/include.am $(srcdir)/libmemcached-1.0/types/include.am $(srcdir)/libmemcached-1.0/t/include.am $(srcdir)/libmemcachedprotocol-0.0/include.am $(srcdir)/libmemcachedutil-1.0/include.am $(srcdir)/clients/include.am $(srcdir)/docs/include.am $(srcdir)/man/include.am $(srcdir)/example/include.am $(srcdir)/libhashkit/include.am $(srcdir)/libmemcached/include.am $(srcdir)/libmemcached/csl/include.am $(srcdir)/libmemcachedutil/include.am $(srcdir)/libmemcachedprotocol/include.am $(srcdir)/libmemcachedinternal/include.am $(srcdir)/libmemcachedinternal/util/include.am $(srcdir)/poll/include.am $(srcdir)/rpm/include.am $(srcdir)/support/include.am $(srcdir)/tests/include.am $(srcdir)/tests/libmemcached-1.0/include.am $(srcdir)/tests/parser.am $(srcdir)/tests/cli.am $(srcdir)/util/include.am $(srcdir)/win32/include.am $(srcdir)/m4/include.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -2501,10 +2484,14 @@
distclean-hdr:
-rm -f mem_config.h stamp-h1
+libhashkit/hashkitcon.h: $(top_builddir)/config.status $(top_srcdir)/libhashkit/hashkitcon.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
libhashkit-1.0/configure.h: $(top_builddir)/config.status $(top_srcdir)/libhashkit-1.0/configure.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libtest/version.h: $(top_builddir)/config.status $(top_srcdir)/libtest/version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+libtest/yatlcon.h: $(top_builddir)/config.status $(top_srcdir)/libtest/yatlcon.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
docs/conf.py: $(top_builddir)/config.status $(top_srcdir)/docs/conf.py.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libmemcached-1.0/configure.h: $(top_builddir)/config.status $(top_srcdir)/libmemcached-1.0/configure.h.in
@@ -2615,6 +2602,12 @@
libhashkit/libhashkit_libhashkit_la-murmur.lo: \
libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libhashkit_libhashkit_la-murmur3.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libhashkit_libhashkit_la-murmur3_api.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
libhashkit/libhashkit_libhashkit_la-one_at_a_time.lo: \
libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
@@ -2638,49 +2631,77 @@
libhashkit/$(DEPDIR)/$(am__dirstamp)
libhashkit/libhashkit.la: $(libhashkit_libhashkit_la_OBJECTS) $(libhashkit_libhashkit_la_DEPENDENCIES) $(EXTRA_libhashkit_libhashkit_la_DEPENDENCIES) libhashkit/$(am__dirstamp)
$(AM_V_CXXLD)$(libhashkit_libhashkit_la_LINK) -rpath $(libdir) $(libhashkit_libhashkit_la_OBJECTS) $(libhashkit_libhashkit_la_LIBADD) $(LIBS)
-libhashkit/aes.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-aes.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libhashkit_libhashkitinc_la-algorithm.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/algorithm.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-behavior.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/behavior.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-crc32.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/crc32.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-digest.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/digest.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-encrypt.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/encrypt.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/fnv_32.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/fnv_64.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-function.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/function.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-has.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/has.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-hashkit.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/hashkit.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-jenkins.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/jenkins.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-ketama.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/ketama.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-md5.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/md5.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-murmur.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/murmur.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-murmur3.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/one_at_a_time.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/rijndael.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/str_algorithm.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-rijndael.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/strerror.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/string.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-strerror.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/hsieh.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-string.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
-libhashkit/nohsieh.lo: libhashkit/$(am__dirstamp) \
+libhashkit/libhashkit_libhashkitinc_la-hsieh.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo: \
+ libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
libhashkit/libhashkitinc.la: $(libhashkit_libhashkitinc_la_OBJECTS) $(libhashkit_libhashkitinc_la_DEPENDENCIES) $(EXTRA_libhashkit_libhashkitinc_la_DEPENDENCIES) libhashkit/$(am__dirstamp)
$(AM_V_CXXLD)$(libhashkit_libhashkitinc_la_LINK) $(libhashkit_libhashkitinc_la_OBJECTS) $(libhashkit_libhashkitinc_la_LIBADD) $(LIBS)
@@ -2753,6 +2774,12 @@
libhashkit/libmemcached_libmemcached_la-murmur.lo: \
libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libmemcached_libmemcached_la-murmur3.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libmemcached_libmemcached_la-murmur3_api.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
libhashkit/libmemcached_libmemcached_la-one_at_a_time.lo: \
libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
@@ -3028,6 +3055,12 @@
libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur.lo: \
libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
+libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo: \
+ libhashkit/$(am__dirstamp) \
+ libhashkit/$(DEPDIR)/$(am__dirstamp)
libhashkit/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.lo: \
libhashkit/$(am__dirstamp) \
libhashkit/$(DEPDIR)/$(am__dirstamp)
@@ -3259,6 +3292,8 @@
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-port.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
+libtest/libtest_libtest_la-result.lo: libtest/$(am__dirstamp) \
+ libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-runner.lo: libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/libtest_libtest_la-server.lo: libtest/$(am__dirstamp) \
@@ -3474,32 +3509,6 @@
example/memcached_light$(EXEEXT): $(example_memcached_light_OBJECTS) $(example_memcached_light_DEPENDENCIES) $(EXTRA_example_memcached_light_DEPENDENCIES) example/$(am__dirstamp)
@rm -f example/memcached_light$(EXEEXT)
$(AM_V_CXXLD)$(example_memcached_light_LINK) $(example_memcached_light_OBJECTS) $(example_memcached_light_LDADD) $(LIBS)
-example/t/$(am__dirstamp):
- @$(MKDIR_P) example/t
- @: > example/t/$(am__dirstamp)
-example/t/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) example/t/$(DEPDIR)
- @: > example/t/$(DEPDIR)/$(am__dirstamp)
-example/t/example_t_memcached_light-memcached_light.$(OBJEXT): \
- example/t/$(am__dirstamp) example/t/$(DEPDIR)/$(am__dirstamp)
-tests/libmemcached-1.0/$(am__dirstamp):
- @$(MKDIR_P) tests/libmemcached-1.0
- @: > tests/libmemcached-1.0/$(am__dirstamp)
-tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) tests/libmemcached-1.0/$(DEPDIR)
- @: > tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-tests/libmemcached-1.0/example_t_memcached_light-memcached_get.$(OBJEXT): \
- tests/libmemcached-1.0/$(am__dirstamp) \
- tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-tests/libmemcached-1.0/example_t_memcached_light-print.$(OBJEXT): \
- tests/libmemcached-1.0/$(am__dirstamp) \
- tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.$(OBJEXT): \
- tests/libmemcached-1.0/$(am__dirstamp) \
- tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
-example/t/memcached_light$(EXEEXT): $(example_t_memcached_light_OBJECTS) $(example_t_memcached_light_DEPENDENCIES) $(EXTRA_example_t_memcached_light_DEPENDENCIES) example/t/$(am__dirstamp)
- @rm -f example/t/memcached_light$(EXEEXT)
- $(AM_V_CXXLD)$(example_t_memcached_light_LINK) $(example_t_memcached_light_OBJECTS) $(example_t_memcached_light_LDADD) $(LIBS)
libmemcached-1.0/t/$(am__dirstamp):
@$(MKDIR_P) libmemcached-1.0/t
@: > libmemcached-1.0/t/$(am__dirstamp)
@@ -3529,6 +3538,13 @@
libtest/abort$(EXEEXT): $(libtest_abort_OBJECTS) $(libtest_abort_DEPENDENCIES) $(EXTRA_libtest_abort_DEPENDENCIES) libtest/$(am__dirstamp)
@rm -f libtest/abort$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(libtest_abort_OBJECTS) $(libtest_abort_LDADD) $(LIBS)
+libtest/backtrace_test.$(OBJEXT): libtest/$(am__dirstamp) \
+ libtest/$(DEPDIR)/$(am__dirstamp)
+libmemcached/backtrace.$(OBJEXT): libmemcached/$(am__dirstamp) \
+ libmemcached/$(DEPDIR)/$(am__dirstamp)
+libtest/backtrace$(EXEEXT): $(libtest_backtrace_OBJECTS) $(libtest_backtrace_DEPENDENCIES) $(EXTRA_libtest_backtrace_DEPENDENCIES) libtest/$(am__dirstamp)
+ @rm -f libtest/backtrace$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(libtest_backtrace_OBJECTS) $(libtest_backtrace_LDADD) $(LIBS)
libtest/cpu.$(OBJEXT): libtest/$(am__dirstamp) \
libtest/$(DEPDIR)/$(am__dirstamp)
libtest/core_count.$(OBJEXT): libtest/$(am__dirstamp) \
@@ -3553,6 +3569,12 @@
libtest/wait$(EXEEXT): $(libtest_wait_OBJECTS) $(libtest_wait_DEPENDENCIES) $(EXTRA_libtest_wait_DEPENDENCIES) libtest/$(am__dirstamp)
@rm -f libtest/wait$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(libtest_wait_OBJECTS) $(libtest_wait_LDADD) $(LIBS)
+tests/libmemcached-1.0/$(am__dirstamp):
+ @$(MKDIR_P) tests/libmemcached-1.0
+ @: > tests/libmemcached-1.0/$(am__dirstamp)
+tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) tests/libmemcached-1.0/$(DEPDIR)
+ @: > tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
tests/libmemcached-1.0/atomsmasher.$(OBJEXT): \
tests/libmemcached-1.0/$(am__dirstamp) \
tests/libmemcached-1.0/$(DEPDIR)/$(am__dirstamp)
@@ -3978,35 +4000,6 @@
-rm -f example/interface_v1.$(OBJEXT)
-rm -f example/memcached_light.$(OBJEXT)
-rm -f example/storage.$(OBJEXT)
- -rm -f example/t/example_t_memcached_light-memcached_light.$(OBJEXT)
- -rm -f libhashkit/aes.$(OBJEXT)
- -rm -f libhashkit/aes.lo
- -rm -f libhashkit/algorithm.$(OBJEXT)
- -rm -f libhashkit/algorithm.lo
- -rm -f libhashkit/behavior.$(OBJEXT)
- -rm -f libhashkit/behavior.lo
- -rm -f libhashkit/crc32.$(OBJEXT)
- -rm -f libhashkit/crc32.lo
- -rm -f libhashkit/digest.$(OBJEXT)
- -rm -f libhashkit/digest.lo
- -rm -f libhashkit/encrypt.$(OBJEXT)
- -rm -f libhashkit/encrypt.lo
- -rm -f libhashkit/fnv_32.$(OBJEXT)
- -rm -f libhashkit/fnv_32.lo
- -rm -f libhashkit/fnv_64.$(OBJEXT)
- -rm -f libhashkit/fnv_64.lo
- -rm -f libhashkit/function.$(OBJEXT)
- -rm -f libhashkit/function.lo
- -rm -f libhashkit/has.$(OBJEXT)
- -rm -f libhashkit/has.lo
- -rm -f libhashkit/hashkit.$(OBJEXT)
- -rm -f libhashkit/hashkit.lo
- -rm -f libhashkit/hsieh.$(OBJEXT)
- -rm -f libhashkit/hsieh.lo
- -rm -f libhashkit/jenkins.$(OBJEXT)
- -rm -f libhashkit/jenkins.lo
- -rm -f libhashkit/ketama.$(OBJEXT)
- -rm -f libhashkit/ketama.lo
-rm -f libhashkit/libhashkit_libhashkit_la-aes.$(OBJEXT)
-rm -f libhashkit/libhashkit_libhashkit_la-aes.lo
-rm -f libhashkit/libhashkit_libhashkit_la-algorithm.$(OBJEXT)
@@ -4039,6 +4032,10 @@
-rm -f libhashkit/libhashkit_libhashkit_la-md5.lo
-rm -f libhashkit/libhashkit_libhashkit_la-murmur.$(OBJEXT)
-rm -f libhashkit/libhashkit_libhashkit_la-murmur.lo
+ -rm -f libhashkit/libhashkit_libhashkit_la-murmur3.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkit_la-murmur3.lo
+ -rm -f libhashkit/libhashkit_libhashkit_la-murmur3_api.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkit_la-murmur3_api.lo
-rm -f libhashkit/libhashkit_libhashkit_la-nohsieh.$(OBJEXT)
-rm -f libhashkit/libhashkit_libhashkit_la-nohsieh.lo
-rm -f libhashkit/libhashkit_libhashkit_la-one_at_a_time.$(OBJEXT)
@@ -4051,6 +4048,54 @@
-rm -f libhashkit/libhashkit_libhashkit_la-strerror.lo
-rm -f libhashkit/libhashkit_libhashkit_la-string.$(OBJEXT)
-rm -f libhashkit/libhashkit_libhashkit_la-string.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-aes.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-aes.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-algorithm.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-algorithm.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-behavior.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-behavior.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-crc32.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-crc32.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-digest.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-digest.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-encrypt.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-encrypt.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-fnv_32.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-fnv_64.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-function.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-function.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-has.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-has.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-hashkit.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-hashkit.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-hsieh.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-hsieh.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-jenkins.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-jenkins.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-ketama.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-ketama.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-md5.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-md5.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-murmur.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-murmur.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-murmur3.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-murmur3.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-murmur3_api.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-nohsieh.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-rijndael.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-rijndael.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-str_algorithm.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-strerror.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-strerror.lo
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-string.$(OBJEXT)
+ -rm -f libhashkit/libhashkit_libhashkitinc_la-string.lo
-rm -f libhashkit/libmemcached_libmemcached_la-aes.$(OBJEXT)
-rm -f libhashkit/libmemcached_libmemcached_la-aes.lo
-rm -f libhashkit/libmemcached_libmemcached_la-algorithm.$(OBJEXT)
@@ -4083,6 +4128,10 @@
-rm -f libhashkit/libmemcached_libmemcached_la-md5.lo
-rm -f libhashkit/libmemcached_libmemcached_la-murmur.$(OBJEXT)
-rm -f libhashkit/libmemcached_libmemcached_la-murmur.lo
+ -rm -f libhashkit/libmemcached_libmemcached_la-murmur3.$(OBJEXT)
+ -rm -f libhashkit/libmemcached_libmemcached_la-murmur3.lo
+ -rm -f libhashkit/libmemcached_libmemcached_la-murmur3_api.$(OBJEXT)
+ -rm -f libhashkit/libmemcached_libmemcached_la-murmur3_api.lo
-rm -f libhashkit/libmemcached_libmemcached_la-nohsieh.$(OBJEXT)
-rm -f libhashkit/libmemcached_libmemcached_la-nohsieh.lo
-rm -f libhashkit/libmemcached_libmemcached_la-one_at_a_time.$(OBJEXT)
@@ -4127,6 +4176,10 @@
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-md5.lo
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur.$(OBJEXT)
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur.lo
+ -rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.$(OBJEXT)
+ -rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo
+ -rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.$(OBJEXT)
+ -rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-nohsieh.$(OBJEXT)
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-nohsieh.lo
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.$(OBJEXT)
@@ -4139,25 +4192,10 @@
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-strerror.lo
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-string.$(OBJEXT)
-rm -f libhashkit/libmemcachedinternal_libmemcachedinternal_la-string.lo
- -rm -f libhashkit/md5.$(OBJEXT)
- -rm -f libhashkit/md5.lo
- -rm -f libhashkit/murmur.$(OBJEXT)
- -rm -f libhashkit/murmur.lo
- -rm -f libhashkit/nohsieh.$(OBJEXT)
- -rm -f libhashkit/nohsieh.lo
- -rm -f libhashkit/one_at_a_time.$(OBJEXT)
- -rm -f libhashkit/one_at_a_time.lo
- -rm -f libhashkit/rijndael.$(OBJEXT)
- -rm -f libhashkit/rijndael.lo
- -rm -f libhashkit/str_algorithm.$(OBJEXT)
- -rm -f libhashkit/str_algorithm.lo
- -rm -f libhashkit/strerror.$(OBJEXT)
- -rm -f libhashkit/strerror.lo
- -rm -f libhashkit/string.$(OBJEXT)
- -rm -f libhashkit/string.lo
-rm -f libmemcached-1.0/t/c_sasl_test.$(OBJEXT)
-rm -f libmemcached-1.0/t/c_test.$(OBJEXT)
-rm -f libmemcached-1.0/t/cc_test.$(OBJEXT)
+ -rm -f libmemcached/backtrace.$(OBJEXT)
-rm -f libmemcached/byteorder.$(OBJEXT)
-rm -f libmemcached/csl/libmemcached_libmemcached_la-context.$(OBJEXT)
-rm -f libmemcached/csl/libmemcached_libmemcached_la-context.lo
@@ -4392,6 +4430,7 @@
-rm -f libmemcachedutil/libmemcachedinternal_libmemcachedutilinternal_la-version.$(OBJEXT)
-rm -f libmemcachedutil/libmemcachedinternal_libmemcachedutilinternal_la-version.lo
-rm -f libtest/abort.$(OBJEXT)
+ -rm -f libtest/backtrace_test.$(OBJEXT)
-rm -f libtest/core_count.$(OBJEXT)
-rm -f libtest/cpu.$(OBJEXT)
-rm -f libtest/dream.$(OBJEXT)
@@ -4443,6 +4482,8 @@
-rm -f libtest/libtest_libtest_la-memcached.lo
-rm -f libtest/libtest_libtest_la-port.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-port.lo
+ -rm -f libtest/libtest_libtest_la-result.$(OBJEXT)
+ -rm -f libtest/libtest_libtest_la-result.lo
-rm -f libtest/libtest_libtest_la-runner.$(OBJEXT)
-rm -f libtest/libtest_libtest_la-runner.lo
-rm -f libtest/libtest_libtest_la-server.$(OBJEXT)
@@ -4472,9 +4513,6 @@
-rm -f tests/libmemcached-1.0/atomsmasher.$(OBJEXT)
-rm -f tests/libmemcached-1.0/callback_counter.$(OBJEXT)
-rm -f tests/libmemcached-1.0/debug.$(OBJEXT)
- -rm -f tests/libmemcached-1.0/example_t_memcached_light-memcached_get.$(OBJEXT)
- -rm -f tests/libmemcached-1.0/example_t_memcached_light-print.$(OBJEXT)
- -rm -f tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.$(OBJEXT)
-rm -f tests/libmemcached-1.0/fetch_all_results.$(OBJEXT)
-rm -f tests/libmemcached-1.0/generate.$(OBJEXT)
-rm -f tests/libmemcached-1.0/print.$(OBJEXT)
@@ -4622,21 +4660,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@example/$(DEPDIR)/interface_v1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@example/$(DEPDIR)/memcached_light.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@example/$(DEPDIR)/storage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/aes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/algorithm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/behavior.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/crc32.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/digest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/encrypt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/fnv_32.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/fnv_64.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/function.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/has.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/hashkit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/hsieh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/jenkins.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/ketama.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-aes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-algorithm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-behavior.Plo@am__quote@
@@ -4653,12 +4676,38 @@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-ketama.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-md5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3_api.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-nohsieh.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-one_at_a_time.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-rijndael.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-str_algorithm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-strerror.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-string.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-aes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-algorithm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-behavior.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-crc32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-digest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-encrypt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_64.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-function.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-has.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hashkit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hsieh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-jenkins.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-ketama.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-md5.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3_api.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-nohsieh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-one_at_a_time.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-rijndael.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-str_algorithm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-strerror.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-string.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-aes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-algorithm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-behavior.Plo@am__quote@
@@ -4675,6 +4724,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-ketama.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-md5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3_api.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-nohsieh.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-one_at_a_time.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-rijndael.Plo@am__quote@
@@ -4697,23 +4748,18 @@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-ketama.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-md5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-nohsieh.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-rijndael.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-str_algorithm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-strerror.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-string.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/md5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/murmur.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/nohsieh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/one_at_a_time.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/rijndael.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/str_algorithm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/strerror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libhashkit/$(DEPDIR)/string.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcached-1.0/t/$(DEPDIR)/c_sasl_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcached-1.0/t/$(DEPDIR)/c_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcached-1.0/t/$(DEPDIR)/cc_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libmemcached/$(DEPDIR)/backtrace.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcached/$(DEPDIR)/byteorder.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcached/$(DEPDIR)/libmemcached_libmemcached_la-allocators.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcached/$(DEPDIR)/libmemcached_libmemcached_la-analyze.Plo@am__quote@
@@ -4832,6 +4878,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcachedutil/$(DEPDIR)/libmemcachedinternal_libmemcachedutilinternal_la-pool.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmemcachedutil/$(DEPDIR)/libmemcachedinternal_libmemcachedutilinternal_la-version.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/abort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/backtrace_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/core_count.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/cpu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/dream.Po@am__quote@
@@ -4859,6 +4906,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-memcached.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-port.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-result.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-runner.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-server.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libtest/$(DEPDIR)/libtest_libtest_la-server_container.Plo@am__quote@
@@ -4893,9 +4941,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/atomsmasher.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/callback_counter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/fetch_all_results.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/generate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/libmemcached-1.0/$(DEPDIR)/print.Po@am__quote@
@@ -5212,6 +5257,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkit_la-murmur.lo `test -f 'libhashkit/murmur.cc' || echo '$(srcdir)/'`libhashkit/murmur.cc
+libhashkit/libhashkit_libhashkit_la-murmur3.lo: libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkit_la-murmur3.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3.Tpo -c -o libhashkit/libhashkit_libhashkit_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3.cc' object='libhashkit/libhashkit_libhashkit_la-murmur3.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkit_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+
+libhashkit/libhashkit_libhashkit_la-murmur3_api.lo: libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkit_la-murmur3_api.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3_api.Tpo -c -o libhashkit/libhashkit_libhashkit_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3_api.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-murmur3_api.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3_api.cc' object='libhashkit/libhashkit_libhashkit_la-murmur3_api.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkit_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+
libhashkit/libhashkit_libhashkit_la-one_at_a_time.lo: libhashkit/one_at_a_time.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkit_la-one_at_a_time.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-one_at_a_time.Tpo -c -o libhashkit/libhashkit_libhashkit_la-one_at_a_time.lo `test -f 'libhashkit/one_at_a_time.cc' || echo '$(srcdir)/'`libhashkit/one_at_a_time.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-one_at_a_time.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkit_la-one_at_a_time.Plo
@@ -5261,6 +5320,174 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkit_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkit_la-nohsieh.lo `test -f 'libhashkit/nohsieh.cc' || echo '$(srcdir)/'`libhashkit/nohsieh.cc
+libhashkit/libhashkit_libhashkitinc_la-aes.lo: libhashkit/aes.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-aes.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-aes.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-aes.lo `test -f 'libhashkit/aes.cc' || echo '$(srcdir)/'`libhashkit/aes.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-aes.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-aes.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/aes.cc' object='libhashkit/libhashkit_libhashkitinc_la-aes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-aes.lo `test -f 'libhashkit/aes.cc' || echo '$(srcdir)/'`libhashkit/aes.cc
+
+libhashkit/libhashkit_libhashkitinc_la-algorithm.lo: libhashkit/algorithm.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-algorithm.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-algorithm.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-algorithm.lo `test -f 'libhashkit/algorithm.cc' || echo '$(srcdir)/'`libhashkit/algorithm.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-algorithm.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-algorithm.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/algorithm.cc' object='libhashkit/libhashkit_libhashkitinc_la-algorithm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-algorithm.lo `test -f 'libhashkit/algorithm.cc' || echo '$(srcdir)/'`libhashkit/algorithm.cc
+
+libhashkit/libhashkit_libhashkitinc_la-behavior.lo: libhashkit/behavior.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-behavior.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-behavior.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-behavior.lo `test -f 'libhashkit/behavior.cc' || echo '$(srcdir)/'`libhashkit/behavior.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-behavior.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-behavior.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/behavior.cc' object='libhashkit/libhashkit_libhashkitinc_la-behavior.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-behavior.lo `test -f 'libhashkit/behavior.cc' || echo '$(srcdir)/'`libhashkit/behavior.cc
+
+libhashkit/libhashkit_libhashkitinc_la-crc32.lo: libhashkit/crc32.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-crc32.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-crc32.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-crc32.lo `test -f 'libhashkit/crc32.cc' || echo '$(srcdir)/'`libhashkit/crc32.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-crc32.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-crc32.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/crc32.cc' object='libhashkit/libhashkit_libhashkitinc_la-crc32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-crc32.lo `test -f 'libhashkit/crc32.cc' || echo '$(srcdir)/'`libhashkit/crc32.cc
+
+libhashkit/libhashkit_libhashkitinc_la-digest.lo: libhashkit/digest.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-digest.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-digest.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-digest.lo `test -f 'libhashkit/digest.cc' || echo '$(srcdir)/'`libhashkit/digest.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-digest.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-digest.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/digest.cc' object='libhashkit/libhashkit_libhashkitinc_la-digest.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-digest.lo `test -f 'libhashkit/digest.cc' || echo '$(srcdir)/'`libhashkit/digest.cc
+
+libhashkit/libhashkit_libhashkitinc_la-encrypt.lo: libhashkit/encrypt.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-encrypt.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-encrypt.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-encrypt.lo `test -f 'libhashkit/encrypt.cc' || echo '$(srcdir)/'`libhashkit/encrypt.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-encrypt.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-encrypt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/encrypt.cc' object='libhashkit/libhashkit_libhashkitinc_la-encrypt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-encrypt.lo `test -f 'libhashkit/encrypt.cc' || echo '$(srcdir)/'`libhashkit/encrypt.cc
+
+libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo: libhashkit/fnv_32.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_32.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo `test -f 'libhashkit/fnv_32.cc' || echo '$(srcdir)/'`libhashkit/fnv_32.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_32.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_32.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/fnv_32.cc' object='libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-fnv_32.lo `test -f 'libhashkit/fnv_32.cc' || echo '$(srcdir)/'`libhashkit/fnv_32.cc
+
+libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo: libhashkit/fnv_64.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_64.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo `test -f 'libhashkit/fnv_64.cc' || echo '$(srcdir)/'`libhashkit/fnv_64.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_64.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-fnv_64.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/fnv_64.cc' object='libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-fnv_64.lo `test -f 'libhashkit/fnv_64.cc' || echo '$(srcdir)/'`libhashkit/fnv_64.cc
+
+libhashkit/libhashkit_libhashkitinc_la-function.lo: libhashkit/function.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-function.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-function.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-function.lo `test -f 'libhashkit/function.cc' || echo '$(srcdir)/'`libhashkit/function.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-function.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-function.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/function.cc' object='libhashkit/libhashkit_libhashkitinc_la-function.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-function.lo `test -f 'libhashkit/function.cc' || echo '$(srcdir)/'`libhashkit/function.cc
+
+libhashkit/libhashkit_libhashkitinc_la-has.lo: libhashkit/has.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-has.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-has.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-has.lo `test -f 'libhashkit/has.cc' || echo '$(srcdir)/'`libhashkit/has.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-has.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-has.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/has.cc' object='libhashkit/libhashkit_libhashkitinc_la-has.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-has.lo `test -f 'libhashkit/has.cc' || echo '$(srcdir)/'`libhashkit/has.cc
+
+libhashkit/libhashkit_libhashkitinc_la-hashkit.lo: libhashkit/hashkit.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-hashkit.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hashkit.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-hashkit.lo `test -f 'libhashkit/hashkit.cc' || echo '$(srcdir)/'`libhashkit/hashkit.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hashkit.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hashkit.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/hashkit.cc' object='libhashkit/libhashkit_libhashkitinc_la-hashkit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-hashkit.lo `test -f 'libhashkit/hashkit.cc' || echo '$(srcdir)/'`libhashkit/hashkit.cc
+
+libhashkit/libhashkit_libhashkitinc_la-jenkins.lo: libhashkit/jenkins.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-jenkins.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-jenkins.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-jenkins.lo `test -f 'libhashkit/jenkins.cc' || echo '$(srcdir)/'`libhashkit/jenkins.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-jenkins.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-jenkins.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/jenkins.cc' object='libhashkit/libhashkit_libhashkitinc_la-jenkins.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-jenkins.lo `test -f 'libhashkit/jenkins.cc' || echo '$(srcdir)/'`libhashkit/jenkins.cc
+
+libhashkit/libhashkit_libhashkitinc_la-ketama.lo: libhashkit/ketama.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-ketama.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-ketama.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-ketama.lo `test -f 'libhashkit/ketama.cc' || echo '$(srcdir)/'`libhashkit/ketama.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-ketama.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-ketama.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/ketama.cc' object='libhashkit/libhashkit_libhashkitinc_la-ketama.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-ketama.lo `test -f 'libhashkit/ketama.cc' || echo '$(srcdir)/'`libhashkit/ketama.cc
+
+libhashkit/libhashkit_libhashkitinc_la-md5.lo: libhashkit/md5.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-md5.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-md5.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-md5.lo `test -f 'libhashkit/md5.cc' || echo '$(srcdir)/'`libhashkit/md5.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-md5.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-md5.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/md5.cc' object='libhashkit/libhashkit_libhashkitinc_la-md5.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-md5.lo `test -f 'libhashkit/md5.cc' || echo '$(srcdir)/'`libhashkit/md5.cc
+
+libhashkit/libhashkit_libhashkitinc_la-murmur.lo: libhashkit/murmur.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-murmur.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-murmur.lo `test -f 'libhashkit/murmur.cc' || echo '$(srcdir)/'`libhashkit/murmur.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur.cc' object='libhashkit/libhashkit_libhashkitinc_la-murmur.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-murmur.lo `test -f 'libhashkit/murmur.cc' || echo '$(srcdir)/'`libhashkit/murmur.cc
+
+libhashkit/libhashkit_libhashkitinc_la-murmur3.lo: libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-murmur3.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3.cc' object='libhashkit/libhashkit_libhashkitinc_la-murmur3.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+
+libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo: libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3_api.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3_api.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-murmur3_api.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3_api.cc' object='libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+
+libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo: libhashkit/one_at_a_time.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-one_at_a_time.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo `test -f 'libhashkit/one_at_a_time.cc' || echo '$(srcdir)/'`libhashkit/one_at_a_time.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-one_at_a_time.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-one_at_a_time.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/one_at_a_time.cc' object='libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-one_at_a_time.lo `test -f 'libhashkit/one_at_a_time.cc' || echo '$(srcdir)/'`libhashkit/one_at_a_time.cc
+
+libhashkit/libhashkit_libhashkitinc_la-rijndael.lo: libhashkit/rijndael.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-rijndael.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-rijndael.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-rijndael.lo `test -f 'libhashkit/rijndael.cc' || echo '$(srcdir)/'`libhashkit/rijndael.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-rijndael.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-rijndael.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/rijndael.cc' object='libhashkit/libhashkit_libhashkitinc_la-rijndael.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-rijndael.lo `test -f 'libhashkit/rijndael.cc' || echo '$(srcdir)/'`libhashkit/rijndael.cc
+
+libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo: libhashkit/str_algorithm.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-str_algorithm.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo `test -f 'libhashkit/str_algorithm.cc' || echo '$(srcdir)/'`libhashkit/str_algorithm.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-str_algorithm.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-str_algorithm.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/str_algorithm.cc' object='libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-str_algorithm.lo `test -f 'libhashkit/str_algorithm.cc' || echo '$(srcdir)/'`libhashkit/str_algorithm.cc
+
+libhashkit/libhashkit_libhashkitinc_la-strerror.lo: libhashkit/strerror.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-strerror.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-strerror.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-strerror.lo `test -f 'libhashkit/strerror.cc' || echo '$(srcdir)/'`libhashkit/strerror.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-strerror.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-strerror.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/strerror.cc' object='libhashkit/libhashkit_libhashkitinc_la-strerror.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-strerror.lo `test -f 'libhashkit/strerror.cc' || echo '$(srcdir)/'`libhashkit/strerror.cc
+
+libhashkit/libhashkit_libhashkitinc_la-string.lo: libhashkit/string.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-string.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-string.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-string.lo `test -f 'libhashkit/string.cc' || echo '$(srcdir)/'`libhashkit/string.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-string.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-string.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/string.cc' object='libhashkit/libhashkit_libhashkitinc_la-string.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-string.lo `test -f 'libhashkit/string.cc' || echo '$(srcdir)/'`libhashkit/string.cc
+
+libhashkit/libhashkit_libhashkitinc_la-hsieh.lo: libhashkit/hsieh.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-hsieh.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hsieh.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-hsieh.lo `test -f 'libhashkit/hsieh.cc' || echo '$(srcdir)/'`libhashkit/hsieh.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hsieh.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-hsieh.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/hsieh.cc' object='libhashkit/libhashkit_libhashkitinc_la-hsieh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-hsieh.lo `test -f 'libhashkit/hsieh.cc' || echo '$(srcdir)/'`libhashkit/hsieh.cc
+
+libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo: libhashkit/nohsieh.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo -MD -MP -MF libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-nohsieh.Tpo -c -o libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo `test -f 'libhashkit/nohsieh.cc' || echo '$(srcdir)/'`libhashkit/nohsieh.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-nohsieh.Tpo libhashkit/$(DEPDIR)/libhashkit_libhashkitinc_la-nohsieh.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/nohsieh.cc' object='libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhashkit_libhashkitinc_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libhashkit_libhashkitinc_la-nohsieh.lo `test -f 'libhashkit/nohsieh.cc' || echo '$(srcdir)/'`libhashkit/nohsieh.cc
+
libmemcached/csl/libmemcached_libmemcached_la-context.lo: libmemcached/csl/context.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -MT libmemcached/csl/libmemcached_libmemcached_la-context.lo -MD -MP -MF libmemcached/csl/$(DEPDIR)/libmemcached_libmemcached_la-context.Tpo -c -o libmemcached/csl/libmemcached_libmemcached_la-context.lo `test -f 'libmemcached/csl/context.cc' || echo '$(srcdir)/'`libmemcached/csl/context.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libmemcached/csl/$(DEPDIR)/libmemcached_libmemcached_la-context.Tpo libmemcached/csl/$(DEPDIR)/libmemcached_libmemcached_la-context.Plo
@@ -5394,6 +5621,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libmemcached_libmemcached_la-murmur.lo `test -f 'libhashkit/murmur.cc' || echo '$(srcdir)/'`libhashkit/murmur.cc
+libhashkit/libmemcached_libmemcached_la-murmur3.lo: libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libmemcached_libmemcached_la-murmur3.lo -MD -MP -MF libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3.Tpo -c -o libhashkit/libmemcached_libmemcached_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3.Tpo libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3.cc' object='libhashkit/libmemcached_libmemcached_la-murmur3.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libmemcached_libmemcached_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+
+libhashkit/libmemcached_libmemcached_la-murmur3_api.lo: libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libmemcached_libmemcached_la-murmur3_api.lo -MD -MP -MF libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3_api.Tpo -c -o libhashkit/libmemcached_libmemcached_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3_api.Tpo libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-murmur3_api.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3_api.cc' object='libhashkit/libmemcached_libmemcached_la-murmur3_api.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libmemcached_libmemcached_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+
libhashkit/libmemcached_libmemcached_la-one_at_a_time.lo: libhashkit/one_at_a_time.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmemcached_libmemcached_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libmemcached_libmemcached_la-one_at_a_time.lo -MD -MP -MF libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-one_at_a_time.Tpo -c -o libhashkit/libmemcached_libmemcached_la-one_at_a_time.lo `test -f 'libhashkit/one_at_a_time.cc' || echo '$(srcdir)/'`libhashkit/one_at_a_time.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-one_at_a_time.Tpo libhashkit/$(DEPDIR)/libmemcached_libmemcached_la-one_at_a_time.Plo
@@ -5926,6 +6167,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS) $(CPPFLAGS) $(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur.lo `test -f 'libhashkit/murmur.cc' || echo '$(srcdir)/'`libhashkit/murmur.cc
+libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo: libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS) $(CPPFLAGS) $(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo -MD -MP -MF libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3.Tpo -c -o libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3.Tpo libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3.cc' object='libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS) $(CPPFLAGS) $(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3.lo `test -f 'libhashkit/murmur3.cc' || echo '$(srcdir)/'`libhashkit/murmur3.cc
+
+libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo: libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS) $(CPPFLAGS) $(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo -MD -MP -MF libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.Tpo -c -o libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.Tpo libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libhashkit/murmur3_api.cc' object='libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS) $(CPPFLAGS) $(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) $(CXXFLAGS) -c -o libhashkit/libmemcachedinternal_libmemcachedinternal_la-murmur3_api.lo `test -f 'libhashkit/murmur3_api.cc' || echo '$(srcdir)/'`libhashkit/murmur3_api.cc
+
libhashkit/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.lo: libhashkit/one_at_a_time.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmemcachedinternal_libmemcachedinternal_la_CPPFLAGS) $(CPPFLAGS) $(libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS) $(CXXFLAGS) -MT libhashkit/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.lo -MD -MP -MF libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.Tpo -c -o libhashkit/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.lo `test -f 'libhashkit/one_at_a_time.cc' || echo '$(srcdir)/'`libhashkit/one_at_a_time.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.Tpo libhashkit/$(DEPDIR)/libmemcachedinternal_libmemcachedinternal_la-one_at_a_time.Plo
@@ -6465,6 +6720,13 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-port.lo `test -f 'libtest/port.cc' || echo '$(srcdir)/'`libtest/port.cc
+libtest/libtest_libtest_la-result.lo: libtest/result.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-result.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-result.Tpo -c -o libtest/libtest_libtest_la-result.lo `test -f 'libtest/result.cc' || echo '$(srcdir)/'`libtest/result.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-result.Tpo libtest/$(DEPDIR)/libtest_libtest_la-result.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='libtest/result.cc' object='libtest/libtest_libtest_la-result.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -c -o libtest/libtest_libtest_la-result.lo `test -f 'libtest/result.cc' || echo '$(srcdir)/'`libtest/result.cc
+
libtest/libtest_libtest_la-runner.lo: libtest/runner.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_libtest_la_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_libtest_la-runner.lo -MD -MP -MF libtest/$(DEPDIR)/libtest_libtest_la-runner.Tpo -c -o libtest/libtest_libtest_la-runner.lo `test -f 'libtest/runner.cc' || echo '$(srcdir)/'`libtest/runner.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_libtest_la-runner.Tpo libtest/$(DEPDIR)/libtest_libtest_la-runner.Plo
@@ -6605,62 +6867,6 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clients_memslap_CXXFLAGS) $(CXXFLAGS) -c -o clients/clients_memslap-execute.obj `if test -f 'clients/execute.cc'; then $(CYGPATH_W) 'clients/execute.cc'; else $(CYGPATH_W) '$(srcdir)/clients/execute.cc'; fi`
-example/t/example_t_memcached_light-memcached_light.o: example/t/memcached_light.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT example/t/example_t_memcached_light-memcached_light.o -MD -MP -MF example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Tpo -c -o example/t/example_t_memcached_light-memcached_light.o `test -f 'example/t/memcached_light.cc' || echo '$(srcdir)/'`example/t/memcached_light.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Tpo example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='example/t/memcached_light.cc' object='example/t/example_t_memcached_light-memcached_light.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o example/t/example_t_memcached_light-memcached_light.o `test -f 'example/t/memcached_light.cc' || echo '$(srcdir)/'`example/t/memcached_light.cc
-
-example/t/example_t_memcached_light-memcached_light.obj: example/t/memcached_light.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT example/t/example_t_memcached_light-memcached_light.obj -MD -MP -MF example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Tpo -c -o example/t/example_t_memcached_light-memcached_light.obj `if test -f 'example/t/memcached_light.cc'; then $(CYGPATH_W) 'example/t/memcached_light.cc'; else $(CYGPATH_W) '$(srcdir)/example/t/memcached_light.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Tpo example/t/$(DEPDIR)/example_t_memcached_light-memcached_light.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='example/t/memcached_light.cc' object='example/t/example_t_memcached_light-memcached_light.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o example/t/example_t_memcached_light-memcached_light.obj `if test -f 'example/t/memcached_light.cc'; then $(CYGPATH_W) 'example/t/memcached_light.cc'; else $(CYGPATH_W) '$(srcdir)/example/t/memcached_light.cc'; fi`
-
-tests/libmemcached-1.0/example_t_memcached_light-memcached_get.o: tests/libmemcached-1.0/memcached_get.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-memcached_get.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-memcached_get.o `test -f 'tests/libmemcached-1.0/memcached_get.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/memcached_get.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/libmemcached-1.0/memcached_get.cc' object='tests/libmemcached-1.0/example_t_memcached_light-memcached_get.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-memcached_get.o `test -f 'tests/libmemcached-1.0/memcached_get.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/memcached_get.cc
-
-tests/libmemcached-1.0/example_t_memcached_light-memcached_get.obj: tests/libmemcached-1.0/memcached_get.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-memcached_get.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-memcached_get.obj `if test -f 'tests/libmemcached-1.0/memcached_get.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/memcached_get.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/memcached_get.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-memcached_get.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/libmemcached-1.0/memcached_get.cc' object='tests/libmemcached-1.0/example_t_memcached_light-memcached_get.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-memcached_get.obj `if test -f 'tests/libmemcached-1.0/memcached_get.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/memcached_get.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/memcached_get.cc'; fi`
-
-tests/libmemcached-1.0/example_t_memcached_light-print.o: tests/libmemcached-1.0/print.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-print.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/example_t_memcached_light-print.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-print.o `test -f 'tests/libmemcached-1.0/print.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/print.cc
-
-tests/libmemcached-1.0/example_t_memcached_light-print.obj: tests/libmemcached-1.0/print.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-print.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-print.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/libmemcached-1.0/print.cc' object='tests/libmemcached-1.0/example_t_memcached_light-print.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-print.obj `if test -f 'tests/libmemcached-1.0/print.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/print.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/print.cc'; fi`
-
-tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o: tests/libmemcached-1.0/setup_and_teardowns.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o `test -f 'tests/libmemcached-1.0/setup_and_teardowns.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/setup_and_teardowns.cc
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/libmemcached-1.0/setup_and_teardowns.cc' object='tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.o `test -f 'tests/libmemcached-1.0/setup_and_teardowns.cc' || echo '$(srcdir)/'`tests/libmemcached-1.0/setup_and_teardowns.cc
-
-tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.obj: tests/libmemcached-1.0/setup_and_teardowns.cc
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -MT tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.obj -MD -MP -MF tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Tpo -c -o tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.obj `if test -f 'tests/libmemcached-1.0/setup_and_teardowns.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/setup_and_teardowns.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/setup_and_teardowns.cc'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Tpo tests/libmemcached-1.0/$(DEPDIR)/example_t_memcached_light-setup_and_teardowns.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='tests/libmemcached-1.0/setup_and_teardowns.cc' object='tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(example_t_memcached_light_CXXFLAGS) $(CXXFLAGS) -c -o tests/libmemcached-1.0/example_t_memcached_light-setup_and_teardowns.obj `if test -f 'tests/libmemcached-1.0/setup_and_teardowns.cc'; then $(CYGPATH_W) 'tests/libmemcached-1.0/setup_and_teardowns.cc'; else $(CYGPATH_W) '$(srcdir)/tests/libmemcached-1.0/setup_and_teardowns.cc'; fi`
-
libtest/libtest_unittest-unittest.o: libtest/unittest.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_unittest_CXXFLAGS) $(CXXFLAGS) -MT libtest/libtest_unittest-unittest.o -MD -MP -MF libtest/$(DEPDIR)/libtest_unittest-unittest.Tpo -c -o libtest/libtest_unittest-unittest.o `test -f 'libtest/unittest.cc' || echo '$(srcdir)/'`libtest/unittest.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) libtest/$(DEPDIR)/libtest_unittest-unittest.Tpo libtest/$(DEPDIR)/libtest_unittest-unittest.Po
@@ -8148,7 +8354,6 @@
-rm -rf .libs _libs
-rm -rf clients/.libs clients/_libs
-rm -rf example/.libs example/_libs
- -rm -rf example/t/.libs example/t/_libs
-rm -rf libhashkit/.libs libhashkit/_libs
-rm -rf libmemcached/.libs libmemcached/_libs
-rm -rf libmemcached-1.0/t/.libs libmemcached-1.0/t/_libs
@@ -8708,8 +8913,6 @@
-rm -f clients/$(am__dirstamp)
-rm -f example/$(DEPDIR)/$(am__dirstamp)
-rm -f example/$(am__dirstamp)
- -rm -f example/t/$(DEPDIR)/$(am__dirstamp)
- -rm -f example/t/$(am__dirstamp)
-rm -f libhashkit/$(DEPDIR)/$(am__dirstamp)
-rm -f libhashkit/$(am__dirstamp)
-rm -f libmemcached-1.0/t/$(DEPDIR)/$(am__dirstamp)
@@ -8749,7 +8952,7 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf clients/$(DEPDIR) example/$(DEPDIR) example/t/$(DEPDIR) libhashkit/$(DEPDIR) libmemcached-1.0/t/$(DEPDIR) libmemcached/$(DEPDIR) libmemcached/csl/$(DEPDIR) libmemcachedprotocol/$(DEPDIR) libmemcachedutil/$(DEPDIR) libtest/$(DEPDIR) poll/$(DEPDIR) tests/$(DEPDIR) tests/libmemcached-1.0/$(DEPDIR) util/$(DEPDIR)
+ -rm -rf clients/$(DEPDIR) example/$(DEPDIR) libhashkit/$(DEPDIR) libmemcached-1.0/t/$(DEPDIR) libmemcached/$(DEPDIR) libmemcached/csl/$(DEPDIR) libmemcachedprotocol/$(DEPDIR) libmemcachedutil/$(DEPDIR) libtest/$(DEPDIR) poll/$(DEPDIR) tests/$(DEPDIR) tests/libmemcached-1.0/$(DEPDIR) util/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -8799,7 +9002,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf clients/$(DEPDIR) example/$(DEPDIR) example/t/$(DEPDIR) libhashkit/$(DEPDIR) libmemcached-1.0/t/$(DEPDIR) libmemcached/$(DEPDIR) libmemcached/csl/$(DEPDIR) libmemcachedprotocol/$(DEPDIR) libmemcachedutil/$(DEPDIR) libtest/$(DEPDIR) poll/$(DEPDIR) tests/$(DEPDIR) tests/libmemcached-1.0/$(DEPDIR) util/$(DEPDIR)
+ -rm -rf clients/$(DEPDIR) example/$(DEPDIR) libhashkit/$(DEPDIR) libmemcached-1.0/t/$(DEPDIR) libmemcached/$(DEPDIR) libmemcached/csl/$(DEPDIR) libmemcachedprotocol/$(DEPDIR) libmemcachedutil/$(DEPDIR) libtest/$(DEPDIR) poll/$(DEPDIR) tests/$(DEPDIR) tests/libmemcached-1.0/$(DEPDIR) util/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic \
maintainer-clean-local
@@ -8878,28 +9081,11 @@
clean-libtest-check:
-rm -rf tmp_chroot
-libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
-
-tmp_chroot: tmp_chroot/etc
- @$(mkdir_p) tmp_chroot
-
-tmp_chroot/etc:
- @$(mkdir_p) tmp_chroot/etc
-
-tmp_chroot/var: tmp_chroot
- @$(mkdir_p) tmp_chroot/var
-
-tmp_chroot/var/log: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/log
-
-tmp_chroot/var/tmp: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/tmp
+.PHONY: libtest_tmp_dir
+libtest_tmp_dir: | $(TMP_DIR)
-tmp_chroot/var/drizzle: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/drizzle
-
-tmp_chroot/var/run: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/run
+$(TMP_DIR):
+ @$(mkdir_p) $(TMP_DIR)
test-unittest: libtest/unittest
@libtest/unittest
@@ -8914,6 +9100,11 @@
drd-unittest: libtest/unittest
@$(DRD_COMMAND) libtest/unittest
+test-backtrace: libtest/backtrace
+ @libtest/backtrace
+
+gdb-backtrace: libtest/backtrace
+ @$(GDB_COMMAND) libtest/backtrace
test-start-server:
clients/memflush --servers=localhost
@@ -9066,15 +9257,6 @@
# Build rule for documentation
@HAVE_RECENT_SPHINX_TRUE@@IS_VCS_CHECKOUT_TRUE@$(dist_man_MANS): man
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@test-memcached_light: example/t/memcached_light example/memcached_light
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @example/t/memcached_light
-
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@gdb-memcached_light: example/t/memcached_light example/memcached_light
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ @$(DEBUG_COMMAND) example/t/memcached_light
-
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@valgrind-memcached_light: example/t/memcached_light example/memcached_light
-@BUILD_LIBMEMCACHED_PROTOCOL_TRUE@ $(VALGRIND_COMMAND) example/t/memcached_light
-
libmemcached/csl/parser.h: libmemcached/csl/parser.cc
libmemcached/csl/parser.cc: libmemcached/csl/parser.yy libmemcached/csl/scanner.l libmemcached/csl/scanner.h
@@ -9111,7 +9293,7 @@
@rpmbuild -ba support/$(PACKAGE).spec
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm .
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm .
- @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
+ -cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
@cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm .
rpm-sign: rpm-build
@@ -9130,17 +9312,20 @@
auto-rpmbuild:
@auto-br-rpmbuild -ba support/libmemcached.spec
+@HAVE_DTRACE_FALSE@test-internal: tests/libmemcached-1.0/internals
+@HAVE_DTRACE_FALSE@ @tests/testplus
+
test-socket: tests/libmemcached-1.0/testsocket
@tests/libmemcached-1.0/testsocket
gdb-socket: tests/libmemcached-1.0/testsocket
- @$(DEBUG_COMMAND) tests/libmemcached-1.0/testsocket
+ @$(GDB_COMMAND) tests/libmemcached-1.0/testsocket
test-sasl: tests/libmemcached-1.0/sasl
@tests/libmemcached-1.0/sasl
gdb-sasl: tests/libmemcached-1.0/sasl
- @$(DEBUG_COMMAND) tests/libmemcached-1.0/sasl
+ @$(GDB_COMMAND) tests/libmemcached-1.0/sasl
test-udp: tests/testudp
@tests/testudp
@@ -9149,7 +9334,7 @@
@tests/testplus
gdb-plus: tests/testplus
- $(DEBUG_COMMAND) tests/testplus
+ $(GDB_COMMAND) tests/testplus
valgrind-plus: tests/testplus
@$(VALGRIND_COMMAND) tests/testplus
@@ -9161,13 +9346,13 @@
@tests/parser
valgrind-parser: tests/parser
- $(VALGRIND_COMMAND) tests/parser
+ @$(VALGRIND_COMMAND) tests/parser
test-failure: tests/failure
@tests/failure
gdb-failure: tests/failure
- @$(DEBUG_COMMAND) tests/failure
+ @$(GDB_COMMAND) tests/failure
test-hash: tests/testhashkit
@tests/testhashkit
@@ -9211,19 +9396,19 @@
@$(PAHOLE_COMMAND) tests/testapp
gdb-mem: tests/libmemcached-1.0/testapp
- @$(DEBUG_COMMAND) tests/libmemcached-1.0/testapp
+ @$(GDB_COMMAND) tests/libmemcached-1.0/testapp
gdb-atom: tests/atomsmasher
- @$(DEBUG_COMMAND) tests/atomsmasher
+ @$(GDB_COMMAND) tests/atomsmasher
gdb-hash: tests/testhashkit
- @$(DEBUG_COMMAND) tests/testhashkit
+ @$(GDB_COMMAND) tests/testhashkit
gdb-hashplus: tests/hash_plus
- @$(DEBUG_COMMAND) tests/hash_plus
+ @$(GDB_COMMAND) tests/hash_plus
gdb-cycle: tests/cycle
- @$(DEBUG_COMMAND) tests/cycle
+ @$(GDB_COMMAND) tests/cycle
valgrind-cycle: tests/cycle
$(VALGRIND_COMMAND) tests/cycle
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/aclocal.m4
^
|
| @@ -1062,11 +1062,14 @@
m4_include([m4/ax_cxx_gcc_abi_demangle.m4])
m4_include([m4/ax_cxx_header_stdcxx_98.m4])
m4_include([m4/ax_debug.m4])
+m4_include([m4/ax_dlopen.m4])
m4_include([m4/ax_endian.m4])
m4_include([m4/ax_file_escapes.m4])
+m4_include([m4/ax_gcc_atomic_builtins.m4])
m4_include([m4/ax_harden_compiler_flags.m4])
m4_include([m4/ax_hex_version.m4])
m4_include([m4/ax_libevent.m4])
+m4_include([m4/ax_libmemcached.m4])
m4_include([m4/ax_platform.m4])
m4_include([m4/ax_print_to_file.m4])
m4_include([m4/ax_prog_sphinx_build.m4])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/include.am
^
|
| @@ -79,9 +79,9 @@
clients_memslap_SOURCES = clients/memslap.cc
clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS}
+clients_memslap_CXXFLAGS= @PTHREAD_CFLAGS@
clients_memslap_LDADD= $(CLIENTS_LDADDS)
-clients_memslap_LDADD+= $(PTHREAD_LIBS)
+clients_memslap_LDADD+= @PTHREAD_LIBS@
clients_memaslap_SOURCES=
clients_memaslap_SOURCES+= clients/memaslap.c
@@ -93,7 +93,9 @@
clients_memaslap_SOURCES+= clients/ms_thread.c
clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS)
+clients_memaslap_LDADD=
+clients_memaslap_LDADD+= @LIBEVENT_LIB@
+clients_memaslap_LDADD+= $(CLIENTS_LDADDS)
clients_memcapable_SOURCES=
clients_memcapable_SOURCES+= clients/memcapable.cc
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/memaslap.c
^
|
| @@ -13,7 +13,7 @@
* Mingqiang Zhuang <mingqiangzhuang@hengtiansoft.com>
*
*/
-#include "config.h"
+#include "mem_config.h"
#include <stdlib.h>
#include <getopt.h>
@@ -114,7 +114,48 @@
static void ms_print_memslap_stats(struct timeval *start_time,
struct timeval *end_time);
static void ms_monitor_slap_mode(void);
-void ms_help_command(const char *command_name, const char *description);
+
+/**
+ * output the help information
+ *
+ * @param command_name, the string of this process
+ * @param description, description of this process
+ * @param long_options, global options array
+ */
+static __attribute__((noreturn)) void ms_help_command(const char *command_name, const char *description)
+{
+ char *help_message= NULL;
+
+ printf("%s v%u.%u\n", command_name, 1U, 0U);
+ printf(" %s\n\n", description);
+ printf(
+ "Usage:\n"
+ " memslap -hV | -s servers [-F config_file] [-t time | -x exe_num] [...]\n\n"
+ "Options:\n");
+
+ for (int x= 0; long_options[x].name; x++)
+ {
+ printf(" -%c, --%s%c\n", long_options[x].val, long_options[x].name,
+ long_options[x].has_arg ? '=' : ' ');
+
+ if ((help_message= (char *)ms_lookup_help(long_options[x].val)) != NULL)
+ {
+ printf(" %s\n", help_message);
+ }
+ }
+
+ printf(
+ "\nExamples:\n"
+ " memslap -s 127.0.0.1:11211 -S 5s\n"
+ " memslap -s 127.0.0.1:11211 -t 2m -v 0.2 -e 0.05 -b\n"
+ " memslap -s 127.0.0.1:11211 -F config -t 2m -w 40k -S 20s -o 0.2\n"
+ " memslap -s 127.0.0.1:11211 -F config -t 2m -T 4 -c 128 -d 20 -P 40k\n"
+ " memslap -s 127.0.0.1:11211 -F config -t 2m -d 50 -a -n 40\n"
+ " memslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m\n"
+ " memslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m -p 2\n\n");
+
+ exit(0);
+} /* ms_help_command */
/* initialize the global locks */
@@ -294,49 +335,6 @@
} /* ms_lookup_help */
-/**
- * output the help information
- *
- * @param command_name, the string of this process
- * @param description, description of this process
- * @param long_options, global options array
- */
-void ms_help_command(const char *command_name, const char *description)
-{
- char *help_message= NULL;
-
- printf("%s v%u.%u\n", command_name, 1U, 0U);
- printf(" %s\n\n", description);
- printf(
- "Usage:\n"
- " memslap -hV | -s servers [-F config_file] [-t time | -x exe_num] [...]\n\n"
- "Options:\n");
-
- for (int x= 0; long_options[x].name; x++)
- {
- printf(" -%c, --%s%c\n", long_options[x].val, long_options[x].name,
- long_options[x].has_arg ? '=' : ' ');
-
- if ((help_message= (char *)ms_lookup_help(long_options[x].val)) != NULL)
- {
- printf(" %s\n", help_message);
- }
- }
-
- printf(
- "\nExamples:\n"
- " memslap -s 127.0.0.1:11211 -S 5s\n"
- " memslap -s 127.0.0.1:11211 -t 2m -v 0.2 -e 0.05 -b\n"
- " memslap -s 127.0.0.1:11211 -F config -t 2m -w 40k -S 20s -o 0.2\n"
- " memslap -s 127.0.0.1:11211 -F config -t 2m -T 4 -c 128 -d 20 -P 40k\n"
- " memslap -s 127.0.0.1:11211 -F config -t 2m -d 50 -a -n 40\n"
- " memslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m\n"
- " memslap -s 127.0.0.1:11211,127.0.0.1:11212 -F config -t 2m -p 2\n\n");
-
- exit(0);
-} /* ms_help_command */
-
-
/* used to parse the time string */
static int64_t ms_parse_time()
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/ms_conn.c
^
|
| @@ -9,7 +9,7 @@
*
*/
-#include "config.h"
+#include "mem_config.h"
#include <stdio.h>
#include <inttypes.h>
@@ -758,6 +758,7 @@
max= avg - 1;
}
}
+ (void)last_good;
} /* ms_maximize_sndbuf */
@@ -1543,6 +1544,7 @@
break;
}
}
+ (void)packets;
return wbytes == 0 ? -1 : wbytes;
} /* ms_sort_udp_packet */
@@ -3158,6 +3160,8 @@
atomic_add_size(&ms_stats.cmd_get, 1);
}
+ (void)item;
+
return EXIT_SUCCESS;
} /* ms_mcd_mlget */
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/ms_setting.c
^
|
| @@ -9,7 +9,7 @@
*
*/
-#include "config.h"
+#include "mem_config.h"
#include <libmemcached/memcached.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/ms_sigsegv.c
^
|
| @@ -12,7 +12,7 @@
* Author Trond Norbye
*/
-#include "config.h"
+#include "mem_config.h"
#include <memory.h>
#include <stdlib.h>
@@ -38,7 +38,9 @@
pthread_mutex_lock(&ms_global.quit_mutex);
fprintf(stderr, "Segmentation fault occurred.\nStack trace:\n");
+#if 0
pandora_print_callstack(stderr);
+#endif
fprintf(stderr, "End of stack trace\n");
pthread_mutex_unlock(&ms_global.quit_mutex);
abort();
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/ms_stats.c
^
|
| @@ -9,7 +9,7 @@
*
*/
-#include "config.h"
+#include "mem_config.h"
#include <inttypes.h>
#include "ms_stats.h"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/ms_task.c
^
|
| @@ -9,7 +9,7 @@
*
*/
-#include "config.h"
+#include "mem_config.h"
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/clients/ms_thread.c
^
|
| @@ -9,7 +9,7 @@
*
*/
-#include "config.h"
+#include "mem_config.h"
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libmemcached 1.0.14.
+# Generated by GNU Autoconf 2.68 for libmemcached 1.0.15.
#
# Report bugs to <http://libmemcached.org/>.
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='libmemcached'
PACKAGE_TARNAME='libmemcached'
-PACKAGE_VERSION='1.0.14'
-PACKAGE_STRING='libmemcached 1.0.14'
+PACKAGE_VERSION='1.0.15'
+PACKAGE_STRING='libmemcached 1.0.15'
PACKAGE_BUGREPORT='http://libmemcached.org/'
PACKAGE_URL=''
@@ -620,8 +620,6 @@
AMINCLUDE
HAVE_VISIBILITY
CFLAG_VISIBILITY
-IS_VCS_CHECKOUT_FALSE
-IS_VCS_CHECKOUT_TRUE
CXX_VERSION
CXX_VERSION_VENDOR
CC_VERSION
@@ -632,10 +630,15 @@
HAVE_DTRACE_TRUE
DTRACEFLAGS
DTRACE
+SHARED_ENABLED_FALSE
+SHARED_ENABLED_TRUE
LIBMEMCACHED_WITH_SASL_SUPPORT
HAVE_SASL_FALSE
HAVE_SASL_TRUE
-SASL_LDFLAGS
+HAVE_LIBSASL_FALSE
+HAVE_LIBSASL_TRUE
+SASL_LIB
+LIBSASL_LIB
LIBSASL_LDFLAGS
LIBSASL_CPPFLAGS
PTHREAD_CFLAGS
@@ -644,16 +647,20 @@
ax_pthread_config
HAVE_LIBUUID_FALSE
HAVE_LIBUUID_TRUE
-LIBUUID_LDFLAGS
+LIBUUID_LIB
BUILD_WIN32_WRAPPERS_FALSE
BUILD_WIN32_WRAPPERS_TRUE
BUILD_POLL_FALSE
BUILD_POLL_TRUE
+HAVE_DL_FALSE
+HAVE_DL_TRUE
DL_LIB
+DL_LDFLAGS
+DL_CPPFLAGS
RT_LIB
HAVE_LIBEVENT_FALSE
HAVE_LIBEVENT_TRUE
-LIBEVENT_LDFLAGS
+LIBEVENT_LIB
BUILD_CACHE_FALSE
BUILD_CACHE_TRUE
LIBOBJS
@@ -684,23 +691,28 @@
BUILDING_GEARMAN_TRUE
HAVE_LIBDRIZZLE_FALSE
HAVE_LIBDRIZZLE_TRUE
-HAVE_LIBMEMCACHED_FALSE
-HAVE_LIBMEMCACHED_TRUE
BUILDING_LIBMEMCACHED_FALSE
BUILDING_LIBMEMCACHED_TRUE
HAVE_LIBGEARMAN_FALSE
HAVE_LIBGEARMAN_TRUE
+LIBGEARMAN_LIB
LIBGEARMAN_LDFLAGS
LIBGEARMAN_CPPFLAGS
GEARMAND_BINARY
MEMCACHED_BINARY
-MYSQLD
+HAVE_LIBMEMCACHED_FALSE
+HAVE_LIBMEMCACHED_TRUE
+LIBMEMCACHED_UTIL_LDFLAGS
+LIBMEMCACHED_LDFLAGS
+LIBMEMCACHED_CFLAGS
HAVE_LIBMYSQL_FALSE
HAVE_LIBMYSQL_TRUE
MYSQL_LDFLAGS
MYSQL_CFLAGS
+MYSQL_INCLUDE
MYSQL_VERSION
MYSQL_CONFIG
+MYSQLD
LIBTEST_VERSION
BUILD_LIBMEMCACHED_PROTOCOL_FALSE
BUILD_LIBMEMCACHED_PROTOCOL_TRUE
@@ -714,6 +726,9 @@
TARGET_OSX_TRUE
BUILD_WIN32_FALSE
BUILD_WIN32_TRUE
+IS_VCS_CHECKOUT_FALSE
+IS_VCS_CHECKOUT_TRUE
+LIBM
CXXCPP
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
@@ -748,6 +763,7 @@
MEMCACHED_LIBRARY_VERSION
MEMCACHED_PROTOCAL_LIBRARY_VERSION
MEMCACHED_UTIL_LIBRARY_VERSION
+AUTOHEADER_FILE
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@@ -857,6 +873,7 @@
enable_silent_rules
enable_libmemcachedprotocol
with_mysql
+enable_libmemcached
with_memcached
with_gearmand
enable_hsieh_hash
@@ -886,6 +903,8 @@
GEARMAND_BINARY
LIBGEARMAN_CPPFLAGS
LIBGEARMAN_LDFLAGS
+DL_CPPFLAGS
+DL_LDFLAGS
LIBSASL_CPPFLAGS
LIBSASL_LDFLAGS'
@@ -1430,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libmemcached 1.0.14 to adapt to many kinds of systems.
+\`configure' configures libmemcached 1.0.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1501,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libmemcached 1.0.14:";;
+ short | recursive ) echo "Configuration of libmemcached 1.0.15:";;
esac
cat <<\_ACEOF
@@ -1524,6 +1543,7 @@
--disable-silent-rules verbose build output (undo: `make V=0')
--enable-libmemcachedprotocol
Enable libmemcachedprotocol
+ --disable-libmemcached Build with libmemcached support [default=on]
--enable-hsieh_hash build with support for hsieh hashing. [default=off]
--disable-murmur_hash build with support for murmur hashing. [default=on]
--disable-fnv64_hash build with support for fnv64 hashing. [default=on]
@@ -1573,6 +1593,8 @@
C preprocessor flags for LIBGEARMAN headers
LIBGEARMAN_LDFLAGS
linker flags for LIBGEARMAN libraries
+ DL_CPPFLAGS C preprocessor flags for DL headers
+ DL_LDFLAGS linker flags for DL libraries
LIBSASL_CPPFLAGS
C preprocessor flags for LIBSASL headers
LIBSASL_LDFLAGS
@@ -1644,7 +1666,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libmemcached configure 1.0.14
+libmemcached configure 1.0.15
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2357,11 +2379,53 @@
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_find_uintX_t
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libmemcached $as_me 1.0.14, which was
+It was created by libmemcached $as_me 1.0.15, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2642,10 +2706,10 @@
fi
as_fn_append ac_header_list " arpa/inet.h"
-as_fn_append ac_header_list " dlfcn.h"
as_fn_append ac_header_list " errno.h"
as_fn_append ac_header_list " execinfo.h"
as_fn_append ac_header_list " fcntl.h"
+as_fn_append ac_header_list " fnmatch.h"
as_fn_append ac_header_list " inttypes.h"
as_fn_append ac_header_list " libintl.h"
as_fn_append ac_header_list " limits.h"
@@ -2655,6 +2719,7 @@
as_fn_append ac_header_list " netdb.h"
as_fn_append ac_header_list " netinet/in.h"
as_fn_append ac_header_list " netinet/tcp.h"
+as_fn_append ac_header_list " poll.h"
as_fn_append ac_header_list " pthread.h"
as_fn_append ac_header_list " spawn.h"
as_fn_append ac_header_list " stdarg.h"
@@ -2665,13 +2730,12 @@
as_fn_append ac_header_list " sys/sysctl.h"
as_fn_append ac_header_list " sys/time.h"
as_fn_append ac_header_list " sys/un.h"
+as_fn_append ac_header_list " sys/wait.h"
as_fn_append ac_header_list " syslog.h"
as_fn_append ac_header_list " time.h"
as_fn_append ac_header_list " unistd.h"
as_fn_append ac_header_list " winsock2.h"
-as_fn_append ac_header_list " poll.h"
-as_fn_append ac_header_list " sys/wait.h"
-as_fn_append ac_header_list " fnmatch.h"
+as_fn_append ac_header_list " ws2tcpip.h"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -4632,7 +4696,7 @@
# Define the identity of the package.
PACKAGE='libmemcached'
- VERSION='1.0.14'
+ VERSION='1.0.15'
cat >>confdefs.h <<_ACEOF
@@ -4885,6 +4949,8 @@
ac_config_headers="$ac_config_headers mem_config.h:mem_config.in"
+AUTOHEADER_FILE=mem_config.h
+
#shared library versioning
@@ -4928,6 +4994,8 @@
HASHKIT_LIBRARY_VERSION=2:0:0
+ac_config_files="$ac_config_files libhashkit/hashkitcon.h"
+
ac_config_files="$ac_config_files libhashkit-1.0/configure.h"
@@ -15639,21 +15707,149 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+*-ncr-sysv4.3*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
+$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
+if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmw $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _mwvalidcheckl ();
+int
+main ()
+{
+return _mwvalidcheckl ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_mw__mwvalidcheckl=yes
+else
+ ac_cv_lib_mw__mwvalidcheckl=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
+$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
+if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then :
+ LIBM="-lmw"
+fi
- # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
- enableval=$enable_debug;
- ax_enable_debug=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if ${ac_cv_lib_m_cos+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-$as_echo "#define DEBUG 1 " >>confdefs.h
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_cos=yes
+else
+ ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = xyes; then :
+ LIBM="$LIBM -lm"
+fi
+ ;;
+*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if ${ac_cv_lib_m_cos+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_m_cos=yes
else
+ ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = xyes; then :
+ LIBM="-lm"
+fi
+
+ ;;
+esac
- ax_enable_debug=no
-$as_echo "#define DEBUG 0 " >>confdefs.h
+ # Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+ enableval=$enable_debug; ax_enable_debug=yes
+
+$as_echo "#define DEBUG 1" >>confdefs.h
+
+else
+ ax_enable_debug=no
+
+$as_echo "#define DEBUG 0 " >>confdefs.h
fi
@@ -15663,25 +15859,84 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_enable_debug" >&5
$as_echo "$ax_enable_debug" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vcs system" >&5
+$as_echo_n "checking for vcs system... " >&6; }
+if ${ac_cv_vcs_system+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_vcs_system="none"
+ if test -d ".bzr"; then :
+ ac_cv_vcs_system="bazaar"
+fi
+ if test -d ".svn"; then :
+ ac_cv_vcs_system="svn"
+fi
+ if test -d ".hg"; then :
+ ac_cv_vcs_system="mercurial"
+fi
+ if test -d ".git"; then :
+ ac_cv_vcs_system="git"
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_vcs_system" >&5
+$as_echo "$ac_cv_vcs_system" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define VCS_SYSTEM "$ac_cv_vcs_system"
+_ACEOF
+
- # Check whether --enable-assert was given.
-if test "${enable_assert+set}" = set; then :
- enableval=$enable_assert;
- ax_enable_assert=yes
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vcs checkout" >&5
+$as_echo_n "checking for vcs checkout... " >&6; }
+if ${ac_cv_vcs_checkout+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$ac_cv_vcs_system" != "xnone"; then :
+ ac_cv_vcs_checkout=yes
+else
+ ac_cv_vcs_checkout=no
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_vcs_checkout" >&5
+$as_echo "$ac_cv_vcs_checkout" >&6; }
+
+ if test "x$ac_cv_vcs_checkout" = "xyes"; then
+ IS_VCS_CHECKOUT_TRUE=
+ IS_VCS_CHECKOUT_FALSE='#'
+else
+ IS_VCS_CHECKOUT_TRUE='#'
+ IS_VCS_CHECKOUT_FALSE=
+fi
+
+ if test "x$ac_cv_vcs_checkout" = "xyes"; then :
+
+$as_echo "#define VCS_CHECKOUT 1" >>confdefs.h
else
- ax_enable_assert=no
+$as_echo "#define VCS_CHECKOUT 0" >>confdefs.h
fi
- if test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" ; then :
- ax_enable_assert="yes"
+ # Check whether --enable-assert was given.
+if test "${enable_assert+set}" = set; then :
+ enableval=$enable_assert; ax_enable_assert=yes
+else
+ ax_enable_assert=no
+fi
-$as_echo "#define NDEBUG 1" >>confdefs.h
+ if test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ; then :
+ ax_enable_assert="yes"
+else
+ ax_enable_assert="no"
+
+$as_echo "#define NDEBUG 1" >>confdefs.h
fi
@@ -15994,6 +16249,7 @@
#
# This macro calls:
#
+# AC_SUBST(MYSQL_INCLUDE)
# AC_SUBST(MYSQL_CFLAGS)
# AC_SUBST(MYSQL_LDFLAGS)
# AC_SUBST(MYSQL_VERSION)
@@ -16011,7 +16267,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 12
+#serial 13
@@ -16087,6 +16343,68 @@
+#serial 1
+
+
+
+#serial 1
+
+
+
+
+$as_echo "#define HAVE_MEMCACHED_SASL_BINARY 0" >>confdefs.h
+
+
+
+
+# Extract the first word of "mysqld$EXEEXT", so it can be a program name with args.
+set dummy mysqld$EXEEXT; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MYSQLD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MYSQLD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MYSQLD="$MYSQLD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MYSQLD="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MYSQLD" && ac_cv_path_MYSQLD="nocommand"
+ ;;
+esac
+fi
+MYSQLD=$ac_cv_path_MYSQLD
+if test -n "$MYSQLD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLD" >&5
+$as_echo "$MYSQLD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "$MYSQLD" = nocommand; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mysqld not found in $PATH" >&5
+$as_echo "$as_me: WARNING: mysqld not found in $PATH" >&2;}
+fi;
+
+
+
# Check whether --with-mysql was given.
@@ -16108,6 +16426,7 @@
+ MYSQL_INCLUDE=""
MYSQL_CFLAGS=""
MYSQL_LDFLAGS=""
MYSQL_VERSION=""
@@ -16165,6 +16484,7 @@
fi
if test "$MYSQL_CONFIG" != "no"; then
+ MYSQL_INCLUDE="`$MYSQL_CONFIG --include`"
MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
@@ -16227,7 +16547,8 @@
- if test "x${found_mysql}" = "xyes"; then
+
+ if test "x${found_mysql}" = "xyes"; then
HAVE_LIBMYSQL_TRUE=
HAVE_LIBMYSQL_FALSE='#'
else
@@ -16235,7 +16556,7 @@
HAVE_LIBMYSQL_FALSE=
fi
-if test "x${found_mysql}" = "xyes"; then :
+ if test "x${found_mysql}" = "xyes"; then :
$as_echo "#define HAVE_LIBMYSQL_BUILD 1" >>confdefs.h
@@ -16249,53 +16570,7 @@
fi
-
-# Extract the first word of "mysqld$EXEEXT", so it can be a program name with args.
-set dummy mysqld$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MYSQLD+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MYSQLD in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MYSQLD="$MYSQLD" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MYSQLD="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_MYSQLD" && ac_cv_path_MYSQLD="nocommand"
- ;;
-esac
-fi
-MYSQLD=$ac_cv_path_MYSQLD
-if test -n "$MYSQLD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLD" >&5
-$as_echo "$MYSQLD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$MYSQLD" = nocommand; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mysqld not found in $PATH" >&5
-$as_echo "$as_me: WARNING: mysqld not found in $PATH" >&2;}
-fi;
-if test -f "$ac_cv_path_MYSQLD"; then :
+ if test -f "$ac_cv_path_MYSQLD"; then :
$as_echo "#define HAVE_MYSQLD_BUILD 1" >>confdefs.h
@@ -16318,187 +16593,378 @@
fi
+ ac_fn_c_check_header_mongrel "$LINENO" "libmemcached-1.0/memcached.h" "ac_cv_header_libmemcached_1_0_memcached_h" "$ac_includes_default"
+if test "x$ac_cv_header_libmemcached_1_0_memcached_h" = xyes; then :
-# Extract the first word of "mysqld$EXEEXT", so it can be a program name with args.
-set dummy mysqld$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MYSQLD+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking check for -lmemcached" >&5
+$as_echo_n "checking check for -lmemcached... " >&6; }
+if ${ax_cv_libmemcached+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $MYSQLD in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MYSQLD="$MYSQLD" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MYSQLD="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_MYSQLD" && ac_cv_path_MYSQLD="nocommand"
- ;;
-esac
-fi
-MYSQLD=$ac_cv_path_MYSQLD
-if test -n "$MYSQLD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLD" >&5
-$as_echo "$MYSQLD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$MYSQLD" = nocommand; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mysqld not found in $PATH" >&5
-$as_echo "$as_me: WARNING: mysqld not found in $PATH" >&2;}
-fi;
-
-
-
-
-
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ CPPFLAGS_save="${CPPFLAGS}"
+ CFLAGS_save="${CFLAGS}"
+ CXXFLAGS_save="${CXXFLAGS}"
+ OBJCFLAGS_save="${OBJCFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
+ LIBS_save="${LIBS}"
+ LIBS="-lmemcached $LIBS"
+ if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test program execution failed" >&5
+$as_echo "$as_me: WARNING: test program execution failed" >&2;}
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- if test -z "$MEMCACHED_BINARY"; then :
+ #include <libmemcached-1.0/memcached.h>
+int
+main ()
+{
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcached executable path has been provided" >&5
-$as_echo_n "checking whether memcached executable path has been provided... " >&6; }
+ memcached_st *memc;
+ memc= memcached(NULL, 0);
+ memcached_free(memc);
-# Check whether --with-memcached was given.
-if test "${with_memcached+set}" = set; then :
- withval=$with_memcached;
- if test "$withval" != yes && test "$withval" != no; then :
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ax_cv_libmemcached=yes
+else
+ ax_cv_libmemcached=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
- MEMCACHED_BINARY="$withval"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMCACHED_BINARY" >&5
-$as_echo "$MEMCACHED_BINARY" >&6; }
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-else
- MEMCACHED_BINARY=""
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- if test "$withval" != no; then :
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
+ CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+ LIBS="${LIBS_save}"
- # Extract the first word of "memcached", so it can be a program name with args.
-set dummy memcached; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MEMCACHED_BINARY+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MEMCACHED_BINARY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MEMCACHED_BINARY="$MEMCACHED_BINARY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MEMCACHED_BINARY="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
- ;;
-esac
fi
-MEMCACHED_BINARY=$ac_cv_path_MEMCACHED_BINARY
-if test -n "$MEMCACHED_BINARY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMCACHED_BINARY" >&5
-$as_echo "$MEMCACHED_BINARY" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_libmemcached" >&5
+$as_echo "$ax_cv_libmemcached" >&6; }
+
fi
-fi
+ if test "x$ax_cv_libmemcached" = "xyes"; then :
-fi
-else
+$as_echo "#define HAVE_LIBMEMCACHED_MEMCACHED_H 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- # Extract the first word of "memcached", so it can be a program name with args.
-set dummy memcached; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MEMCACHED_BINARY+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MEMCACHED_BINARY in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MEMCACHED_BINARY="$MEMCACHED_BINARY" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MEMCACHED_BINARY="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
- ;;
-esac
-fi
-MEMCACHED_BINARY=$ac_cv_path_MEMCACHED_BINARY
-if test -n "$MEMCACHED_BINARY"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMCACHED_BINARY" >&5
-$as_echo "$MEMCACHED_BINARY" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-fi
+$as_echo "#define HAVE_LIBMEMCACHED_MEMCACHED_H 0" >>confdefs.h
fi
+ if test "$ax_cv_libmemcached" = yes; then :
+
+ ac_fn_c_check_header_mongrel "$LINENO" "libmemcachedutil-1.0/util.h" "ac_cv_header_libmemcachedutil_1_0_util_h" "$ac_includes_default"
+if test "x$ac_cv_header_libmemcachedutil_1_0_util_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking check for -lmemcachedutil" >&5
+$as_echo_n "checking check for -lmemcachedutil... " >&6; }
+if ${ax_cv_libmemcached_util+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+
+ CPPFLAGS_save="${CPPFLAGS}"
+ CFLAGS_save="${CFLAGS}"
+ CXXFLAGS_save="${CXXFLAGS}"
+ OBJCFLAGS_save="${OBJCFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
+ LIBS_save="${LIBS}"
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ LIBS="-lmemcachedutil -lmemcached $LIBS"
+ if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test program execution failed" >&5
+$as_echo "$as_me: WARNING: test program execution failed" >&2;}
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <libmemcachedutil-1.0/util.h>
+int
+main ()
+{
+
+ memcached_pool_st *memc_pool= memcached_pool_create(NULL, 0, 3);
+ memcached_pool_destroy(memc_pool);
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ax_cv_libmemcached_util=yes
+else
+ ax_cv_libmemcached_util=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
+ CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+ LIBS="${LIBS_save}"
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_libmemcached_util" >&5
+$as_echo "$ax_cv_libmemcached_util" >&6; }
+
+fi
+
+
+
+fi
+
+ if test "x$ax_cv_libmemcached_util" = "xyes"; then :
+
+
+$as_echo "#define HAVE_LIBMEMCACHED_UTIL_H 1" >>confdefs.h
+
+
+else
+
+
+$as_echo "#define HAVE_LIBMEMCACHED_UTIL_H 0" >>confdefs.h
+
+
+fi
+
+
+
+ # Check whether --enable-libmemcached was given.
+if test "${enable_libmemcached+set}" = set; then :
+ enableval=$enable_libmemcached; ax_enable_libmemcached="$enableval"
+else
+ ax_enable_libmemcached="yes"
+fi
+
+
+ if test "x$ax_cv_libmemcached" != "xyes"; then :
+
+ ax_enable_libmemcached="not found"
+
+fi
+
+ if test "x$ax_enable_libmemcached" = "xyes"; then :
+
+
+$as_echo "#define HAVE_LIBMEMCACHED 1" >>confdefs.h
+
+ LIBMEMCACHED_CFLAGS=
+
+ LIBMEMCACHED_LDFLAGS="-lmemcached"
+
+ if test "x$ax_cv_libmemcached_util" = "xyes"; then :
+
+ LIBMEMCACHED_UTIL_LDFLAGS="-lmemcached -lmemcachedutil"
+
+
+fi
+
+else
+
+
+$as_echo "#define HAVE_LIBMEMCACHED 0" >>confdefs.h
+
+
+fi
+ if test "x${ax_enable_libmemcached}" = "xyes"; then
+ HAVE_LIBMEMCACHED_TRUE=
+ HAVE_LIBMEMCACHED_FALSE='#'
+else
+ HAVE_LIBMEMCACHED_TRUE='#'
+ HAVE_LIBMEMCACHED_FALSE=
+fi
+
+
+
+
+
-
-if test -f "$ac_cv_path_MEMCACHED_BINARY"; then :
-$as_echo "#define HAVE_MEMCACHED_BINARY 1" >>confdefs.h
+
+
+
+
+
+
+
+ if test -z "$MEMCACHED_BINARY"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcached executable path has been provided" >&5
+$as_echo_n "checking whether memcached executable path has been provided... " >&6; }
+
+# Check whether --with-memcached was given.
+if test "${with_memcached+set}" = set; then :
+ withval=$with_memcached;
+ if test "$withval" != yes && test "$withval" != no; then :
+
+ MEMCACHED_BINARY="$withval"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMCACHED_BINARY" >&5
+$as_echo "$MEMCACHED_BINARY" >&6; }
+
+else
+
+ MEMCACHED_BINARY=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test "$withval" != no; then :
+
+ # Extract the first word of "memcached", so it can be a program name with args.
+set dummy memcached; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MEMCACHED_BINARY+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MEMCACHED_BINARY in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MEMCACHED_BINARY="$MEMCACHED_BINARY" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MEMCACHED_BINARY="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MEMCACHED_BINARY=$ac_cv_path_MEMCACHED_BINARY
+if test -n "$MEMCACHED_BINARY"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMCACHED_BINARY" >&5
+$as_echo "$MEMCACHED_BINARY" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+fi
+
+fi
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ # Extract the first word of "memcached", so it can be a program name with args.
+set dummy memcached; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MEMCACHED_BINARY+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MEMCACHED_BINARY in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MEMCACHED_BINARY="$MEMCACHED_BINARY" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MEMCACHED_BINARY="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MEMCACHED_BINARY=$ac_cv_path_MEMCACHED_BINARY
+if test -n "$MEMCACHED_BINARY"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMCACHED_BINARY" >&5
+$as_echo "$MEMCACHED_BINARY" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+fi
+
+
+fi
+
+
+
+
+
+
+ if test -f "$ac_cv_path_MEMCACHED_BINARY"; then :
+
+
+$as_echo "#define HAVE_MEMCACHED_BINARY 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -16518,6 +16984,9 @@
fi
+ac_config_files="$ac_config_files libtest/yatlcon.h"
+
+
@@ -16671,26 +17140,30 @@
-
- if ${ax_cv_have_LIBGEARMAN+:} false; then :
+ if ${ax_cv_have_LIBGEARMAN+:} false; then :
$as_echo_n "(cached) " >&6
else
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- if test "x$LIBGEARMAN_CPPFLAGS" != "x"; then :
+ CPPFLAGS_save="${CPPFLAGS}"
+ CFLAGS_save="${CFLAGS}"
+ CXXFLAGS_save="${CXXFLAGS}"
+ OBJCFLAGS_save="${OBJCFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
+ LIBS_save="${LIBS}"
+
+
+ if test "x$LIBGEARMAN_CPPFLAGS" != "x"; then :
CPPFLAGS="$CPPFLAGS $LIBGEARMAN_CPPFLAGS"
fi
- if test "x$LIBGEARMAN_LDFLAGS" != "x"; then :
+ if test "x$LIBGEARMAN_LDFLAGS" != "x"; then :
LDFLAGS="$LDFLAGS $LIBGEARMAN_LDFLAGS"
fi
- ac_fn_c_check_header_mongrel "$LINENO" "libgearman/gearmand.h" "ac_cv_header_libgearman_gearmand_h" "$ac_includes_default"
-if test "x$ac_cv_header_libgearman_gearmand_h" = xyes; then :
+ ac_fn_c_check_header_mongrel "$LINENO" "libgearman/gearman.h" "ac_cv_header_libgearman_gearman_h" "$ac_includes_default"
+if test "x$ac_cv_header_libgearman_gearman_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgearman" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgearman" >&5
$as_echo_n "checking for main in -lgearman... " >&6; }
if ${ac_cv_lib_gearman_main+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16733,32 +17206,33 @@
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
+ CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+ LIBS="${LIBS_save}"
+
fi
- if test "$ax_cv_have_LIBGEARMAN" = "yes"; then :
+ if test "$ax_cv_have_LIBGEARMAN" = "yes"; then :
$as_echo "#define HAVE_LIBGEARMAN 1" >>confdefs.h
- ax_check_for_libgearman=yes
-else
- ax_check_for_libgearman=no
-fi
- if test "$ax_check_for_libgearman" = xyes; then :
-$as_echo "#define HAVE_LIBGEARMAN 1" >>confdefs.h
+ LIBGEARMAN_LIB=-lgearman
+ :
else
$as_echo "#define HAVE_LIBGEARMAN 0" >>confdefs.h
fi
- if test "$ax_check_for_libgearman" = xyes; then
+ if test "$ax_cv_have_LIBGEARMAN" = "yes"; then
HAVE_LIBGEARMAN_TRUE=
HAVE_LIBGEARMAN_FALSE='#'
else
@@ -16768,6 +17242,7 @@
+
if true; then
BUILDING_LIBMEMCACHED_TRUE=
BUILDING_LIBMEMCACHED_FALSE='#'
@@ -18216,30 +18691,18 @@
+
+
+
+
+
+
# Windows only
-for ac_header in winsock2.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
-fi
-done
-for ac_header in ws2tcpip.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
-if test "x$ac_cv_header_ws2tcpip_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_WS2TCPIP_H 1
-_ACEOF
-fi
-done
# Checks for typedefs, structures, and compiler characteristics.
@@ -18433,6 +18896,17 @@
fi
done
+for ac_func in sigignore
+do :
+ ac_fn_c_check_func "$LINENO" "sigignore" "ac_cv_func_sigignore"
+if test "x$ac_cv_func_sigignore" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGIGNORE 1
+_ACEOF
+
+fi
+done
+
for ac_func in socket
do :
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
@@ -19834,7 +20308,7 @@
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GCC C++ ABI name demangling" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GCC C++ ABI name demangling" >&5
$as_echo_n "checking whether the compiler supports GCC C++ ABI name demangling... " >&6; }
if ${ax_cv_cxx_gcc_abi_demangle+:} false; then :
$as_echo_n "(cached) " >&6
@@ -19845,55 +20319,58 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then :
+ ax_cv_cxx_gcc_abi_demangle=no
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <typeinfo>
#include <cxxabi.h>
#include <cstdlib>
#include <string>
-
-template<typename TYPE> class A {};
-
+ template<typename TYPE>
+ class A {};
int
main ()
{
-
A<int> instance;
-int status = 0;
-char* c_name = 0;
+ int status = 0;
+ char* c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status);
-c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status);
-std::string name(c_name);
-::free(c_name);
-return name == "A<int>";
+ std::string name(c_name);
+ ::free(c_name);
+ if (name.compare("A<int>") != 0)
+ {
+ return EXIT_FAILURE;
+ }
;
return 0;
}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_run "$LINENO"; then :
ax_cv_cxx_gcc_abi_demangle=yes
else
ax_cv_cxx_gcc_abi_demangle=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_gcc_abi_demangle" >&5
$as_echo "$ax_cv_cxx_gcc_abi_demangle" >&6; }
-
- if test "$ax_cv_cxx_gcc_abi_demangle" = yes; then
+ if test "x$ax_cv_cxx_gcc_abi_demangle" = xyes; then :
$as_echo "#define HAVE_GCC_ABI_DEMANGLE 1" >>confdefs.h
- fi
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking test for a working libevent" >&5
@@ -19909,21 +20386,20 @@
LDFLAGS_save="${LDFLAGS}"
LIBS_save="${LIBS}"
- LIBS="-levent $LIBS"
- ac_ext=c
+ LIBS="-levent $LIBS"
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test program execution failed" >&5
$as_echo "$as_me: WARNING: test program execution failed" >&2;}
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <sys/types.h>
#include <sys/time.h>
#include <stdlib.h>
@@ -19933,8 +20409,8 @@
main ()
{
- struct event_base *tmp_event= event_init();
- event_base_free(tmp_event);
+ struct event_base *tmp_event= event_init();
+ event_base_free(tmp_event);
;
return 0;
@@ -19949,7 +20425,7 @@
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
- ac_ext=c
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -19969,7 +20445,7 @@
$as_echo "$ax_cv_libevent" >&6; }
if test "x$ax_cv_libevent" = "xyes"; then :
- LIBEVENT_LDFLAGS="-levent"
+ LIBEVENT_LIB=-levent
$as_echo "#define HAVE_LIBEVENT 1" >>confdefs.h
@@ -19988,6 +20464,10 @@
HAVE_LIBEVENT_FALSE=
fi
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+ if test "x$ax_cv_libevent" = xyes; then :
+
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
@@ -20039,9 +20519,101 @@
fi
-# Check for the ability to call dlopen
-if test "x$enable_static" = "xyes"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+# Check for the ability to call dlopen (used in libhostile)
+if test "x$enable_shared" = xyes; then :
+
+
+
+ if ${ax_cv_have_DL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ CPPFLAGS_save="${CPPFLAGS}"
+ CFLAGS_save="${CFLAGS}"
+ CXXFLAGS_save="${CXXFLAGS}"
+ OBJCFLAGS_save="${OBJCFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
+ LIBS_save="${LIBS}"
+
+
+ if test "x$DL_CPPFLAGS" != "x"; then :
+ CPPFLAGS="$CPPFLAGS $DL_CPPFLAGS"
+fi
+
+ if test "x$DL_LDFLAGS" != "x"; then :
+ LDFLAGS="$LDFLAGS $DL_LDFLAGS"
+fi
+
+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
+$as_echo_n "checking for main in -ldl... " >&6; }
+if ${ac_cv_lib_dl_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_main=yes
+else
+ ac_cv_lib_dl_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5
+$as_echo "$ac_cv_lib_dl_main" >&6; }
+if test "x$ac_cv_lib_dl_main" = xyes; then :
+ ax_cv_have_DL=yes
+else
+ ax_cv_have_DL=no
+fi
+
+
+else
+ ax_cv_have_DL=no
+fi
+
+
+
+
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
+ CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+ LIBS="${LIBS_save}"
+
+
+fi
+
+
+ if test "$ax_cv_have_DL" = "yes"; then :
+
+$as_echo "#define HAVE_DL 1" >>confdefs.h
+
+
+
+ DL_LIB=-ldl
+
+
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
@@ -20078,26 +20650,18 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- DL_LIB=-ldl
-
-
-$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
-fi
-
-else
-
-$as_echo "#define HAVE_LIBDL 0" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5
-$as_echo_n "checking for floor in -lm... " >&6; }
-if ${ac_cv_lib_m_floor+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5
+$as_echo_n "checking for dladdr in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dladdr+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm $LIBS"
+LIBS="-ldl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -20107,45 +20671,54 @@
#ifdef __cplusplus
extern "C"
#endif
-char floor ();
+char dladdr ();
int
main ()
{
-return floor ();
+return dladdr ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_m_floor=yes
+ ac_cv_lib_dl_dladdr=yes
else
- ac_cv_lib_m_floor=no
+ ac_cv_lib_dl_dladdr=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5
-$as_echo "$ac_cv_lib_m_floor" >&6; }
-if test "x$ac_cv_lib_m_floor" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5
+$as_echo "$ac_cv_lib_dl_dladdr" >&6; }
+if test "x$ac_cv_lib_dl_dladdr" = xyes; then :
- LIBS="-lm $LIBS"
+$as_echo "#define HAVE_DLADDR 1" >>confdefs.h
fi
-for ac_func in sigignore
-do :
- ac_fn_c_check_func "$LINENO" "sigignore" "ac_cv_func_sigignore"
-if test "x$ac_cv_func_sigignore" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGIGNORE 1
-_ACEOF
+else
+ :
+fi
+ if test "$ax_cv_have_DL" = "yes"; then
+ HAVE_DL_TRUE=
+ HAVE_DL_FALSE='#'
+else
+ HAVE_DL_TRUE='#'
+ HAVE_DL_FALSE=
+fi
+
+
+else
+ if false; then
+ HAVE_DL_TRUE=
+ HAVE_DL_FALSE='#'
+else
+ HAVE_DL_TRUE='#'
+ HAVE_DL_FALSE=
+fi
fi
-done
for ac_header in atomic.h
@@ -20236,15 +20809,6 @@
done
-
-
-
-
-
-
-
-
-
if test "x$ac_cv_header_poll_h" = "xno"; then
BUILD_POLL_TRUE=
BUILD_POLL_FALSE='#'
@@ -20588,12 +21152,12 @@
- if test "$ax_libuuid" = yes; then :
+ if test "x$ax_libuuid" = xyes; then :
$as_echo "#define HAVE_UUID_UUID_H 1" >>confdefs.h
- if test "$ax_cv_libuuid_is_required" = yes; then :
- LIBUUID_LDFLAGS='-luuid'
+ if test "x$ax_cv_libuuid_is_required" = xyes; then :
+ LIBUUID_LIB='-luuid'
fi
else
@@ -20603,7 +21167,7 @@
fi
- if test "$ax_libuuid" = yes; then
+ if test "x$ax_libuuid" = xyes; then
HAVE_LIBUUID_TRUE=
HAVE_LIBUUID_FALSE='#'
else
@@ -20625,7 +21189,7 @@
LDFLAGS_save="${LDFLAGS}"
LIBS_save="${LIBS}"
- LIBS="$LIBUUID_LDFLAGS $LIBS"
+ LIBS="$LIBUUID_LIB $LIBS"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20691,6 +21255,116 @@
+ax_sasl_check=no
+
+
+
+ if ${ax_cv_have_LIBSASL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ CPPFLAGS_save="${CPPFLAGS}"
+ CFLAGS_save="${CFLAGS}"
+ CXXFLAGS_save="${CXXFLAGS}"
+ OBJCFLAGS_save="${OBJCFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
+ LIBS_save="${LIBS}"
+
+
+ if test "x$LIBSASL_CPPFLAGS" != "x"; then :
+ CPPFLAGS="$CPPFLAGS $LIBSASL_CPPFLAGS"
+fi
+
+ if test "x$LIBSASL_LDFLAGS" != "x"; then :
+ LDFLAGS="$LDFLAGS $LIBSASL_LDFLAGS"
+fi
+
+ ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsasl2" >&5
+$as_echo_n "checking for main in -lsasl2... " >&6; }
+if ${ac_cv_lib_sasl2_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsasl2 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_sasl2_main=yes
+else
+ ac_cv_lib_sasl2_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_main" >&5
+$as_echo "$ac_cv_lib_sasl2_main" >&6; }
+if test "x$ac_cv_lib_sasl2_main" = xyes; then :
+ ax_cv_have_LIBSASL=yes
+else
+ ax_cv_have_LIBSASL=no
+fi
+
+
+else
+ ax_cv_have_LIBSASL=no
+fi
+
+
+
+
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
+ CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+ LIBS="${LIBS_save}"
+
+
+fi
+
+
+ if test "$ax_cv_have_LIBSASL" = "yes"; then :
+
+$as_echo "#define HAVE_LIBSASL 1" >>confdefs.h
+
+
+
+ LIBSASL_LIB=-lsasl2
+
+ ax_sasl_check=yes
+ SASL_LIB=-lsasl2
+
+
+else
+ :
+fi
+ if test "$ax_cv_have_LIBSASL" = "yes"; then
+ HAVE_LIBSASL_TRUE=
+ HAVE_LIBSASL_FALSE='#'
+else
+ HAVE_LIBSASL_TRUE='#'
+ HAVE_LIBSASL_FALSE=
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking to see if sasl works" >&5
+$as_echo_n "checking checking to see if sasl works... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$ax_sasl_check\"" >&5
+$as_echo "\"$ax_sasl_check\"" >&6; }
@@ -21169,7 +21843,8 @@
# The sasl functions should only be visible if we build with sasl support
#
- # Check whether --enable-sasl was given.
+
+ # Check whether --enable-sasl was given.
if test "${enable_sasl+set}" = set; then :
enableval=$enable_sasl; ac_enable_sasl="$enableval"
else
@@ -21177,110 +21852,21 @@
fi
- ax_sasl_option=no
if test "x${ac_enable_sasl}" = xyes; then :
- ax_sasl_check=no
-
-
-
-
- if ${ax_cv_have_LIBSASL+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
-
- if test "x$LIBSASL_CPPFLAGS" != "x"; then :
- CPPFLAGS="$CPPFLAGS $LIBSASL_CPPFLAGS"
-fi
-
- if test "x$LIBSASL_LDFLAGS" != "x"; then :
- LDFLAGS="$LDFLAGS $LIBSASL_LDFLAGS"
-fi
-
- ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sasl_sasl_h" = xyes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsasl2" >&5
-$as_echo_n "checking for main in -lsasl2... " >&6; }
-if ${ac_cv_lib_sasl2_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsasl2 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sasl2_main=yes
-else
- ac_cv_lib_sasl2_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_main" >&5
-$as_echo "$ac_cv_lib_sasl2_main" >&6; }
-if test "x$ac_cv_lib_sasl2_main" = xyes; then :
- ax_cv_have_LIBSASL=yes
-else
- ax_cv_have_LIBSASL=no
-fi
-
-
-else
- ax_cv_have_LIBSASL=no
-fi
-
-
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
-
-fi
-
-
- if test "$ax_cv_have_LIBSASL" = "yes"; then :
-
-$as_echo "#define HAVE_LIBSASL 1" >>confdefs.h
-
- ax_sasl_check=yes
- SASL_LDFLAGS=-lsasl2
-
-
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking to see if sasl works" >&5
-$as_echo_n "checking checking to see if sasl works... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$ax_sasl_check\"" >&5
-$as_echo "\"$ax_sasl_check\"" >&6; }
-
- echo "$ax_sasl_check"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking to see if enabling sasl" >&5
+$as_echo_n "checking checking to see if enabling sasl... " >&6; }
if test "x${ax_sasl_check}" = xyes; then :
ax_sasl_option=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: request to add sasl support failed, please see config.log" >&5
$as_echo "$as_me: WARNING: request to add sasl support failed, please see config.log" >&2;}
+ ac_enable_sasl=no
+ ax_sasl_option=no
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$ax_sasl_option\"" >&5
+$as_echo "\"$ax_sasl_option\"" >&6; }
fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking to see if enabling sasl" >&5
-$as_echo_n "checking checking to see if enabling sasl... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$ax_sasl_option\"" >&5
-$as_echo "\"$ax_sasl_option\"" >&6; }
if test "x${ax_sasl_option}" = xyes; then
HAVE_SASL_TRUE=
HAVE_SASL_FALSE='#'
@@ -21299,12 +21885,20 @@
-# backtrace() does not work with static builds.
-if test "x$enable_static" = "xyes"; then :
+# backtrace(), others require shared builds
+if test "x$enable_shared" = "xyes"; then :
-$as_echo "#define AX_ENABLE_BACKTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_SHARED_ENABLED 1" >>confdefs.h
fi
+ if test "x$enable_shared" = "xyes"; then
+ SHARED_ENABLED_TRUE=
+ SHARED_ENABLED_FALSE='#'
+else
+ SHARED_ENABLED_TRUE='#'
+ SHARED_ENABLED_FALSE=
+fi
+
# Check whether --enable-dtrace was given.
@@ -21449,6 +22043,91 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler provides atomic builtins" >&5
+$as_echo_n "checking whether the compiler provides atomic builtins... " >&6; }
+if ${ax_cv_gcc_atomic_builtins+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ CPPFLAGS_save="${CPPFLAGS}"
+ CFLAGS_save="${CFLAGS}"
+ CXXFLAGS_save="${CXXFLAGS}"
+ OBJCFLAGS_save="${OBJCFLAGS}"
+ LDFLAGS_save="${LDFLAGS}"
+ LIBS_save="${LIBS}"
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test program execution failed" >&5
+$as_echo "$as_me: WARNING: test program execution failed" >&2;}
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ int foo= -10; int bar= 10;
+ if (!__sync_fetch_and_add(&foo, bar) || foo)
+ {
+ return -1;
+ }
+ bar= __sync_lock_test_and_set(&foo, bar);
+ if (bar || foo != 10)
+ {
+ return -1;
+ }
+ bar= __sync_val_compare_and_swap(&bar, foo, 15);
+ if (bar)
+ {
+ return -1;
+ }
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ax_cv_gcc_atomic_builtins=yes
+else
+ ax_cv_gcc_atomic_builtins=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ CPPFLAGS="${CPPFLAGS_save}"
+ CFLAGS="${CFLAGS_save}"
+ CXXFLAGS="${CXXFLAGS_save}"
+ OBJCFLAGS="${OBJCFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+ LIBS="${LIBS_save}"
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gcc_atomic_builtins" >&5
+$as_echo "$ax_cv_gcc_atomic_builtins" >&6; }
+
+ if test "x$ax_cv_gcc_atomic_builtins" = "xyes"; then :
+
+$as_echo "#define HAVE_GCC_ATOMIC_BUILTINS 1" >>confdefs.h
+
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -21694,25 +22373,22 @@
+
# Check whether --enable-assert was given.
if test "${enable_assert+set}" = set; then :
- enableval=$enable_assert;
- ax_enable_assert=yes
-
+ enableval=$enable_assert; ax_enable_assert=yes
else
-
- ax_enable_assert=no
-
+ ax_enable_assert=no
fi
- if test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" ; then :
-
- ax_enable_assert="yes"
+ if test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ; then :
+ ax_enable_assert="yes"
+else
+ ax_enable_assert="no"
$as_echo "#define NDEBUG 1" >>confdefs.h
-
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for assert" >&5
@@ -21720,6 +22396,21 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_enable_assert" >&5
$as_echo "$ax_enable_assert" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if all warnings into errors" >&5
+$as_echo_n "checking if all warnings into errors... " >&6; }
+if ${ac_cv_warnings_as_errors+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$ac_cv_vcs_checkout" = xyes; then :
+ ac_cv_warnings_as_errors=yes
+else
+ ac_cv_warnings_as_errors=no
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_warnings_as_errors" >&5
+$as_echo "$ac_cv_warnings_as_errors" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts " >&5
$as_echo_n "checking whether the linker accepts ... " >&6; }
if ${ax_cv_check_ldflags__+:} false; then :
@@ -21934,68 +22625,6 @@
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vcs system" >&5
-$as_echo_n "checking for vcs system... " >&6; }
-if ${ac_cv_vcs_system+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_vcs_system="none"
- if test -d ".bzr"; then :
- ac_cv_vcs_system="bazaar"
-fi
- if test -d ".svn"; then :
- ac_cv_vcs_system="svn"
-fi
- if test -d ".hg"; then :
- ac_cv_vcs_system="mercurial"
-fi
- if test -d ".git"; then :
- ac_cv_vcs_system="git"
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_vcs_system" >&5
-$as_echo "$ac_cv_vcs_system" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define VCS_SYSTEM "$ac_cv_vcs_system"
-_ACEOF
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vcs checkout" >&5
-$as_echo_n "checking for vcs checkout... " >&6; }
-if ${ac_cv_vcs_checkout+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$ac_cv_vcs_system" != "xnone"; then :
- ac_cv_vcs_checkout=yes
-else
- ac_cv_vcs_checkout=no
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_vcs_checkout" >&5
-$as_echo "$ac_cv_vcs_checkout" >&6; }
-
- if test "x$ac_cv_vcs_checkout" = "xyes"; then
- IS_VCS_CHECKOUT_TRUE=
- IS_VCS_CHECKOUT_FALSE='#'
-else
- IS_VCS_CHECKOUT_TRUE='#'
- IS_VCS_CHECKOUT_FALSE=
-fi
-
- if test "x$ac_cv_vcs_checkout" = "xyes"; then :
-
-$as_echo "#define VCS_CHECKOUT 1" >>confdefs.h
-
-else
-
-$as_echo "#define VCS_CHECKOUT 0" >>confdefs.h
-
-fi
-
CFLAG_VISIBILITY=
@@ -22217,9 +22846,8 @@
if test "x$ac_cv_warnings_as_errors" = xyes; then :
-
for flag in -Werror; do
- as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_-Werror_$flag" | $as_tr_sh`
+ as_CACHEVAR=`$as_echo "ax_cv_check_ldflags__$flag" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
$as_echo_n "checking whether the linker accepts $flag... " >&6; }
if eval \${$as_CACHEVAR+:} false; then :
@@ -22227,7 +22855,7 @@
else
ax_check_save_flags=$LDFLAGS
- LDFLAGS="$LDFLAGS -Werror $flag"
+ LDFLAGS="$LDFLAGS $flag"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -22252,26 +22880,26 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
- if ${LIB+:} false; then :
- case " $LIB " in
+ if ${LDFLAGS+:} false; then :
+ case " $LDFLAGS " in
*" $flag "*)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : LIB already contains \$flag"; } >&5
- (: LIB already contains $flag) 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains \$flag"; } >&5
+ (: LDFLAGS already contains $flag) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
;;
*)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : LIB=\"\$LIB \$flag\""; } >&5
- (: LIB="$LIB $flag") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS \$flag\""; } >&5
+ (: LDFLAGS="$LDFLAGS $flag") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- LIB="$LIB $flag"
+ LDFLAGS="$LDFLAGS $flag"
;;
esac
else
- LIB="$flag"
+ LDFLAGS="$flag"
fi
else
@@ -22280,7 +22908,6 @@
done
-
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts " >&5
@@ -25717,7 +26344,8 @@
- if test "x$ac_cv_vcs_checkout" = xyes; then :
+ if test "x$ax_enable_debug" = xno; then :
+ if test "x$ac_cv_vcs_checkout" = xyes; then :
@@ -25783,7 +26411,7 @@
done
- if test "x$ac_c_gcc_recent" = xyes; then :
+ if test "x$ac_c_gcc_recent" = xyes; then :
@@ -26047,6 +26675,7 @@
fi
fi
+fi
if test "x$ac_cv_vcs_checkout" = xyes; then :
@@ -26182,6 +26811,31 @@
fi
+ if test "x$ac_cv_warnings_as_errors" = xyes; then :
+ if ${CFLAGS+:} false; then :
+ case " $CFLAGS " in
+ *" -Werror "*)
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains -Werror"; } >&5
+ (: CFLAGS already contains -Werror) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ ;;
+ *)
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS -Werror\""; } >&5
+ (: CFLAGS="$CFLAGS -Werror") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ CFLAGS="$CFLAGS -Werror"
+ ;;
+ esac
+else
+ CFLAGS="-Werror"
+fi
+
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -29331,7 +29985,8 @@
- if test "x$ac_cv_vcs_checkout" = xyes; then :
+ if test "x$ax_enable_debug" = xno; then :
+ if test "x$ac_cv_vcs_checkout" = xyes; then :
@@ -29661,73 +30316,31 @@
fi
fi
+fi
if test "x$ac_cv_warnings_as_errors" = xyes; then :
-
-
-
-for flag in -Werror; do
- as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags_-Werror_$flag" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts $flag" >&5
-$as_echo_n "checking whether C++ compiler accepts $flag... " >&6; }
-if eval \${$as_CACHEVAR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ax_check_save_flags=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -Werror $flag"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval "$as_CACHEVAR=yes"
-else
- eval "$as_CACHEVAR=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS=$ax_check_save_flags
-fi
-eval ac_res=\$$as_CACHEVAR
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
if ${CXXFLAGS+:} false; then :
case " $CXXFLAGS " in
- *" $flag "*)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$flag"; } >&5
- (: CXXFLAGS already contains $flag) 2>&5
+ *" -Werror "*)
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains -Werror"; } >&5
+ (: CXXFLAGS already contains -Werror) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
;;
*)
- { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$flag\""; } >&5
- (: CXXFLAGS="$CXXFLAGS $flag") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS -Werror\""; } >&5
+ (: CXXFLAGS="$CXXFLAGS -Werror") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CXXFLAGS="$CXXFLAGS $flag"
+ CXXFLAGS="$CXXFLAGS -Werror"
;;
esac
else
- CXXFLAGS="$flag"
-fi
-
-else
- :
+ CXXFLAGS="-Werror"
fi
-done
-
-
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -29822,25 +30435,11 @@
+
if test -n "$CFLAG_VISIBILITY"; then :
CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if all warnings into errors" >&5
-$as_echo_n "checking if all warnings into errors... " >&6; }
-if ${ac_cv_warnings_as_errors+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$ac_cv_vcs_checkout" = xyes; then :
- ac_cv_warnings_as_errors=yes
-else
- ac_cv_warnings_as_errors=no
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_warnings_as_errors" >&5
-$as_echo "$ac_cv_warnings_as_errors" >&6; }
-
@@ -30084,6 +30683,10 @@
as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${IS_VCS_CHECKOUT_TRUE}" && test -z "${IS_VCS_CHECKOUT_FALSE}"; then
+ as_fn_error $? "conditional \"IS_VCS_CHECKOUT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILD_WIN32_TRUE}" && test -z "${BUILD_WIN32_FALSE}"; then
as_fn_error $? "conditional \"BUILD_WIN32\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30104,6 +30707,10 @@
as_fn_error $? "conditional \"HAVE_LIBMYSQL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_LIBMEMCACHED_TRUE}" && test -z "${HAVE_LIBMEMCACHED_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBMEMCACHED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_LIBGEARMAN_TRUE}" && test -z "${HAVE_LIBGEARMAN_FALSE}"; then
as_fn_error $? "conditional \"HAVE_LIBGEARMAN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30162,6 +30769,14 @@
as_fn_error $? "conditional \"HAVE_LIBEVENT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_DL_TRUE}" && test -z "${HAVE_DL_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_DL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_DL_TRUE}" && test -z "${HAVE_DL_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_DL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${BUILD_POLL_TRUE}" && test -z "${BUILD_POLL_FALSE}"; then
as_fn_error $? "conditional \"BUILD_POLL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30174,10 +30789,18 @@
as_fn_error $? "conditional \"HAVE_LIBUUID\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_LIBSASL_TRUE}" && test -z "${HAVE_LIBSASL_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBSASL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_SASL_TRUE}" && test -z "${HAVE_SASL_FALSE}"; then
as_fn_error $? "conditional \"HAVE_SASL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${SHARED_ENABLED_TRUE}" && test -z "${SHARED_ENABLED_FALSE}"; then
+ as_fn_error $? "conditional \"SHARED_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_DTRACE_TRUE}" && test -z "${HAVE_DTRACE_FALSE}"; then
as_fn_error $? "conditional \"HAVE_DTRACE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -30186,10 +30809,6 @@
as_fn_error $? "conditional \"DTRACE_NEEDS_OBJECTS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${IS_VCS_CHECKOUT_TRUE}" && test -z "${IS_VCS_CHECKOUT_FALSE}"; then
- as_fn_error $? "conditional \"IS_VCS_CHECKOUT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -30599,7 +31218,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libmemcached $as_me 1.0.14, which was
+This file was extended by libmemcached $as_me 1.0.15, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30665,7 +31284,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libmemcached config.status 1.0.14
+libmemcached config.status 1.0.15
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -31171,9 +31790,11 @@
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"mem_config.h") CONFIG_HEADERS="$CONFIG_HEADERS mem_config.h:mem_config.in" ;;
+ "libhashkit/hashkitcon.h") CONFIG_FILES="$CONFIG_FILES libhashkit/hashkitcon.h" ;;
"libhashkit-1.0/configure.h") CONFIG_FILES="$CONFIG_FILES libhashkit-1.0/configure.h" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"libtest/version.h") CONFIG_FILES="$CONFIG_FILES libtest/version.h" ;;
+ "libtest/yatlcon.h") CONFIG_FILES="$CONFIG_FILES libtest/yatlcon.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"docs/conf.py") CONFIG_FILES="$CONFIG_FILES docs/conf.py" ;;
"libmemcached-1.0/configure.h") CONFIG_FILES="$CONFIG_FILES libmemcached-1.0/configure.h" ;;
@@ -32719,8 +33340,9 @@
echo " * LIB Flags: $LIB"
echo " * Assertions enabled: $ax_enable_assert"
echo " * Debug enabled: $ax_enable_debug"
+echo " * Shared: $enable_shared"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"
-echo " * SASL support: $ax_sasl_option"
+echo " * SASL support: $ac_enable_sasl"
echo " * make -j: $enable_jobserver"
echo " * VCS checkout: $ac_cv_vcs_checkout"
echo ""
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/configure.ac
^
|
| @@ -6,7 +6,7 @@
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
-AC_INIT([libmemcached],[1.0.14],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.15],[http://libmemcached.org/])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -19,6 +19,7 @@
AC_PREREQ([2.61])
AC_CONFIG_HEADERS([mem_config.h:mem_config.in])dnl Keep filename to 8.3 for MS-DOS.
+AC_SUBST([AUTOHEADER_FILE],[mem_config.h])
AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
#shared library versioning
@@ -47,6 +48,7 @@
LT_PREREQ([2.2])
LT_INIT
LT_LANG([C++])
+LT_LIB_M
AX_ASSERT
@@ -108,10 +110,10 @@
# Checks for header files.
AC_CHECK_HEADERS_ONCE([arpa/inet.h])
-AC_CHECK_HEADERS_ONCE([dlfcn.h])
AC_CHECK_HEADERS_ONCE([errno.h])
AC_CHECK_HEADERS_ONCE([execinfo.h])
AC_CHECK_HEADERS_ONCE([fcntl.h])
+AC_CHECK_HEADERS_ONCE([fnmatch.h])
AC_CHECK_HEADERS_ONCE([inttypes.h])
AC_CHECK_HEADERS_ONCE([libintl.h])
AC_CHECK_HEADERS_ONCE([limits.h])
@@ -121,6 +123,7 @@
AC_CHECK_HEADERS_ONCE([netdb.h])
AC_CHECK_HEADERS_ONCE([netinet/in.h])
AC_CHECK_HEADERS_ONCE([netinet/tcp.h])
+AC_CHECK_HEADERS_ONCE([poll.h])
AC_CHECK_HEADERS_ONCE([pthread.h])
AC_CHECK_HEADERS_ONCE([spawn.h])
AC_CHECK_HEADERS_ONCE([stdarg.h])
@@ -131,13 +134,14 @@
AC_CHECK_HEADERS_ONCE([sys/sysctl.h])
AC_CHECK_HEADERS_ONCE([sys/time.h])
AC_CHECK_HEADERS_ONCE([sys/un.h])
+AC_CHECK_HEADERS_ONCE([sys/wait.h])
AC_CHECK_HEADERS_ONCE([syslog.h])
AC_CHECK_HEADERS_ONCE([time.h])
AC_CHECK_HEADERS_ONCE([unistd.h])
# Windows only
-AC_CHECK_HEADERS([winsock2.h])
-AC_CHECK_HEADERS([ws2tcpip.h])
+AC_CHECK_HEADERS_ONCE([winsock2.h])
+AC_CHECK_HEADERS_ONCE([ws2tcpip.h])
# Checks for typedefs, structures, and compiler characteristics.
@@ -160,6 +164,7 @@
AC_CHECK_FUNCS([putenv])
AC_CHECK_FUNCS([select])
AC_CHECK_FUNCS([setenv])
+AC_CHECK_FUNCS([sigignore])
AC_CHECK_FUNCS([socket])
AC_CHECK_FUNCS([sqrt])
AC_CHECK_FUNCS([strcasecmp])
@@ -213,15 +218,8 @@
AC_DEFINE([HAVE_CLOCK_GETTIME],[1],[Have clock_gettime])],
[AC_DEFINE([HAVE_CLOCK_GETTIME],[0],[Have clock_gettime])])
-# Check for the ability to call dlopen
-AS_IF([test "x$enable_static" = "xyes"],
- [AC_CHECK_LIB([dl],[dlopen],
- [AC_SUBST([DL_LIB],[-ldl])
- AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])])],
- [AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen])])
-
-AC_CHECK_LIB([m],[floor])
-AC_CHECK_FUNCS([sigignore])
+# Check for the ability to call dlopen (used in libhostile)
+AX_DLOPEN
AC_CHECK_HEADERS([atomic.h])
AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
@@ -251,7 +249,6 @@
build_solaris_privs=yes])
])
-AC_CHECK_HEADERS_ONCE([winsock2.h poll.h sys/wait.h fnmatch.h])
AM_CONDITIONAL([BUILD_POLL],[test "x$ac_cv_header_poll_h" = "xno"])
AM_CONDITIONAL([BUILD_WIN32_WRAPPERS],[test "x$ac_cv_header_winsock2_h" = "xyes"])
AS_IF([test "x$ac_cv_header_winsock2_h" = "xyes"],
@@ -263,7 +260,6 @@
AX_UUID_GENERATE_TIME_SAFE
-
AC_DEFUN([CHECK_FOR_PTHREAD_AND_SASL],
[AX_PTHREAD(, [AC_MSG_ERROR([could not find libpthread])])
AX_PTHREAD_TIMEDJOIN_NP
@@ -279,11 +275,13 @@
CHECK_FOR_PTHREAD_AND_SASL
-# backtrace() does not work with static builds.
-AS_IF([test "x$enable_static" = "xyes"],
- [AC_DEFINE([AX_ENABLE_BACKTRACE],[1],[Support for backtrace().])])
+# backtrace(), others require shared builds
+AS_IF([test "x$enable_shared" = "xyes"],
+ [AC_DEFINE([HAVE_SHARED_ENABLED],[1],[Enable code which requires shared library support. Like backtrace().])])
+AM_CONDITIONAL([SHARED_ENABLED],[test "x$enable_shared" = "xyes"])
PANDORA_ENABLE_DTRACE
+HAVE_GCC_ATOMICS
AX_ENDIAN
AX_ASSERT
AX_HARDEN_COMPILER_FLAGS
@@ -312,8 +310,9 @@
echo " * LIB Flags: $LIB"
echo " * Assertions enabled: $ax_enable_assert"
echo " * Debug enabled: $ax_enable_debug"
+echo " * Shared: $enable_shared"
echo " * Warnings as failure: $ac_cv_warnings_as_errors"
-echo " * SASL support: $ax_sasl_option"
+echo " * SASL support: $ac_enable_sasl"
echo " * make -j: $enable_jobserver"
echo " * VCS checkout: $ac_cv_vcs_checkout"
echo ""
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/example/include.am
^
|
| @@ -24,5 +24,3 @@
example_memcached_light_LDADD+= libmemcached/libmemcachedprotocol.la
example_memcached_light_LDFLAGS+= @LIBEVENT_LDFLAGS@
-
-include example/t/include.am
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/example/interface_v0.cc
^
|
| @@ -5,7 +5,7 @@
* specification next to your coffee ;-)
*/
-#include "config.h"
+#include "mem_config.h"
#include <cassert>
#include <sys/types.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/example/interface_v1.cc
^
|
| @@ -8,7 +8,7 @@
* you will not receive the next command before a answer to the previous
* command is being sent.
*/
-#include "config.h"
+#include "mem_config.h"
#include <cassert>
#include <cerrno>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/example/storage.cc
^
|
| @@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-#include "config.h"
+#include "mem_config.h"
#include <stdlib.h>
#include <inttypes.h>
#include <time.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit-1.0/algorithm.h
^
|
| @@ -72,41 +72,14 @@
uint32_t libhashkit_murmur(const char *key, size_t key_length);
HASHKIT_API
+uint32_t libhashkit_murmur3(const char *key, size_t key_length);
+
+HASHKIT_API
uint32_t libhashkit_jenkins(const char *key, size_t key_length);
HASHKIT_API
uint32_t libhashkit_md5(const char *key, size_t key_length);
-HASHKIT_LOCAL
-uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_crc32(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_murmur(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_jenkins(const char *key, size_t key_length, void *context);
-
-HASHKIT_LOCAL
-uint32_t hashkit_md5(const char *key, size_t key_length, void *context);
-
HASHKIT_API
void libhashkit_md5_signature(const unsigned char *key, size_t length, unsigned char *result);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit-1.0/types.h
^
|
| @@ -68,6 +68,7 @@
HASHKIT_HASH_HSIEH,
HASHKIT_HASH_MURMUR,
HASHKIT_HASH_JENKINS,
+ HASHKIT_HASH_MURMUR3,
HASHKIT_HASH_CUSTOM,
HASHKIT_HASH_MAX
} hashkit_hash_algorithm_t;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/aes.cc
^
|
| @@ -35,9 +35,9 @@
*/
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
-#include <libhashkit/rijndael.hpp>
+#include "libhashkit/rijndael.hpp"
#include <cstring>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/algorithm.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include <libhashkit/common.h>
+#include "libhashkit/common.h"
uint32_t libhashkit_one_at_a_time(const char *key, size_t key_length)
{
@@ -71,6 +71,11 @@
return hashkit_hsieh(key, key_length, NULL);
}
+uint32_t libhashkit_murmur3(const char *key, size_t key_length)
+{
+ return hashkit_murmur3(key, key_length, NULL);
+}
+
uint32_t libhashkit_murmur(const char *key, size_t key_length)
{
return hashkit_murmur(key, key_length, NULL);
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libhashkit/algorithm.h
^
|
| @@ -0,0 +1,66 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * HashKit library
+ *
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+ * Copyright (C) 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.
+ *
+ */
+
+
+/**
+ * @file
+ * @brief HashKit Header
+ */
+
+#pragma once
+
+uint32_t hashkit_one_at_a_time(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_fnv1_64(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_fnv1_32(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_fnv1a_32(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_crc32(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_murmur(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_murmur3(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_jenkins(const char *key, size_t key_length, void *context);
+
+uint32_t hashkit_md5(const char *key, size_t key_length, void *context);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/common.h
^
|
| @@ -2,7 +2,7 @@
*
* HashKit library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -37,7 +37,7 @@
#pragma once
-#include <mem_config.h>
+#include "libhashkit/hashkitcon.h"
#include <assert.h>
#include <errno.h>
@@ -52,9 +52,10 @@
#endif
#include <libhashkit-1.0/hashkit.h>
-#include <libhashkit/is.h>
-#include <libhashkit/string.h>
-#include <libhashkit/aes.h>
+#include "libhashkit/algorithm.h"
+#include "libhashkit/is.h"
+#include "libhashkit/string.h"
+#include "libhashkit/aes.h"
#ifdef __cplusplus
extern "C" {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/digest.cc
^
|
| @@ -66,6 +66,9 @@
#else
return 1;
#endif
+ case HASHKIT_HASH_MURMUR3:
+ return libhashkit_murmur3(key, key_length);
+
case HASHKIT_HASH_MURMUR:
#ifdef HAVE_MURMUR_HASH
return libhashkit_murmur(key, key_length);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/function.cc
^
|
| @@ -57,6 +57,7 @@
}
return HASHKIT_INVALID_ARGUMENT;
+ case HASHKIT_HASH_MURMUR3:
case HASHKIT_HASH_MURMUR:
if (libhashkit_has_algorithm(HASHKIT_HASH_MURMUR))
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/has.cc
^
|
| @@ -57,6 +57,7 @@
return false;
#endif
+ case HASHKIT_HASH_MURMUR3:
case HASHKIT_HASH_MURMUR:
#ifdef HAVE_MURMUR_HASH
return true;
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libhashkit/hashkitcon.h.in
^
|
| @@ -0,0 +1,40 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * HashKit library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+
+#pragma once
+
+#include "@AUTOHEADER_FILE@"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/include.am
^
|
| @@ -12,6 +12,8 @@
lib_LTLIBRARIES+= libhashkit/libhashkit.la
noinst_HEADERS+= libhashkit/aes.h
+noinst_HEADERS+= libhashkit/algorithm.h
+noinst_HEADERS+= libhashkit/murmur3.h
noinst_HEADERS+= libhashkit/common.h
noinst_HEADERS+= libhashkit/is.h
noinst_HEADERS+= libhashkit/rijndael.hpp
@@ -20,29 +22,33 @@
nobase_include_HEADERS+= libhashkit/hashkit.h
+libhashkit_libhashkit_la_LIBADD=
libhashkit_libhashkit_la_SOURCES=
libhashkit_libhashkit_la_CXXFLAGS=
+libhashkit_libhashkit_la_CFLAGS=
libhashkit_libhashkit_la_SOURCES+= libhashkit/aes.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/algorithm.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/behavior.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/crc32.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/digest.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/algorithm.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/behavior.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/crc32.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/digest.cc
libhashkit_libhashkit_la_SOURCES+= libhashkit/encrypt.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/fnv_32.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/fnv_64.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/function.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/has.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/hashkit.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/jenkins.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/ketama.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/md5.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/one_at_a_time.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/fnv_32.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/fnv_64.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/function.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/has.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/hashkit.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/jenkins.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/ketama.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/md5.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur3.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/murmur3_api.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/one_at_a_time.cc
libhashkit_libhashkit_la_SOURCES+= libhashkit/rijndael.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/str_algorithm.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/str_algorithm.cc
libhashkit_libhashkit_la_SOURCES+= libhashkit/strerror.cc
-libhashkit_libhashkit_la_SOURCES+= libhashkit/string.cc
+libhashkit_libhashkit_la_SOURCES+= libhashkit/string.cc
if INCLUDE_HSIEH_SRC
libhashkit_libhashkit_la_SOURCES+= libhashkit/hsieh.cc
@@ -51,8 +57,8 @@
endif
libhashkit_libhashkit_la_CXXFLAGS+= -DBUILDING_HASHKIT
+libhashkit_libhashkit_la_CFLAGS+= -DBUILDING_HASHKIT
-libhashkit_libhashkit_la_LIBADD=
libhashkit_libhashkit_la_LDFLAGS= -version-info $(HASHKIT_LIBRARY_VERSION)
# library used for testing
@@ -60,4 +66,4 @@
libhashkit_libhashkitinc_la_SOURCES= ${libhashkit_libhashkit_la_SOURCES}
libhashkit_libhashkitinc_la_CFLAGS= ${libhashkit_libhashkit_la_CFLAGS}
-libhashkit_libhashkitinc_la_LDFLAGS= $(LIBM)
+libhashkit_libhashkitinc_la_CXXFLAGS= ${libhashkit_libhashkit_la_CXXFLAGS}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/include.m4
^
|
| @@ -6,4 +6,5 @@
HASHKIT_LIBRARY_VERSION=2:0:0
AC_SUBST(HASHKIT_LIBRARY_VERSION)
+AC_CONFIG_FILES([libhashkit/hashkitcon.h])
AC_CONFIG_FILES([libhashkit-1.0/configure.h])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/jenkins.cc
^
|
| @@ -96,12 +96,14 @@
uint32_t hashkit_jenkins(const char *key, size_t length, void *)
{
uint32_t a,b,c; /* internal state */
- union { const void *ptr; size_t i; } u; /* needed for Mac Powerbook G4 */
+#ifndef WORDS_BIGENDIAN
+ union { const void *ptr; size_t i; } u;
+ u.ptr = key;
+#endif
/* Set up the internal state */
a = b = c = 0xdeadbeef + ((uint32_t)length) + JENKINS_INITVAL;
- u.ptr = key;
#ifndef WORDS_BIGENDIAN
if ((u.i & 0x3) == 0)
{
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libhashkit/murmur3.cc
^
|
| @@ -0,0 +1,317 @@
+//-----------------------------------------------------------------------------
+//MurmurHash3 was written by Austin Appleby, and is placed in the public
+//domain. The author hereby disclaims copyright to this source code.
+
+// Note - The x86 and x64 versions do _not_ produce the same results, as the
+// algorithms are optimized for their respective platforms. You can still
+// compile and run any of them on any platform, but your performance with the
+// non-native version will be less than optimal.
+
+#include "libhashkit/hashkitcon.h"
+
+#include "libhashkit/murmur3.h"
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+#ifdef __GNUC__
+#define FORCE_INLINE __attribute__((always_inline)) inline
+#else
+#define FORCE_INLINE inline
+#endif
+
+static FORCE_INLINE uint32_t rotl32 ( uint32_t x, int8_t r )
+{
+ return (x << r) | (x >> (32 - r));
+}
+
+static FORCE_INLINE uint64_t rotl64 ( uint64_t x, int8_t r )
+{
+ return (x << r) | (x >> (64 - r));
+}
+
+#define ROTL32(x,y) rotl32(x,y)
+#define ROTL64(x,y) rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+#define getblock(p, i) (p[i])
+
+//-----------------------------------------------------------------------------
+// Finalization mix - force all bits of a hash block to avalanche
+
+static FORCE_INLINE uint32_t fmix32 ( uint32_t h )
+{
+ h ^= h >> 16;
+ h *= 0x85ebca6b;
+ h ^= h >> 13;
+ h *= 0xc2b2ae35;
+ h ^= h >> 16;
+
+ return h;
+}
+
+//----------
+
+static FORCE_INLINE uint64_t fmix64 ( uint64_t k )
+{
+ k ^= k >> 33;
+ k *= BIG_CONSTANT(0xff51afd7ed558ccd);
+ k ^= k >> 33;
+ k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
+ k ^= k >> 33;
+
+ return k;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32 ( const void * key, int len,
+ uint32_t seed, void * out )
+{
+ const uint8_t * data = (const uint8_t*)key;
+ const int nblocks = len / 4;
+ int i;
+
+ uint32_t h1 = seed;
+
+ uint32_t c1 = 0xcc9e2d51;
+ uint32_t c2 = 0x1b873593;
+
+ //----------
+ // body
+
+ const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
+
+ for(i = -nblocks; i; i++)
+ {
+ uint32_t k1 = getblock(blocks,i);
+
+ k1 *= c1;
+ k1 = ROTL32(k1,15);
+ k1 *= c2;
+
+ h1 ^= k1;
+ h1 = ROTL32(h1,13);
+ h1 = h1*5+0xe6546b64;
+ }
+
+ //----------
+ // tail
+
+ const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
+
+ uint32_t k1 = 0;
+
+ switch(len & 3)
+ {
+ case 3: k1 ^= tail[2] << 16;
+ case 2: k1 ^= tail[1] << 8;
+ case 1: k1 ^= tail[0];
+ k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+ };
+
+ //----------
+ // finalization
+
+ h1 ^= len;
+
+ h1 = fmix32(h1);
+
+ *(uint32_t*)out = h1;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_128 ( const void * key, const int len,
+ uint32_t seed, void * out )
+{
+ const uint8_t * data = (const uint8_t*)key;
+ const int nblocks = len / 16;
+ int i;
+
+ uint32_t h1 = seed;
+ uint32_t h2 = seed;
+ uint32_t h3 = seed;
+ uint32_t h4 = seed;
+
+ uint32_t c1 = 0x239b961b;
+ uint32_t c2 = 0xab0e9789;
+ uint32_t c3 = 0x38b34ae5;
+ uint32_t c4 = 0xa1e38b93;
+
+ //----------
+ // body
+
+ const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
+
+ for(i = -nblocks; i; i++)
+ {
+ uint32_t k1 = getblock(blocks,i*4+0);
+ uint32_t k2 = getblock(blocks,i*4+1);
+ uint32_t k3 = getblock(blocks,i*4+2);
+ uint32_t k4 = getblock(blocks,i*4+3);
+
+ k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+
+ h1 = ROTL32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b;
+
+ k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+ h2 = ROTL32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747;
+
+ k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+ h3 = ROTL32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35;
+
+ k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+ h4 = ROTL32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17;
+ }
+
+ //----------
+ // tail
+
+ const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+ uint32_t k1 = 0;
+ uint32_t k2 = 0;
+ uint32_t k3 = 0;
+ uint32_t k4 = 0;
+
+ switch(len & 15)
+ {
+ case 15: k4 ^= tail[14] << 16;
+ case 14: k4 ^= tail[13] << 8;
+ case 13: k4 ^= tail[12] << 0;
+ k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+ case 12: k3 ^= tail[11] << 24;
+ case 11: k3 ^= tail[10] << 16;
+ case 10: k3 ^= tail[ 9] << 8;
+ case 9: k3 ^= tail[ 8] << 0;
+ k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+ case 8: k2 ^= tail[ 7] << 24;
+ case 7: k2 ^= tail[ 6] << 16;
+ case 6: k2 ^= tail[ 5] << 8;
+ case 5: k2 ^= tail[ 4] << 0;
+ k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+ case 4: k1 ^= tail[ 3] << 24;
+ case 3: k1 ^= tail[ 2] << 16;
+ case 2: k1 ^= tail[ 1] << 8;
+ case 1: k1 ^= tail[ 0] << 0;
+ k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+ };
+
+ //----------
+ // finalization
+
+ h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
+
+ h1 += h2; h1 += h3; h1 += h4;
+ h2 += h1; h3 += h1; h4 += h1;
+
+ h1 = fmix32(h1);
+ h2 = fmix32(h2);
+ h3 = fmix32(h3);
+ h4 = fmix32(h4);
+
+ h1 += h2; h1 += h3; h1 += h4;
+ h2 += h1; h3 += h1; h4 += h1;
+
+ ((uint32_t*)out)[0] = h1;
+ ((uint32_t*)out)[1] = h2;
+ ((uint32_t*)out)[2] = h3;
+ ((uint32_t*)out)[3] = h4;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, const int len,
+ const uint32_t seed, void * out )
+{
+ const uint8_t * data = (const uint8_t*)key;
+ const int nblocks = len / 16;
+ int i;
+
+ uint64_t h1 = seed;
+ uint64_t h2 = seed;
+
+ uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
+ uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
+
+ //----------
+ // body
+
+ const uint64_t * blocks = (const uint64_t *)(data);
+
+ for(i = 0; i < nblocks; i++)
+ {
+ uint64_t k1 = getblock(blocks,i*2+0);
+ uint64_t k2 = getblock(blocks,i*2+1);
+
+ k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+
+ h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
+
+ k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+ h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
+ }
+
+ //----------
+ // tail
+
+ const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+ uint64_t k1 = 0;
+ uint64_t k2 = 0;
+
+ switch(len & 15)
+ {
+ case 15: k2 ^= (uint64_t)(tail[14]) << 48;
+ case 14: k2 ^= (uint64_t)(tail[13]) << 40;
+ case 13: k2 ^= (uint64_t)(tail[12]) << 32;
+ case 12: k2 ^= (uint64_t)(tail[11]) << 24;
+ case 11: k2 ^= (uint64_t)(tail[10]) << 16;
+ case 10: k2 ^= (uint64_t)(tail[ 9]) << 8;
+ case 9: k2 ^= (uint64_t)(tail[ 8]) << 0;
+ k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+ case 8: k1 ^= (uint64_t)(tail[ 7]) << 56;
+ case 7: k1 ^= (uint64_t)(tail[ 6]) << 48;
+ case 6: k1 ^= (uint64_t)(tail[ 5]) << 40;
+ case 5: k1 ^= (uint64_t)(tail[ 4]) << 32;
+ case 4: k1 ^= (uint64_t)(tail[ 3]) << 24;
+ case 3: k1 ^= (uint64_t)(tail[ 2]) << 16;
+ case 2: k1 ^= (uint64_t)(tail[ 1]) << 8;
+ case 1: k1 ^= (uint64_t)(tail[ 0]) << 0;
+ k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+ };
+
+ //----------
+ // finalization
+
+ h1 ^= len; h2 ^= len;
+
+ h1 += h2;
+ h2 += h1;
+
+ h1 = fmix64(h1);
+ h2 = fmix64(h2);
+
+ h1 += h2;
+ h2 += h1;
+
+ ((uint64_t*)out)[0] = h1;
+ ((uint64_t*)out)[1] = h2;
+}
+
+//-----------------------------------------------------------------------------
+
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libhashkit/murmur3.h
^
|
| @@ -0,0 +1,16 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the
+// public domain. The author hereby disclaims copyright to this source
+// code.
+
+#pragma once
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32 (const void *key, int len, uint32_t seed, void *out);
+
+void MurmurHash3_x86_128(const void *key, int len, uint32_t seed, void *out);
+
+void MurmurHash3_x64_128(const void *key, int len, uint32_t seed, void *out);
+
+//-----------------------------------------------------------------------------
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libhashkit/murmur3_api.cc
^
|
| @@ -0,0 +1,49 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * HashKit library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ * 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.
+ *
+ */
+
+#include "libhashkit/common.h"
+#include "libhashkit/murmur3.h"
+
+uint32_t hashkit_murmur3(const char *key, size_t length, void *)
+{
+ const uint32_t seed= (0xdeadbeef * (uint32_t)length);
+
+ uint32_t ret;
+ MurmurHash3_x86_32(key, length, seed, &ret);
+
+ return ret;
+}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/rijndael.cc
^
|
| @@ -63,7 +63,7 @@
#include <assert.h>
#include <stdlib.h>
-#include <libhashkit/rijndael.hpp>
+#include "libhashkit/rijndael.hpp"
/*
Te0[x] = S [x].[02, 01, 01, 03];
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libhashkit/str_algorithm.cc
^
|
| @@ -49,6 +49,7 @@
case HASHKIT_HASH_FNV1A_32: return "FNV1A_32";
case HASHKIT_HASH_HSIEH: return "HSIEH";
case HASHKIT_HASH_MURMUR: return "MURMUR";
+ case HASHKIT_HASH_MURMUR3: return "MURMUR3";
case HASHKIT_HASH_JENKINS: return "JENKINS";
case HASHKIT_HASH_CUSTOM: return "CUSTOM";
default:
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached-1.0/configure.h
^
|
| @@ -44,8 +44,8 @@
#define LIBMEMCACHED_WITH_SASL_SUPPORT 1
-#define LIBMEMCACHED_VERSION_STRING "1.0.14"
-#define LIBMEMCACHED_VERSION_HEX 0x01000014
+#define LIBMEMCACHED_VERSION_STRING "1.0.15"
+#define LIBMEMCACHED_VERSION_HEX 0x01000015
#ifdef __cplusplus
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached-1.0/t/include.am
^
|
| @@ -10,23 +10,23 @@
LIBMEMCACHED_1_0_TEST_PATH= libmemcached-1.0/t
+if SHARED_ENABLED
# Test linking with C application
libmemcached_1_0_t_c_test_SOURCES= libmemcached-1.0/t/c_test.c
libmemcached_1_0_t_c_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_c_test_DEPENDENCIES= libmemcached/libmemcached.la
check_PROGRAMS+= libmemcached-1.0/t/c_test
noinst_PROGRAMS+= libmemcached-1.0/t/c_test
-# Test linking with C++ application
-libmemcached_1_0_t_cc_test_SOURCES= libmemcached-1.0/t/cc_test.cc
-libmemcached_1_0_t_cc_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_cc_test_DEPENDENCIES= libmemcached/libmemcached.la
-check_PROGRAMS+= libmemcached-1.0/t/cc_test
-noinst_PROGRAMS+= libmemcached-1.0/t/cc_test
-
# Test linking with C application/SASL include
libmemcached_1_0_t_c_sasl_test_SOURCES= libmemcached-1.0/t/c_sasl_test.c
libmemcached_1_0_t_c_sasl_test_LDADD= libmemcached/libmemcached.la
-libmemcached_1_0_t_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la
check_PROGRAMS+= libmemcached-1.0/t/c_sasl_test
noinst_PROGRAMS+= libmemcached-1.0/t/c_sasl_test
+else
+endif
+
+# Test linking with C++ application
+libmemcached_1_0_t_cc_test_SOURCES= libmemcached-1.0/t/cc_test.cc
+libmemcached_1_0_t_cc_test_LDADD= libmemcached/libmemcached.la
+check_PROGRAMS+= libmemcached-1.0/t/cc_test
+noinst_PROGRAMS+= libmemcached-1.0/t/cc_test
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached-1.0/types/hash.h
^
|
| @@ -49,6 +49,7 @@
MEMCACHED_HASH_HSIEH,
MEMCACHED_HASH_MURMUR,
MEMCACHED_HASH_JENKINS,
+ MEMCACHED_HASH_MURMUR3,
MEMCACHED_HASH_CUSTOM,
MEMCACHED_HASH_MAX
};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/backtrace.cc
^
|
| @@ -1,8 +1,8 @@
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
*
- * libmcachedd client library.
+ * Libmemcached client library.
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,64 +35,97 @@
*
*/
-#include <libmemcached/common.h>
+#include "mem_config.h"
-#ifdef HAVE_EXECINFO_H
-# include <execinfo.h>
-#endif
+#include "libmemcached/backtrace.hpp"
-#ifdef HAVE_GCC_ABI_DEMANGLE
-# include <cxxabi.h>
-#endif
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
-#ifdef HAVE_DLFCN_H
-# include <dlfcn.h>
+#if defined(HAVE_SHARED_ENABLED) && HAVE_SHARED_ENABLED
+
+#ifdef HAVE_EXECINFO_H
+#include <execinfo.h>
#endif
#ifdef HAVE_GCC_ABI_DEMANGLE
-# define USE_DEMANGLE 1
+# include <cxxabi.h>
+# define USE_DEMANGLE 1
#else
-# define USE_DEMANGLE 0
+# define USE_DEMANGLE 0
#endif
+#ifdef HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
+
const int MAX_DEPTH= 50;
void custom_backtrace(void)
{
#ifdef HAVE_EXECINFO_H
- void *array[MAX_DEPTH];
-
- int backtrace_size= backtrace(array, MAX_DEPTH);
- fprintf(stderr, "Number of stack frames obtained: %d\n", backtrace_size);
-
-#ifdef HAVE_DLFCN_H
- Dl_info dlinfo;
-#endif
+ void *backtrace_buffer[MAX_DEPTH +1];
- for (int x= 0; x < backtrace_size; ++x)
- {
-#ifdef HAVE_DLFCN_H
- if (dladdr(array[x], &dlinfo) == 0)
+ int stack_frames= backtrace(backtrace_buffer, MAX_DEPTH);
+ if (stack_frames)
+ {
+ char **symbollist= backtrace_symbols(backtrace_buffer, stack_frames);
+ if (symbollist)
{
- continue;
- }
-#endif
+ for (int x= 0; x < stack_frames; x++)
+ {
+ bool was_demangled= false;
- const char* symname= dlinfo.dli_sname;
+ if (USE_DEMANGLE)
+ {
+#ifdef HAVE_DLFCN_H
+ Dl_info dlinfo;
+ if (dladdr(backtrace_buffer[x], &dlinfo))
+ {
+ char demangled_buffer[1024];
+ const char *called_in= "<unresolved>";
+ if (dlinfo.dli_sname)
+ {
+ size_t demangled_size= sizeof(demangled_buffer);
+ int status;
+ char* demangled;
+ if ((demangled= abi::__cxa_demangle(dlinfo.dli_sname, demangled_buffer, &demangled_size, &status)))
+ {
+ called_in= demangled;
+ fprintf(stderr, "---> demangled: %s -> %s\n", demangled_buffer, demangled);
+ }
+ else
+ {
+ called_in= dlinfo.dli_sname;
+ }
+
+ was_demangled= true;
+ fprintf(stderr, "#%d %p in %s at %s\n",
+ x, backtrace_buffer[x],
+ called_in,
+ dlinfo.dli_fname);
+ }
+ }
+#endif
+ }
+
+ if (was_demangled == false)
+ {
+ fprintf(stderr, "?%d %p in %s\n", x, backtrace_buffer[x], symbollist[x]);
+ }
+ }
- int status;
- char* demangled= abi::__cxa_demangle(symname, NULL, 0, &status);
- if (status == 0 and demangled)
- {
- symname= demangled;
+ ::free(symbollist);
}
+ }
+#endif // HAVE_EXECINFO_H
+}
- printf("object: %s, function: %s\n", dlinfo.dli_fname, symname);
+#else // HAVE_SHARED_ENABLED
- if (demangled)
- {
- free(demangled);
- }
- }
-#endif // HAVE_EXECINFO_H
+void custom_backtrace(void)
+{
+ fprintf(stderr, "Backtrace null function called\n");
}
+#endif // AX_ENABLE_BACKTRACE
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/behavior.cc
^
|
| @@ -505,7 +505,7 @@
case MEMCACHED_BEHAVIOR_MAX:
default:
- assert_msg(0, "Invalid behavior passed to memcached_behavior_set()");
+ assert_msg(0, "Invalid behavior passed to memcached_behavior_get()");
return 0;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/byteorder.cc
^
|
| @@ -35,7 +35,8 @@
*
*/
-#include <libmemcached/common.h>
+#include "mem_config.h"
+#include "libmemcached/byteorder.h"
/* Byte swap a 64-bit number. */
#ifndef swap64
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/callback.cc
^
|
| @@ -147,7 +147,7 @@
break;
}
- assert_msg(0, "Invalid behavior passed to memcached_behavior_set()");
+ assert_msg(0, "Invalid callback passed to memcached_callback_get()");
*error= MEMCACHED_FAILURE;
return NULL;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/common.h
^
|
| @@ -111,7 +111,9 @@
#include <libmemcached/watchpoint.h>
#include <libmemcached/is.h>
-#include <libmemcached/instance.h>
+#ifdef __cplusplus
+# include "libmemcached/instance.hpp"
+#endif
#include <libmemcached/server_instance.h>
#ifdef HAVE_POLL_H
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/connect.cc
^
|
| @@ -52,6 +52,18 @@
# define FD_CLOEXEC 0
#endif
+#ifndef SO_NOSIGPIPE
+# define SO_NOSIGPIPE 0
+#endif
+
+#ifndef TCP_NODELAY
+# define TCP_NODELAY 0
+#endif
+
+#ifndef TCP_KEEPIDLE
+# define TCP_KEEPIDLE 0
+#endif
+
static memcached_return_t connect_poll(org::libmemcached::Instance* server)
{
struct pollfd fds[1];
@@ -155,11 +167,12 @@
server->address_info_next= NULL;
}
- char str_port[NI_MAXSERV];
- int length= snprintf(str_port, NI_MAXSERV, "%u", uint32_t(server->port()));
- if (length >= NI_MAXSERV or length <= 0)
+ char str_port[MEMCACHED_NI_MAXSERV];
+ int length= snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port()));
+ if (length >= MEMCACHED_NI_MAXSERV or length <= 0)
{
- return MEMCACHED_FAILURE;
+ return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT,
+ memcached_literal_param("snprintf(NI_MAXSERV)"));
}
struct addrinfo hints;
@@ -280,13 +293,38 @@
#endif
}
-static void set_socket_options(org::libmemcached::Instance* server)
+static bool set_socket_options(org::libmemcached::Instance* server)
{
assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()");
+#ifdef HAVE_FCNTL
+ // If SOCK_CLOEXEC exists then we don't need to call the following
+ if (SOCK_CLOEXEC == 0)
+ {
+ if (FD_CLOEXEC)
+ {
+ int flags;
+ do
+ {
+ flags= fcntl(server->fd, F_GETFD, 0);
+ } while (flags == -1 and (errno == EINTR or errno == EAGAIN));
+
+ if (flags != -1)
+ {
+ int rval;
+ do
+ {
+ rval= fcntl (server->fd, F_SETFD, flags | FD_CLOEXEC);
+ } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
+ // we currently ignore the case where rval is -1
+ }
+ }
+ }
+#endif
+
if (memcached_is_udp(server->root))
{
- return;
+ return true;
}
#ifdef HAVE_SNDTIMEO
@@ -321,6 +359,7 @@
#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
+ if (SO_NOSIGPIPE)
{
int set= 1;
int error= setsockopt(server->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
@@ -349,14 +388,17 @@
assert(error == 0);
}
- if (server->root->flags.tcp_nodelay)
+ if (TCP_NODELAY)
{
- int flag= 1;
+ if (server->root->flags.tcp_nodelay)
+ {
+ int flag= 1;
- int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY,
- (char*)&flag, (socklen_t)sizeof(int));
- (void)(error);
- assert(error == 0);
+ int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY,
+ (char*)&flag, (socklen_t)sizeof(int));
+ (void)(error);
+ assert(error == 0);
+ }
}
if (server->root->flags.tcp_keepalive)
@@ -369,15 +411,16 @@
assert(error == 0);
}
-#ifdef TCP_KEEPIDLE
- if (server->root->tcp_keepidle > 0)
+ if (TCP_KEEPIDLE)
{
- int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE,
- (char*)&server->root->tcp_keepidle, (socklen_t)sizeof(int));
- (void)(error);
- assert(error == 0);
+ if (server->root->tcp_keepidle > 0)
+ {
+ int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE,
+ (char*)&server->root->tcp_keepidle, (socklen_t)sizeof(int));
+ (void)(error);
+ assert(error == 0);
+ }
}
-#endif
if (server->root->send_size > 0)
{
@@ -397,6 +440,8 @@
/* libmemcached will always use nonblocking IO to avoid write deadlocks */
set_socket_nonblocking(server);
+
+ return true;
}
static memcached_return_t unix_socket_connect(org::libmemcached::Instance* server)
@@ -519,22 +564,11 @@
return memcached_set_errno(*server, get_socket_errno(), NULL);
}
-#ifdef HAVE_FCNTL
- // If SOCK_CLOEXEC exists then we don't need to call the following
- if (SOCK_CLOEXEC == 0)
+ if (set_socket_options(server) == false)
{
- if (FD_CLOEXEC)
- {
- int rval;
- do
- {
- rval= fcntl (server->fd, F_SETFD, FD_CLOEXEC);
- } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
- }
+ (void)closesocket(server->fd);
+ return MEMCACHED_CONNECTION_FAILURE;
}
-#endif
-
- set_socket_options(server);
/* connect to server */
if ((connect(server->fd, server->address_info_next->ai_addr, server->address_info_next->ai_addrlen) != SOCKET_ERROR))
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/csl/context.h
^
|
| @@ -37,8 +37,8 @@
#pragma once
-#include <libmemcached/csl/common.h>
-#include <libmemcached/csl/parser.h>
+#include "libmemcached/csl/common.h"
+#include "libmemcached/csl/parser.h"
class Context
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/csl/include.am
^
|
| @@ -23,7 +23,10 @@
MAINTAINERCLEANFILES+= libmemcached/csl/scanner.h
MAINTAINERCLEANFILES+= libmemcached/csl/scanner.cc
-BUILT_SOURCES+= libmemcached/csl/parser.h libmemcached/csl/scanner.h
+BUILT_SOURCES+= libmemcached/csl/parser.cc
+BUILT_SOURCES+= libmemcached/csl/parser.h
+BUILT_SOURCES+= libmemcached/csl/scanner.cc
+BUILT_SOURCES+= libmemcached/csl/scanner.h
libmemcached/csl/parser.h: libmemcached/csl/parser.cc
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/error.cc
^
|
| @@ -318,7 +318,7 @@
return rc;
}
- char hostname_port[NI_MAXHOST +NI_MAXSERV + sizeof("host : ")];
+ char hostname_port[MEMCACHED_NI_MAXHOST +MEMCACHED_NI_MAXSERV + sizeof("host : ")];
size_t size= append_host_to_string(self, hostname_port, sizeof(hostname_port));
memcached_string_t error_host= { hostname_port, size};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/fetch.cc
^
|
| @@ -2,7 +2,7 @@
*
* Libmemcached library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011-2012 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
@@ -42,7 +42,6 @@
uint32_t *flags,
memcached_return_t *error)
{
- memcached_result_st *result_buffer= &ptr->result;
memcached_return_t unused;
if (error == NULL)
{
@@ -75,6 +74,7 @@
return NULL;
}
+ memcached_result_st *result_buffer= &ptr->result;
result_buffer= memcached_fetch_result(ptr, result_buffer, error);
if (result_buffer == NULL or memcached_failed(*error))
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/flush.cc
^
|
| @@ -86,7 +86,7 @@
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
- if (memcached_instance_response_count(instance) > 0)
+ if (instance->response_count() > 0)
{
(void)memcached_response(instance, NULL, 0, NULL);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/get.cc
^
|
| @@ -246,7 +246,7 @@
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
- if (memcached_instance_response_count(instance))
+ if (instance->response_count())
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@ -255,7 +255,7 @@
memcached_io_write(instance);
}
- while(memcached_instance_response_count(instance))
+ while(instance->response_count())
{
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
}
@@ -304,7 +304,7 @@
};
- if (memcached_instance_response_count(instance) == 0)
+ if (instance->response_count() == 0)
{
rc= memcached_connect(instance);
@@ -356,7 +356,7 @@
{
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
- if (memcached_instance_response_count(instance))
+ if (instance->response_count())
{
/* We need to do something about non-connnected hosts in the future */
if ((memcached_io_write(instance, "\r\n", 2, true)) == -1)
@@ -480,7 +480,7 @@
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server_key);
- if (memcached_instance_response_count(instance) == 0)
+ if (instance->response_count() == 0)
{
rc= memcached_connect(instance);
if (memcached_failed(rc))
@@ -554,7 +554,7 @@
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, x);
initialize_binary_request(instance, request.message.header);
- if (memcached_instance_response_count(instance))
+ if (instance->response_count())
{
if (memcached_io_write(instance) == false)
{
@@ -624,7 +624,7 @@
org::libmemcached::Instance* instance= memcached_instance_fetch(ptr, server);
- if (memcached_instance_response_count(instance) == 0)
+ if (instance->response_count() == 0)
{
rc= memcached_connect(instance);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/hosts.cc
^
|
| @@ -36,6 +36,7 @@
*/
#include <libmemcached/common.h>
+#include "libmemcached/assert.hpp"
#include <cmath>
#include <sys/time.h>
@@ -194,6 +195,7 @@
ptr->ketama.continuum= new_ptr;
ptr->ketama.continuum_count= live_servers + MEMCACHED_CONTINUUM_ADDITION;
}
+ assert_msg(ptr->ketama.continuum, "Programmer Error, empty ketama continuum");
uint64_t total_weight= 0;
if (memcached_is_weighted_ketama(ptr))
@@ -327,9 +329,9 @@
pointer_counter+= pointer_per_server;
}
- WATCHPOINT_ASSERT(ptr);
- WATCHPOINT_ASSERT(ptr->ketama.continuum);
- WATCHPOINT_ASSERT(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE);
+ assert_msg(ptr, "Programmer Error, no valid ptr");
+ assert_msg(ptr->ketama.continuum, "Programmer Error, empty ketama continuum");
+ assert_msg(memcached_server_count(ptr) * MEMCACHED_POINTS_PER_SERVER <= MEMCACHED_CONTINUUM_SIZE, "invalid size information being given to qsort()");
ptr->ketama.continuum_points_counter= pointer_counter;
qsort(ptr->ketama.continuum, ptr->ketama.continuum_points_counter, sizeof(memcached_continuum_item_st), continuum_item_cmp);
@@ -580,7 +582,7 @@
in_port_t port,
uint32_t weight)
{
- char buffer[NI_MAXHOST];
+ char buffer[MEMCACHED_NI_MAXHOST];
memcpy(buffer, hostname, hostname_length);
buffer[hostname_length]= 0;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/include.am
^
|
| @@ -26,7 +26,6 @@
noinst_HEADERS+= libmemcached/error.hpp
noinst_HEADERS+= libmemcached/flag.hpp
noinst_HEADERS+= libmemcached/initialize_query.h
-noinst_HEADERS+= libmemcached/instance.h
noinst_HEADERS+= libmemcached/instance.hpp
noinst_HEADERS+= libmemcached/internal.h
noinst_HEADERS+= libmemcached/io.h
@@ -52,8 +51,10 @@
noinst_HEADERS+= libmemcached/watchpoint.h
lib_LTLIBRARIES+= libmemcached/libmemcached.la
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
+libmemcached_libmemcached_la_LIBADD=
+libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
-
libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
libmemcached_libmemcached_la_SOURCES+= libmemcached/instance.cc
@@ -110,17 +111,15 @@
libmemcached/options.cc: libmemcached/csl/parser.h
-
-libmemcached_libmemcached_la_DEPENDENCIES=
-libmemcached_libmemcached_la_LIBADD=
-libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
-libmemcached_libmemcached_la_LDFLAGS+= $(DL_LIB)
+libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
if HAVE_SASL
+if HAVE_LIBSASL
libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
-libmemcached_libmemcached_la_LIBADD+= @SASL_LDFLAGS@
+libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
+endif
endif
if HAVE_DTRACE
@@ -128,7 +127,7 @@
CLEANFILES+= libmemcached/dtrace_probes.h
CLEANFILES+= libmemcached/libmemcached_probes.o
-libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES += libmemcached/libmemcached_probes.o
libmemcached_libmemcached_la_LIBADD += libmemcached/libmemcached_probes.o
libmemcached_libmemcached_la_SOURCES += libmemcached/libmemcached_probes.d
endif
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/instance.cc
^
|
| @@ -170,31 +170,10 @@
void memcached_instance_free(org::libmemcached::Instance* self)
{
- if (self == NULL)
- {
- return;
- }
-
- __instance_free(self);
-}
-
-/*
- If we do not have a valid object to clone from, we toss an error.
-*/
-memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source)
-{
- /* We just do a normal create if source is missing */
- if (source == NULL)
+ if (self)
{
- return NULL;
+ __instance_free(self);
}
-
- memcached_string_t hostname= { memcached_string_make_from_cstr(source->hostname) };
- return __server_create_with(source->root, NULL,
- hostname,
- source->port(), source->weight,
- source->type);
-
}
memcached_return_t memcached_server_cursor(const memcached_st *ptr,
@@ -341,26 +320,6 @@
return (memcached_server_instance_st)self->last_disconnected_server;
}
-const char *memcached_instance_name(const memcached_server_instance_st self)
-{
- WATCHPOINT_ASSERT(self);
- if (self == NULL)
- return NULL;
-
- return self->hostname;
-}
-
-in_port_t memcached_instance_port(const memcached_server_instance_st self)
-{
- WATCHPOINT_ASSERT(self);
- if (self == NULL)
- {
- return 0;
- }
-
- return self->port();
-}
-
void memcached_instance_next_retry(memcached_server_instance_st self, const time_t absolute_time)
{
WATCHPOINT_ASSERT(self);
@@ -369,14 +328,3 @@
((org::libmemcached::Instance*)self)->next_retry= absolute_time;
}
}
-
-uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self)
-{
- WATCHPOINT_ASSERT(self);
- if (self == NULL)
- {
- return 0;
- }
-
- return self->cursor_active_;
-}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/instance.hpp
^
|
| @@ -38,6 +38,102 @@
#pragma once
+#ifndef WIN32
+# ifdef HAVE_NETDB_H
+# include <netdb.h>
+# endif
+#endif
+
+#ifdef NI_MAXHOST
+# define MEMCACHED_NI_MAXHOST NI_MAXHOST
+#else
+# define MEMCACHED_NI_MAXHOST 1025
+#endif
+
+#ifdef NI_MAXSERV
+# define MEMCACHED_NI_MAXSERV NI_MAXSERV
+#else
+# define MEMCACHED_NI_MAXSERV 32
+#endif
+
+namespace org {
+namespace libmemcached {
+
+// @todo Complete class transformation
+struct Instance {
+ in_port_t port() const
+ {
+ return port_;
+ }
+
+ void port(in_port_t arg)
+ {
+ port_= arg;
+ }
+
+ void mark_server_as_clean()
+ {
+ server_failure_counter= 0;
+ next_retry= 0;
+ }
+
+ void disable()
+ {
+ }
+
+ void enable()
+ {
+ }
+
+ uint32_t response_count() const
+ {
+ return cursor_active_;
+ }
+
+ struct {
+ bool is_allocated:1;
+ bool is_initialized:1;
+ bool is_shutting_down:1;
+ bool is_dead:1;
+ } options;
+ uint32_t cursor_active_;
+ in_port_t port_;
+ memcached_socket_t fd;
+ uint32_t io_bytes_sent; /* # bytes sent since last read */
+ uint32_t request_id;
+ uint32_t server_failure_counter;
+ uint64_t server_failure_counter_query_id;
+ uint32_t weight;
+ uint32_t version;
+ enum memcached_server_state_t state;
+ struct {
+ uint32_t read;
+ uint32_t write;
+ uint32_t timeouts;
+ size_t _bytes_read;
+ } io_wait_count;
+ uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
+ uint8_t micro_version; // ditto, and note that this is the third, not second version bit
+ uint8_t minor_version; // ditto
+ memcached_connection_t type;
+ char *read_ptr;
+ size_t read_buffer_length;
+ size_t read_data_length;
+ size_t write_buffer_offset;
+ struct addrinfo *address_info;
+ struct addrinfo *address_info_next;
+ time_t next_retry;
+ struct memcached_st *root;
+ uint64_t limit_maxbytes;
+ struct memcached_error_t *error_messages;
+ char read_buffer[MEMCACHED_MAX_BUFFER];
+ char write_buffer[MEMCACHED_MAX_BUFFER];
+ char hostname[MEMCACHED_NI_MAXHOST];
+};
+
+} // namespace libmemcached
+} // namespace org
+
org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
org::libmemcached::Instance* self,
const memcached_string_t& hostname,
@@ -45,14 +141,6 @@
uint32_t weight,
const memcached_connection_t type);
-const char *memcached_instance_name(const org::libmemcached::Instance* self);
-
-in_port_t memcached_instance_port(const org::libmemcached::Instance* self);
-
memcached_return_t memcached_instance_push(memcached_st *ptr, const org::libmemcached::Instance*, uint32_t);
-memcached_server_st *memcached_instance_2_server(org::libmemcached::Instance* source);
-
-uint32_t memcached_instance_response_count(const org::libmemcached::Instance* self);
-
void __instance_free(org::libmemcached::Instance *);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/io.cc
^
|
| @@ -79,10 +79,10 @@
do {
/* Just try a single read to grab what's available */
ssize_t nr;
- if ((nr= recv(ptr->fd,
+ if ((nr= ::recv(ptr->fd,
ptr->read_ptr + ptr->read_data_length,
MEMCACHED_MAX_BUFFER - ptr->read_data_length,
- MSG_DONTWAIT)) <= 0)
+ MSG_DONTWAIT|MSG_NOSIGNAL)) <= 0)
{
if (nr == 0)
{
@@ -419,7 +419,7 @@
ssize_t data_read;
do
{
- data_read= ::recv(ptr->fd, ptr->read_buffer, MEMCACHED_MAX_BUFFER, MSG_DONTWAIT);
+ data_read= ::recv(ptr->fd, ptr->read_buffer, MEMCACHED_MAX_BUFFER, MSG_DONTWAIT|MSG_NOSIGNAL);
if (data_read == SOCKET_ERROR)
{
switch (get_socket_errno())
@@ -557,7 +557,7 @@
char buffer[MEMCACHED_MAX_BUFFER];
do
{
- data_read= recv(ptr->fd, ptr->read_buffer, sizeof(buffer), MSG_DONTWAIT);
+ data_read= ::recv(ptr->fd, ptr->read_buffer, sizeof(buffer), MSG_DONTWAIT|MSG_NOSIGNAL);
if (data_read == SOCKET_ERROR)
{
switch (get_socket_errno())
@@ -742,7 +742,7 @@
return instance;
}
- if (memcached_instance_response_count(instance) > 0)
+ if (instance->response_count() > 0)
{
fds[host_index].events= POLLIN;
fds[host_index].revents= 0;
@@ -758,7 +758,7 @@
{
org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
- if (memcached_instance_response_count(instance) > 0)
+ if (instance->response_count() > 0)
{
return instance;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/is.h
^
|
| @@ -83,7 +83,7 @@
#define memcached_has_replicas(__object) ((__object)->root->number_of_replicas)
#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_initialized(__object, __value) ((__object)->options.is_initialized= (__value))
#define memcached_set_allocated(__object, __value) ((__object)->options.is_allocated= (__value))
#define memcached_set_weighted_ketama(__object, __value) ((__object)->ketama.weighted_= (__value))
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/memcached.cc
^
|
| @@ -144,6 +144,7 @@
}
libmemcached_free(ptr, ptr->ketama.continuum);
+ ptr->ketama.continuum= NULL;
memcached_array_free(ptr->_namespace);
ptr->_namespace= NULL;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcached/sasl.cc
^
|
| @@ -67,8 +67,8 @@
*/
static memcached_return_t resolve_names(org::libmemcached::Instance& server, char *laddr, size_t laddr_length, char *raddr, size_t raddr_length)
{
- char host[NI_MAXHOST];
- char port[NI_MAXSERV];
+ char host[MEMCACHED_NI_MAXHOST];
+ char port[MEMCACHED_NI_MAXSERV];
struct sockaddr_storage saddr;
socklen_t salen= sizeof(saddr);
@@ -180,8 +180,8 @@
assert_msg(server->fd != INVALID_SOCKET, "Programmer error, invalid socket");
/* set ip addresses */
- char laddr[NI_MAXHOST + NI_MAXSERV];
- char raddr[NI_MAXHOST + NI_MAXSERV];
+ char laddr[MEMCACHED_NI_MAXHOST + MEMCACHED_NI_MAXSERV];
+ char raddr[MEMCACHED_NI_MAXHOST + MEMCACHED_NI_MAXSERV];
if (memcached_failed(rc= resolve_names(*server, laddr, sizeof(laddr), raddr, sizeof(raddr))))
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedinternal/include.am
^
|
| @@ -7,6 +7,8 @@
# will not be exposed in the shipped .so
noinst_LTLIBRARIES+= libmemcachedinternal/libmemcachedinternal.la
+if HAVE_DTRACE
+else
libmemcachedinternal_libmemcachedinternal_la_SOURCES= $(libmemcached_libmemcached_la_SOURCES)
libmemcachedinternal_libmemcachedinternal_la_CFLAGS= \
${AM_CFLAGS} \
@@ -20,6 +22,6 @@
${AM_CXXFLAGS} \
${NO_CONVERSION} \
-DBUILDING_LIBMEMCACHEDINTERNAL
-libmemcachedinternal_libmemcachedinternal_la_LDFLAGS= ${AM_LDFLAGS}
libmemcachedinternal_libmemcachedinternal_la_LIBADD= $(libmemcached_libmemcached_la_LIBADD)
-libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(libmemcached_libmemcached_la_DEPENDENCIES)
+EXTRA_libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(EXTRA_libmemcached_libmemcached_la_DEPENDENCIES)
+endif
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedinternal/util/include.am
^
|
| @@ -12,8 +12,6 @@
${AM_CXXFLAGS} \
${NO_CONVERSION} \
-DBUILDING_LIBMEMCACHEDINTERNAL
-libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
-libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la ${PTHREAD_LIBS}
-libmemcachedinternal_libmemcachedutilinternal_la_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la
-
-
+libmemcachedinternal_libmemcachedutilinternal_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD= libmemcachedinternal/libmemcachedinternal.la
+libmemcachedinternal_libmemcachedutilinternal_la_LIBADD+= @PTHREAD_LIBS@
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedprotocol/binary_handler.c
^
|
| @@ -76,7 +76,7 @@
return PROTOCOL_BINARY_RESPONSE_EINTERNAL;
}
- size_t len= sizeof(protocol_binary_response_header) + memcached_htonl(response->response.bodylen);
+ size_t len= sizeof(protocol_binary_response_header) + htonl(response->response.bodylen);
size_t offset= 0;
char *ptr= (void*)response;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedprotocol/cache.c
^
|
| @@ -35,7 +35,7 @@
*/
/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include "config.h"
+#include "mem_config.h"
#include <stdlib.h>
#include <string.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedprotocol/common.h
^
|
| @@ -36,7 +36,7 @@
#pragma once
-#include "config.h"
+#include "mem_config.h"
#include <assert.h>
#include <libmemcachedprotocol-0.0/handler.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedprotocol/include.am
^
|
| @@ -22,13 +22,15 @@
libmemcached_libmemcachedprotocol_la_CFLAGS+= ${AM_CFLAGS}
libmemcached_libmemcachedprotocol_la_CFLAGS+= ${NO_CONVERSION}
libmemcached_libmemcachedprotocol_la_CFLAGS+= -DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedprotocol_la_CFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CFLAGS+= @PTHREAD_CFLAGS@
libmemcached_libmemcachedprotocol_la_CXXFLAGS=
libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${AM_CXXFLAGS}
libmemcached_libmemcachedprotocol_la_CXXFLAGS+= -DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CXXFLAGS+= @PTHREAD_CFLAGS@
-libmemcached_libmemcachedprotocol_la_LIBADD= ${PTHREAD_LIBS}
+libmemcached_libmemcachedprotocol_la_LIBADD=
+libmemcached_libmemcachedprotocol_la_LIBADD+= @LIBEVENT_LIB@
+libmemcached_libmemcachedprotocol_la_LIBADD+= @PTHREAD_LIBS@
libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS}
libmemcached_libmemcachedprotocol_la_LDFLAGS+= -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libmemcachedutil/include.am
^
|
| @@ -4,8 +4,7 @@
lib_LTLIBRARIES+= libmemcached/libmemcachedutil.la
-noinst_HEADERS+= \
- libmemcachedutil/common.h
+noinst_HEADERS+= libmemcachedutil/common.h
libmemcached_libmemcachedutil_la_SOURCES= \
libmemcached/backtrace.cc \
@@ -14,13 +13,14 @@
libmemcachedutil/ping.cc \
libmemcachedutil/pool.cc \
libmemcachedutil/version.cc
-libmemcached_libmemcachedutil_la_CXXFLAGS= \
+libmemcached_libmemcachedutil_la_LIBADD=
+libmemcached_libmemcachedutil_la_LDFLAGS=
+libmemcached_libmemcachedutil_la_CXXFLAGS=
+libmemcached_libmemcachedutil_la_CXXFLAGS+= \
${AM_CXXFLAGS} \
${NO_CONVERSION} \
-DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedutil_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
-libmemcached_libmemcachedutil_la_LIBADD= libmemcached/libmemcached.la
-libmemcached_libmemcachedutil_la_LIBADD+= ${PTHREAD_LIBS}
-libmemcached_libmemcachedutil_la_LDFLAGS= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
-libmemcached_libmemcachedutil_la_DEPENDENCIES= libmemcached/libmemcached.la
-
+libmemcached_libmemcachedutil_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libmemcached_libmemcachedutil_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_UTIL_LIBRARY_VERSION}
+libmemcached_libmemcachedutil_la_LIBADD+= libmemcached/libmemcached.la
+libmemcached_libmemcachedutil_la_LIBADD+= @PTHREAD_LIBS@
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/alarm.cc
^
|
| @@ -34,7 +34,8 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
+
#include <libtest/common.h>
#include <sys/time.h>
@@ -59,6 +60,22 @@
void set_alarm(long tv_sec, long tv_usec)
{
+ // For the moment use any value to YATL_ALARM to cancel alarming.
+ if (getenv("YATL_ALARM"))
+ {
+ errno= 0;
+ tv_sec= strtol(getenv("YATL_ALARM"), (char **) NULL, 10);
+
+ if (errno != 0)
+ {
+ fatal_message("Bad value for YATL_ALARM");
+ }
+ else if (tv_sec == 0)
+ {
+ cancel_alarm();
+ }
+ }
+
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
struct timeval it_value= { time_t(tv_sec), suseconds_t(tv_usec) };
#else
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libtest/backtrace_test.cc
^
|
| @@ -0,0 +1,123 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+#include <cerrno>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+#include "libmemcached/backtrace.hpp"
+
+class Test {
+public:
+ Test()
+ {
+ }
+
+ void call_backtrace()
+ {
+ std::cerr << __func__ << std::endl;
+ custom_backtrace();
+ }
+};
+
+void SIGSEGV_handler(int sig_num, siginfo_t* info, void* ucontext)
+{
+ std::cerr << __func__ << std::endl;
+ (void)sig_num;
+ (void)info;
+ (void)ucontext;
+
+ custom_backtrace();
+}
+
+int raise_SIGSEGV()
+{
+ std::cerr << std::endl << "Calling backtrace()" << std::endl;
+ custom_backtrace();
+ std::cerr << std::endl << "Calling raise()" << std::endl;
+ return raise(SIGSEGV);
+}
+
+int layer4()
+{
+ return raise_SIGSEGV();
+}
+
+int layer3()
+{
+ return layer4();
+}
+
+int layer2()
+{
+ return layer3();
+}
+
+int layer1()
+{
+ return layer2();
+}
+
+int main(int, char **)
+{
+ Test t;
+
+ t.call_backtrace();
+
+ struct sigaction sigact;
+
+ sigact.sa_sigaction= SIGSEGV_handler;
+ sigact.sa_flags= SA_RESTART | SA_SIGINFO;
+
+ if (sigaction(SIGSEGV, &sigact, (struct sigaction *)NULL) != 0)
+ {
+ std::cerr << "error setting signal handler for " << strsignal(SIGSEGV) << "(" << SIGSEGV << ")" << std::endl;
+
+ exit(EXIT_FAILURE);
+ }
+
+ int ret= layer1();
+ if (ret)
+ {
+ std::cerr << "raise() " << strerror(errno) << std::endl;
+ exit(EXIT_FAILURE);
+ }
+
+ exit(EXIT_SUCCESS);
+}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/binaries.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/blobslap_worker.cc
^
|
| @@ -35,7 +35,7 @@
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/client.cc
^
|
| @@ -34,19 +34,18 @@
*
*/
-#include "mem_config.h"
-
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
-#ifdef HAVE_POLL_H
-# include <poll.h>
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
#include <string>
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#endif
+
#ifndef HAVE_MSG_NOSIGNAL
# define MSG_NOSIGNAL 0
#endif
@@ -54,6 +53,7 @@
namespace libtest {
SimpleClient::SimpleClient(const std::string& hostname_, in_port_t port_) :
+ _is_connected(false),
_hostname(hostname_),
_port(port_),
sock_fd(INVALID_SOCKET),
@@ -68,7 +68,13 @@
fds[0].events= event_;
fds[0].revents= 0;
- int ready_fds= poll(fds, 1, 5000);
+ int timeout= 5000;
+ if (_is_connected == false)
+ {
+ timeout= timeout * 30;
+ }
+
+ int ready_fds= poll(fds, 1, timeout);
if (ready_fds == -1)
{
@@ -98,6 +104,7 @@
return false;
}
+ _is_connected= true;
if (fds[0].revents & event_)
{
return true;
@@ -118,11 +125,12 @@
hints.ai_socktype= SOCK_STREAM;
hints.ai_protocol= IPPROTO_TCP;
- char service[NI_MAXSERV];
- (void)snprintf(service, NI_MAXSERV, "%d", _port);
+ libtest::vchar_t service;
+ service.resize(NI_MAXSERV);
+ (void)snprintf(&service[0], service.size(), "%d", _port);
int getaddrinfo_error;
- if ((getaddrinfo_error= getaddrinfo(_hostname.c_str(), service, &hints, &ai)) != 0)
+ if ((getaddrinfo_error= getaddrinfo(_hostname.c_str(), &service[0], &hints, &ai)) != 0)
{
if (getaddrinfo_error != EAI_SYSTEM)
{
@@ -146,12 +154,16 @@
void SimpleClient::close_socket()
{
- close(sock_fd);
- sock_fd= INVALID_SOCKET;
+ if (sock_fd != INVALID_SOCKET)
+ {
+ close(sock_fd);
+ sock_fd= INVALID_SOCKET;
+ }
}
bool SimpleClient::instance_connect()
{
+ _is_connected= false;
struct addrinfo *ai;
if ((ai= lookup()))
{
@@ -200,16 +212,13 @@
return true;
}
-bool SimpleClient::message(const std::string& arg)
+bool SimpleClient::message(const char* ptr, const size_t len)
{
if (is_valid())
{
if (ready(POLLOUT))
{
off_t offset= 0;
- const char* ptr= arg.c_str();
- size_t len= arg.size();
-
do
{
ssize_t nw= send(sock_fd, ptr + offset, len - offset, MSG_NOSIGNAL);
@@ -238,9 +247,20 @@
bool SimpleClient::send_message(const std::string& arg)
{
- if (message(arg) == true)
+ if (message(arg.c_str(), arg.size()) == true)
{
- return message("\r\n");
+ return message("\r\n", 2);
+ }
+
+ return false;
+}
+
+bool SimpleClient::send_data(const libtest::vchar_t& message_, libtest::vchar_t& response_)
+{
+ requested_message++;
+ if (message(&message_[0], message_.size()))
+ {
+ return response(response_);
}
return false;
@@ -257,6 +277,53 @@
return false;
}
+bool SimpleClient::response(libtest::vchar_t& response_)
+{
+ response_.clear();
+
+ if (is_valid())
+ {
+ if (ready(POLLIN))
+ {
+ bool more= true;
+ char buffer[2];
+ buffer[1]= 0;
+ do
+ {
+ ssize_t nr= recv(sock_fd, buffer, 1, MSG_NOSIGNAL);
+ if (nr == -1)
+ {
+ if (errno != EINTR)
+ {
+ _error= strerror(errno);
+ return false;
+ }
+ }
+ else if (nr == 0)
+ {
+ close_socket();
+ more= false;
+ }
+ else
+ {
+ response_.reserve(response_.size() + nr +1);
+ fatal_assert(nr == 1);
+ if (buffer[0] == '\n')
+ {
+ more= false;
+ }
+ response_.insert(response_.end(), buffer, buffer +nr);
+ }
+ } while (more);
+
+ return response_.size();
+ }
+ }
+
+ fatal_assert(_error.size());
+ return false;
+}
+
bool SimpleClient::response(std::string& response_)
{
response_.clear();
@@ -279,6 +346,11 @@
return false;
}
}
+ else if (nr == 0)
+ {
+ close_socket();
+ more= false;
+ }
else
{
fatal_assert(nr == 1);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/client.hpp
^
|
| @@ -43,9 +43,11 @@
SimpleClient(const std::string& hostname_, in_port_t port_);
~SimpleClient();
- bool send_message(const std::string& arg);
- bool send_message(const std::string& message_, std::string& response_);
+ bool send_data(const libtest::vchar_t&, libtest::vchar_t&);
+ bool send_message(const std::string&);
+ bool send_message(const std::string&, std::string&);
bool response(std::string&);
+ bool response(libtest::vchar_t&);
bool is_valid();
@@ -63,10 +65,11 @@
void close_socket();
bool instance_connect();
struct addrinfo* lookup();
- bool message(const std::string&);
+ bool message(const char* ptr, const size_t len);
bool ready(int event_);
private:
+ bool _is_connected;
std::string _hostname;
in_port_t _port;
int sock_fd;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/cmdline.cc
^
|
| @@ -34,7 +34,8 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
+
#include "libtest/common.h"
using namespace libtest;
@@ -74,8 +75,8 @@
std::stringstream arg_buffer;
for (vchar_ptr_t::iterator iter= built_argv.begin();
- iter == built_argv.end();
- iter++)
+ iter != built_argv.end();
+ ++iter)
{
arg_buffer << *iter << " ";
}
@@ -426,7 +427,7 @@
error_string+= built_argv[0];
throw std::logic_error(error_string);
}
- else if WIFSIGNALED(_status)
+ else if (WIFSIGNALED(_status))
{
if (WTERMSIG(_status) != SIGTERM and WTERMSIG(_status) != SIGHUP)
{
@@ -438,9 +439,14 @@
}
// If we terminted it on purpose then it counts as a success.
- Out << "waitpid() application terminated at request"
- << " pid:" << _pid
- << " name:" << built_argv[0];
+#if defined(DEBUG)
+ if (DEBUG)
+ {
+ Out << "waitpid() application terminated at request"
+ << " pid:" << _pid
+ << " name:" << built_argv[0];
+ }
+#endif
}
else
{
@@ -515,9 +521,10 @@
bool data_was_read= false;
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
ssize_t read_length;
- char buffer[1024]= { 0 };
- while ((read_length= ::read(_pipe_fd[READ], buffer, sizeof(buffer))))
+ while ((read_length= ::read(_pipe_fd[READ], &buffer[0], buffer.size())))
{
if (read_length == -1)
{
@@ -704,10 +711,11 @@
built_argv.push_back(strdup("--free-fill=DE"));
std::string log_file= create_tmpfile("valgrind");
- char buffer[1024];
- int length= snprintf(buffer, sizeof(buffer), "--log-file=%s", log_file.c_str());
- fatal_assert(length > 0 and size_t(length) < sizeof(buffer));
- built_argv.push_back(strdup(buffer));
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
+ int length= snprintf(&buffer[0], buffer.size(), "--log-file=%s", log_file.c_str());
+ fatal_assert(length > 0 and size_t(length) < buffer.size());
+ built_argv.push_back(strdup(&buffer[0]));
}
else if (_use_ptrcheck)
{
@@ -718,10 +726,11 @@
built_argv.push_back(strdup("--error-exitcode=1"));
built_argv.push_back(strdup("--tool=exp-ptrcheck"));
std::string log_file= create_tmpfile("ptrcheck");
- char buffer[1024];
- int length= snprintf(buffer, sizeof(buffer), "--log-file=%s", log_file.c_str());
- fatal_assert(length > 0 and size_t(length) < sizeof(buffer));
- built_argv.push_back(strdup(buffer));
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
+ int length= snprintf(&buffer[0], buffer.size(), "--log-file=%s", log_file.c_str());
+ fatal_assert(length > 0 and size_t(length) < buffer.size());
+ built_argv.push_back(&buffer[0]);
}
else if (_use_gdb)
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/collection.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
@@ -85,7 +85,7 @@
_skipped(0),
_failed(0),
_total(0),
- _formatter(_name)
+ _formatter(frame_arg->name(), _name)
{
fatal_assert(arg);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/comparison.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
namespace libtest {
@@ -65,6 +65,11 @@
{
return true;
}
+
+ if (bool(getenv("LIBTEST_IN_GDB")))
+ {
+ return true;
+ }
return false;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/core.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/core_count.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <cstdlib>
#include <fcntl.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/cpu.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <unistd.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/dns.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <sys/types.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/dream.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/drizzled.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/drizzled.h>
@@ -182,9 +182,10 @@
{
if (arg > 0)
{
- char buffer[1024];
- snprintf(buffer, sizeof(buffer), "--drizzle-protocol.port=%d", int(arg));
- app.add_option(buffer);
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
+ snprintf(&buffer[1024], buffer.size(), "--drizzle-protocol.port=%d", int(arg));
+ app.add_option(&buffer[1024]);
}
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/fatal.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdarg>
@@ -108,4 +108,3 @@
}
} // namespace libtest
-
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/formatter.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
@@ -88,9 +88,11 @@
libtest::Timer _timer;
};
-Formatter::Formatter(const std::string& arg) :
- _suite_name(arg)
+Formatter::Formatter(const std::string& frame_name, const std::string& arg)
{
+ _suite_name= frame_name;
+ _suite_name+= ".";
+ _suite_name+= arg;
}
Formatter::~Formatter()
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/formatter.hpp
^
|
| @@ -48,7 +48,7 @@
class Formatter {
public:
- Formatter(const std::string& arg);
+ Formatter(const std::string& frame_name, const std::string& arg);
~Formatter();
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/framework.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/collection.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/gearmand.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/gearmand.h>
@@ -67,10 +67,12 @@
{
private:
public:
- Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary= GEARMAND_BINARY);
+ Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary);
bool ping()
{
+ reset_error();
+
if (out_of_ban_killed())
{
return false;
@@ -79,7 +81,14 @@
SimpleClient client(_hostname, _port);
std::string response;
- return client.send_message("version", response);
+ bool ret= client.send_message("version", response);
+
+ if (client.is_error())
+ {
+ error(client.error());
+ }
+
+ return ret;
}
const char *name()
@@ -121,8 +130,8 @@
bool build(size_t argc, const char *argv[]);
};
-Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary_arg) :
- libtest::Server(host_arg, port_arg, binary_arg, true)
+Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary_arg) :
+ libtest::Server(host_arg, port_arg, binary_arg, libtool_)
{
set_pid_file();
}
@@ -146,14 +155,28 @@
namespace libtest {
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port)
-{
- return new Gearmand(hostname, try_port);
-}
-
libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary)
{
- return new Gearmand(hostname, try_port, binary);
+ if (binary == NULL)
+ {
+#if defined(GEARMAND_BINARY)
+ binary= GEARMAND_BINARY;
+#endif
+ }
+
+ if (binary == NULL)
+ {
+ return NULL;
+ }
+
+ bool is_libtool_script= true;
+
+ if (binary[0] == '/')
+ {
+ is_libtool_script= false;
+ }
+
+ return new Gearmand(hostname, try_port, is_libtool_script, binary);
}
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/gearmand.h
^
|
| @@ -40,8 +40,6 @@
namespace libtest {
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port);
-
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary);
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary= NULL);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/has.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdlib>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/http.cc
^
|
| @@ -34,11 +34,11 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
-#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H
+#if defined(HAVE_LIBCURL) && HAVE_LIBCURL
#include <curl/curl.h>
#else
class CURL;
@@ -47,14 +47,14 @@
static void cleanup_curl(void)
{
-#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H
+#if defined(HAVE_LIBCURL) && HAVE_LIBCURL
curl_global_cleanup();
#endif
}
static void initialize_curl_startup()
{
-#if defined(HAVE_CURL_CURL_H) && HAVE_CURL_CURL_H
+#if defined(HAVE_LIBCURL) && HAVE_LIBCURL
if (curl_global_init(CURL_GLOBAL_ALL))
{
fatal_message("curl_global_init(CURL_GLOBAL_ALL) failed");
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/include.am
^
|
| @@ -12,6 +12,7 @@
MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif
GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1
+PAHOLE_COMMAND= $(LIBTOOL_COMMAND) --mode=execute pahole
export LIBTOOL_COMMAND
export VALGRIND_COMMAND
@@ -34,8 +35,6 @@
EXTRA_DIST+= libtest/run.gdb
EXTRA_DIST+= libtest/version.h
-CLEANFILES+= tmp_chroot
-
BUILT_SOURCES+= libtest/version.h
.PHONY: clean-libtest-check
@@ -74,6 +73,7 @@
noinst_HEADERS+= libtest/memcached.hpp
noinst_HEADERS+= libtest/poll_error.hpp
noinst_HEADERS+= libtest/port.h
+noinst_HEADERS+= libtest/result.hpp
noinst_HEADERS+= libtest/runner.h
noinst_HEADERS+= libtest/server.h
noinst_HEADERS+= libtest/server_container.h
@@ -84,6 +84,7 @@
noinst_HEADERS+= libtest/string.hpp
noinst_HEADERS+= libtest/test.h
noinst_HEADERS+= libtest/test.hpp
+noinst_HEADERS+= libtest/thread.hpp
noinst_HEADERS+= libtest/tmpfile.hpp
noinst_HEADERS+= libtest/vchar.hpp
noinst_HEADERS+= libtest/version.h
@@ -93,7 +94,7 @@
noinst_LTLIBRARIES+= libtest/libtest.la
libtest_libtest_la_CXXFLAGS=
-libtest_libtest_la_DEPENDENCIES=
+EXTRA_libtest_libtest_la_DEPENDENCIES=
libtest_libtest_la_LIBADD=
libtest_libtest_la_SOURCES=
@@ -118,6 +119,7 @@
libtest_libtest_la_SOURCES+= libtest/libtool.cc
libtest_libtest_la_SOURCES+= libtest/main.cc
libtest_libtest_la_SOURCES+= libtest/port.cc
+libtest_libtest_la_SOURCES+= libtest/result.cc
libtest_libtest_la_SOURCES+= libtest/runner.cc
libtest_libtest_la_SOURCES+= libtest/server.cc
libtest_libtest_la_SOURCES+= libtest/server_container.cc
@@ -129,37 +131,30 @@
libtest_libtest_la_SOURCES+= libtest/vchar.cc
libtest_libtest_la_CXXFLAGS+= -DBUILDING_LIBTEST
-libtest_libtest_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libtest_libtest_la_CXXFLAGS+= @PTHREAD_CFLAGS@
libtest_libtest_la_CXXFLAGS+= -DLIBTEST_TEMP="\"tmp_chroot\""
libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS)
-libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS)
+libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@
libtest_libtest_la_LIBADD+= $(CURL_LIBS)
-libtest_libtest_la_LIBADD+= $(RT_LIB)
+libtest_libtest_la_LIBADD+= @RT_LIB@
-libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
-libtest_libtest_la_DEPENDENCIES+=libtest/abort
-libtest_libtest_la_DEPENDENCIES+=libtest/wait
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
# Declare unittest so that we can append to it
libtest_unittest_CXXFLAGS=
libtest_unittest_LDADD=
-libtest_unittest_DEPENDENCIES=
# We are either building in tree, or with
if BUILDING_LIBMEMCACHED
-libtest_libtest_la_DEPENDENCIES+= libmemcached/libmemcached.la
-libtest_libtest_la_DEPENDENCIES+= libmemcached/libmemcachedutil.la
libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la
-libtest_libtest_la_LIBADD+= libmemcached/libmemcachedutil.la
libtest_libtest_la_SOURCES+= libtest/memcached.cc
libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED
libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED
libtest_unittest_LDADD+= libmemcached/libmemcached.la
-libtest_unittest_LDADD+= libmemcached/libmemcachedutil.la
-libtest_unittest_DEPENDENCIES+= libmemcached/libmemcached.la
-libtest_unittest_DEPENDENCIES+= libmemcached/libmemcachedutil.la
else
if HAVE_LIBMEMCACHED
libtest_libtest_la_LIBADD+= $(LIBMEMCACHED_UTIL_LDFLAGS)
@@ -178,20 +173,14 @@
endif
if BUILDING_GEARMAN
-libtest_libtest_la_DEPENDENCIES+= libgearman/libgearman.la
-libtest_libtest_la_LIBADD+= libgearman/libgearman.la
libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
libtest_libtest_la_SOURCES+= libtest/gearmand.cc
libtest_libtest_la_SOURCES+= util/instance.cc
libtest_libtest_la_SOURCES+= util/operation.cc
libtest_unittest_LDADD+= libgearman/libgearman.la
-libtest_unittest_DEPENDENCIES+= libgearman/libgearman.la
-libtest_unittest_DEPENDENCIES+= gearmand/gearmand
else
if HAVE_LIBGEARMAN
-libtest_libtest_la_DEPENDENCIES+= libgearman/libgearman.la
-libtest_libtest_la_LIBADD+= $(libgearman_LIBS)
libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
libtest_libtest_la_SOURCES+= libtest/gearmand.cc
libtest_libtest_la_SOURCES+= util/instance.cc
@@ -199,31 +188,14 @@
endif
endif
-libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
-
-tmp_chroot: tmp_chroot/etc
- @$(mkdir_p) tmp_chroot
-
-tmp_chroot/etc:
- @$(mkdir_p) tmp_chroot/etc
-
-tmp_chroot/var: tmp_chroot
- @$(mkdir_p) tmp_chroot/var
-
-tmp_chroot/var/log: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/log
+TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
-tmp_chroot/var/tmp: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/tmp
+.PHONY: libtest_tmp_dir
+libtest_tmp_dir: | $(TMP_DIR)
-tmp_chroot/var/drizzle: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/drizzle
+$(TMP_DIR):
+ @$(mkdir_p) $(TMP_DIR)
-tmp_chroot/var/run: tmp_chroot/var
- @$(mkdir_p) tmp_chroot/var/run
-
-
-libtest_unittest_DEPENDENCIES+= libtest/libtest.la
libtest_unittest_LDADD+= libtest/libtest.la
libtest_unittest_SOURCES= libtest/unittest.cc
check_PROGRAMS+= libtest/unittest
@@ -260,3 +232,16 @@
libtest_abort_SOURCES= libtest/abort.cc
noinst_PROGRAMS+= libtest/abort
+
+libtest_backtrace_SOURCES=
+libtest_backtrace_LDADD=
+libtest_backtrace_SOURCES+= libtest/backtrace_test.cc
+libtest_backtrace_SOURCES+= libmemcached/backtrace.cc
+libtest_backtrace_LDADD+= @DL_LIB@
+noinst_PROGRAMS+= libtest/backtrace
+test-backtrace: libtest/backtrace
+ @libtest/backtrace
+
+gdb-backtrace: libtest/backtrace
+ @$(GDB_COMMAND) libtest/backtrace
+
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/is_local.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/killpid.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdlib>
@@ -123,14 +123,15 @@
FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
- char pid_buffer[1024];
+ libtest::vchar_t pid_buffer;
+ pid_buffer.resize(1024);
- char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
+ char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
fclose(fp);
if (ptr)
{
- pid_t pid= (pid_t)atoi(pid_buffer);
+ pid_t pid= (pid_t)atoi(&pid_buffer[0]);
if (pid > 0)
{
return (::kill(pid, 0) == 0);
@@ -152,14 +153,15 @@
FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
- char pid_buffer[1024];
+ libtest::vchar_t pid_buffer;
+ pid_buffer.resize(1024);
- char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
+ char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
fclose(fp);
if (ptr)
{
- pid_t pid= (pid_t)atoi(pid_buffer);
+ pid_t pid= (pid_t)atoi(&pid_buffer[0]);
if (pid != 0)
{
bool ret= kill_pid(pid);
@@ -180,7 +182,6 @@
pid_t get_pid_from_file(const std::string &filename, std::stringstream& error_message)
{
pid_t ret= -1;
- FILE *fp;
if (filename.empty())
{
@@ -188,16 +189,16 @@
return ret;
}
+ FILE *fp;
if ((fp= fopen(filename.c_str(), "r")))
{
- char pid_buffer[1024];
-
- char *ptr= fgets(pid_buffer, sizeof(pid_buffer), fp);
- fclose(fp);
+ libtest::vchar_t pid_buffer;
+ pid_buffer.resize(1024);
+ char *ptr= fgets(&pid_buffer[0], int(pid_buffer.size()), fp);
if (ptr)
{
- ret= (pid_t)atoi(pid_buffer);
+ ret= (pid_t)atoi(&pid_buffer[0]);
if (ret < 1)
{
error_message << LIBTEST_AT << " Invalid pid was read from file " << filename;
@@ -208,12 +209,15 @@
error_message << LIBTEST_AT << " File " << filename << " was empty ";
}
+ fclose(fp);
+
return ret;
}
else
{
- char buffer[1024];
- char *current_directory= getcwd(buffer, sizeof(buffer));
+ libtest::vchar_t buffer;
+ buffer.resize(1024);
+ char *current_directory= getcwd(&buffer[0], buffer.size());
error_message << "Error while opening " << current_directory << "/" << filename << " " << strerror(errno);
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/libtool.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <string>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/m4/ax_lib_mysql.m4
^
|
| @@ -26,6 +26,7 @@
#
# This macro calls:
#
+# AC_SUBST(MYSQL_INCLUDE)
# AC_SUBST(MYSQL_CFLAGS)
# AC_SUBST(MYSQL_LDFLAGS)
# AC_SUBST(MYSQL_VERSION)
@@ -43,7 +44,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 12
+#serial 13
AC_DEFUN([AX_LIB_MYSQL],
[
@@ -65,6 +66,7 @@
)
AC_ARG_VAR([MYSQL_CONFIG], [Full path to mysql_config program])
+ MYSQL_INCLUDE=""
MYSQL_CFLAGS=""
MYSQL_LDFLAGS=""
MYSQL_VERSION=""
@@ -80,6 +82,7 @@
fi
if test "$MYSQL_CONFIG" != "no"; then
+ MYSQL_INCLUDE="`$MYSQL_CONFIG --include`"
MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
@@ -142,6 +145,7 @@
fi
AC_SUBST([MYSQL_VERSION])
+ AC_SUBST([MYSQL_INCLUDE])
AC_SUBST([MYSQL_CFLAGS])
AC_SUBST([MYSQL_LDFLAGS])
])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/m4/memcached.m4
^
|
| @@ -1,11 +1,14 @@
-AX_PROG_MYSQLD
-AX_WITH_PROG(MEMCACHED_BINARY, [memcached])
-AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
- [
+#serial 1
+
+ AC_DEFUN([YATL_MEMCACHED], [
+ AC_REQUIRE([AX_ENABLE_LIBMEMCACHED])
+
+ AX_WITH_PROG(MEMCACHED_BINARY, [memcached])
+ AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],[
AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$ac_cv_path_MEMCACHED_BINARY", [Name of the memcached binary used in make test])
- ],
- [
+ ],[
AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
AC_DEFINE([MEMCACHED_BINARY], ["memcached/memcached"], [Name of the memcached binary used in make test])
+ ])
])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/m4/mysql.m4
^
|
| @@ -1,23 +1,24 @@
m4_include([libtest/m4/ax_lib_mysql.m4])
m4_include([libtest/m4/ax_prog_mysqld.m4])
-AX_LIB_MYSQL([5.0])
-AM_CONDITIONAL(HAVE_LIBMYSQL, test "x${found_mysql}" = "xyes")
-AS_IF([test "x${found_mysql}" = "xyes"],
- [
- AC_DEFINE([HAVE_LIBMYSQL_BUILD], [1], [Define to 1 if MySQL libraries are available])
- ],
- [
- AC_DEFINE([HAVE_LIBMYSQL_BUILD], [0], [Define to 1 if MySQL libraries are available])
- ])
-AX_PROG_MYSQLD
-AS_IF([test -f "$ac_cv_path_MYSQLD"],
- [
+#serial 1
+
+ AC_DEFUN([YATL_MYSQL], [
+ AC_REQUIRE([AX_PROG_MYSQLD])
+
+ AX_LIB_MYSQL([5.0])
+ AM_CONDITIONAL(HAVE_LIBMYSQL, test "x${found_mysql}" = "xyes")
+ AS_IF([test "x${found_mysql}" = "xyes"],[
+ AC_DEFINE([HAVE_LIBMYSQL_BUILD], [1], [Define to 1 if MySQL libraries are available])
+ ],[
+ AC_DEFINE([HAVE_LIBMYSQL_BUILD], [0], [Define to 1 if MySQL libraries are available])
+ ])
+
+ AS_IF([test -f "$ac_cv_path_MYSQLD"],[
AC_DEFINE([HAVE_MYSQLD_BUILD], [1], [Define to 1 if MySQLD binary is available])
AC_DEFINE_UNQUOTED([MYSQLD_BINARY], "$ac_cv_path_MYSQLD", [Name of the mysqld binary used in make test])
- ],
- [
+ ],[
AC_DEFINE([HAVE_MYSQLD_BUILD], [0], [Define to 1 if MySQLD binary is available])
AC_DEFINE([MYSQLD_BINARY], [0], [Name of the mysqld binary used in make test])
+ ])
])
-
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/main.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cassert>
@@ -220,22 +220,24 @@
is_massive(opt_massive);
}
- char tmp_directory[1024];
+ libtest::vchar_t tmp_directory;
+ tmp_directory.resize(1024);
if (getenv("LIBTEST_TMP"))
{
- snprintf(tmp_directory, sizeof(tmp_directory), "%s", getenv("LIBTEST_TMP"));
+ snprintf(&tmp_directory[0], tmp_directory.size(), "%s", getenv("LIBTEST_TMP"));
}
else
{
- snprintf(tmp_directory, sizeof(tmp_directory), "%s", LIBTEST_TEMP);
+ snprintf(&tmp_directory[0], tmp_directory.size(), "%s", LIBTEST_TEMP);
}
- if (chdir(tmp_directory) == -1)
+ if (chdir(&tmp_directory[0]) == -1)
{
- char getcwd_buffer[1024];
- char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer));
+ libtest::vchar_t getcwd_buffer;
+ getcwd_buffer.resize(1024);
+ char *dir= getcwd(&getcwd_buffer[0], getcwd_buffer.size());
- Error << "Unable to chdir() from " << dir << " to " << tmp_directory << " errno:" << strerror(errno);
+ Error << "Unable to chdir() from " << dir << " to " << &tmp_directory[0] << " errno:" << strerror(errno);
return EXIT_FAILURE;
}
@@ -329,7 +331,7 @@
std::ofstream xml_file;
std::string file_name;
- file_name.append(tmp_directory);
+ file_name.append(&tmp_directory[0]);
file_name.append(frame->name());
file_name.append(".xml");
xml_file.open(file_name.c_str(), std::ios::trunc);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/memcached.cc
^
|
| @@ -34,12 +34,9 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
-#include <libtest/common.h>
-
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
@@ -89,7 +86,7 @@
virtual const char *sasl() const
{
- return "-S";
+ return NULL;
}
const std::string& password() const
@@ -210,7 +207,7 @@
add_option("-M");
#endif
- if (_username.size())
+ if (sasl())
{
add_option(sasl());
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/port.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cassert>
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libtest/result.cc
^
|
| @@ -0,0 +1,66 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+#include "libtest/yatlcon.h"
+#include <libtest/common.h>
+#include <cstdarg>
+
+namespace libtest {
+
+__test_result::__test_result(const char *file_arg, int line_arg, const char *func_arg):
+ _line(line_arg),
+ _file(file_arg),
+ _func(func_arg)
+{
+}
+
+__success::__success(const char *file_arg, int line_arg, const char *func_arg):
+ __test_result(file_arg, line_arg, func_arg)
+{
+}
+
+__skipped::__skipped(const char *file_arg, int line_arg, const char *func_arg):
+ __test_result(file_arg, line_arg, func_arg)
+{
+}
+
+__failure::__failure(const char *file_arg, int line_arg, const char *func_arg, const std::string& mesg):
+ __test_result(file_arg, line_arg, func_arg)
+{
+ snprintf(_error_message, sizeof(_error_message), "%.*s", int(mesg.size()), mesg.c_str());
+}
+
+} // namespace libtest
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libtest/result.hpp
^
|
| @@ -0,0 +1,114 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+#pragma once
+
+#include <libtest/fatal.hpp>
+
+namespace libtest {
+
+class __test_result : public std::exception
+{
+public:
+ __test_result(const char *file, int line, const char *func);
+
+ int line()
+ {
+ return _line;
+ }
+
+ const char* file()
+ {
+ return _file;
+ }
+
+ const char* func()
+ {
+ return _func;
+ }
+
+private:
+ int _line;
+ const char* _file;
+ const char* _func;
+};
+
+class __success : public __test_result
+{
+public:
+ __success(const char *file, int line, const char *func);
+
+ const char* what() const throw()
+ {
+ return "SUCCESS";
+ }
+
+private:
+};
+
+class __skipped : public __test_result
+{
+public:
+ __skipped(const char *file, int line, const char *func);
+
+ const char* what() const throw()
+ {
+ return "SKIPPED";
+ }
+
+private:
+};
+
+class __failure : public __test_result
+{
+public:
+ __failure(const char *file, int line, const char *func, const std::string&);
+
+ const char* what() const throw()
+ {
+ return _error_message;
+ }
+
+private:
+ char _error_message[BUFSIZ];
+};
+
+
+} // namespace libtest
+
+#define _SUCCESS throw libtest::__success(LIBYATL_DEFAULT_PARAM)
+#define SKIP throw libtest::__skipped(LIBYATL_DEFAULT_PARAM)
+#define FAIL(__mesg) throw libtest::__failure(LIBYATL_DEFAULT_PARAM, __mesg)
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/runner.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
namespace libtest {
@@ -53,7 +53,22 @@
{
if (func)
{
- return func(object);
+ try {
+ return func(object);
+ }
+ catch (libtest::__skipped)
+ {
+ return TEST_SKIPPED;
+ }
+ catch (libtest::__failure e)
+ {
+ libtest::stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
+ return TEST_FAILURE;
+ }
+ catch (libtest::__success)
+ {
+ return TEST_SUCCESS;
+ }
}
return TEST_SUCCESS;
@@ -63,7 +78,22 @@
{
if (func)
{
- return func(object);
+ try {
+ return func(object);
+ }
+ catch (libtest::__skipped)
+ {
+ return TEST_SKIPPED;
+ }
+ catch (libtest::__failure e)
+ {
+ libtest::stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
+ return TEST_FAILURE;
+ }
+ catch (libtest::__success)
+ {
+ return TEST_SUCCESS;
+ }
}
return TEST_SUCCESS;
@@ -73,7 +103,22 @@
{
if (func)
{
- return func(object);
+ try {
+ return func(object);
+ }
+ catch (libtest::__skipped)
+ {
+ return TEST_SKIPPED;
+ }
+ catch (libtest::__failure e)
+ {
+ libtest::stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
+ return TEST_FAILURE;
+ }
+ catch (libtest::__success)
+ {
+ return TEST_SUCCESS;
+ }
}
return TEST_SUCCESS;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/server.cc
^
|
| @@ -34,7 +34,8 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
+
#include <libtest/common.h>
#include <cassert>
@@ -116,7 +117,8 @@
_port(port_arg),
_hostname(host_arg),
_app(executable, _is_libtool),
- out_of_ban_killed_(false)
+ out_of_ban_killed_(false),
+ _timeout(40)
{
}
@@ -253,8 +255,9 @@
Buffer buf( get_current_dir_name());
char *getcwd_buf= buf.buf();
#else
- char buf[PATH_MAX];
- char *getcwd_buf= getcwd(buf, sizeof(buf));
+ libtest::vchar_t buf;
+ buf.resize(PATH_MAX);
+ char *getcwd_buf= getcwd(&buf[0], buf.size());
#endif // __GLIBC__
throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
hostname(), port(),
@@ -269,7 +272,6 @@
bool pinged= false;
uint32_t this_wait= 0;
{
- uint32_t timeout= 40; // This number should be high enough for valgrind startup (which is slow)
uint32_t waited;
uint32_t retry;
@@ -284,12 +286,12 @@
{
break;
}
- else if (waited >= timeout)
+ else if (waited >= _timeout)
{
break;
}
- Error << "ping(" << _app.pid() << ") wait: " << this_wait << " " << hostname() << ":" << port() << " " << error();
+ Error << "ping(" << _app.pid() << ") wait: " << this_wait << " " << hostname() << ":" << port() << " run:" << _running << " " << error();
this_wait= retry * retry / 3 + 1;
libtest::dream(this_wait, 0);
@@ -365,73 +367,76 @@
bool Server::set_socket_file()
{
- char file_buffer[FILENAME_MAX];
+ libtest::vchar_t file_buffer;
+ file_buffer.resize(FILENAME_MAX);
file_buffer[0]= 0;
if (broken_pid_file())
{
- snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.socketXXXXXX", name());
+ snprintf(&file_buffer[0], file_buffer.size(), "/tmp/%s.socketXXXXXX", name());
}
else
{
- snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.socketXXXXXX", name());
+ snprintf(&file_buffer[0], file_buffer.size(), "var/run/%s.socketXXXXXX", name());
}
int fd;
- if ((fd= mkstemp(file_buffer)) == -1)
+ if ((fd= mkstemp(&file_buffer[0])) == -1)
{
- perror(file_buffer);
+ perror(&file_buffer[0]);
return false;
}
close(fd);
- unlink(file_buffer);
+ unlink(&file_buffer[0]);
- _socket= file_buffer;
+ _socket= &file_buffer[0];
return true;
}
bool Server::set_pid_file()
{
- char file_buffer[FILENAME_MAX];
+ libtest::vchar_t file_buffer;
+ file_buffer.resize(FILENAME_MAX);
file_buffer[0]= 0;
if (broken_pid_file())
{
- snprintf(file_buffer, sizeof(file_buffer), "/tmp/%s.pidXXXXXX", name());
+ snprintf(&file_buffer[0], file_buffer.size(), "/tmp/%s.pidXXXXXX", name());
}
else
{
- snprintf(file_buffer, sizeof(file_buffer), "var/run/%s.pidXXXXXX", name());
+ snprintf(&file_buffer[0], file_buffer.size(), "var/run/%s.pidXXXXXX", name());
}
int fd;
- if ((fd= mkstemp(file_buffer)) == -1)
+ if ((fd= mkstemp(&file_buffer[0])) == -1)
{
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", &file_buffer[0], strerror(errno));
}
close(fd);
- unlink(file_buffer);
+ unlink(&file_buffer[0]);
- _pid_file= file_buffer;
+ _pid_file= &file_buffer[0];
return true;
}
bool Server::set_log_file()
{
- char file_buffer[FILENAME_MAX];
+ libtest::vchar_t file_buffer;
+ file_buffer.resize(FILENAME_MAX);
file_buffer[0]= 0;
- snprintf(file_buffer, sizeof(file_buffer), "var/log/%s.logXXXXXX", name());
+ snprintf(&file_buffer[0], file_buffer.size(), "var/log/%s.logXXXXXX", name());
int fd;
- if ((fd= mkstemp(file_buffer)) == -1)
+ if ((fd= mkstemp(&file_buffer[0])) == -1)
{
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", &file_buffer[0], strerror(errno));
}
close(fd);
- _log_file= file_buffer;
+ _log_file= &file_buffer[0];
return true;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/server.h
^
|
| @@ -223,6 +223,11 @@
_error= arg;
}
+ void reset_error()
+ {
+ _error.clear();
+ }
+
virtual bool wait_for_pidfile() const;
bool check_pid(pid_t pid_arg) const
@@ -260,6 +265,11 @@
return out_of_ban_killed_;
}
+ void timeout(uint32_t timeout_)
+ {
+ _timeout= timeout_;
+ }
+
protected:
bool set_pid_file();
Options _options;
@@ -276,6 +286,7 @@
bool args(Application&);
std::string _error;
+ uint32_t _timeout; // This number should be high enough for valgrind startup (which is slow)
};
std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/server_container.cc
^
|
| @@ -34,8 +34,9 @@
*
*/
-#include "mem_config.h"
-#include <libtest/common.h>
+#include "libtest/yatlcon.h"
+
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
@@ -75,13 +76,14 @@
}
else
{
- char port_str[NI_MAXSERV]= { 0 };
- snprintf(port_str, sizeof(port_str), "%u", int(arg->port()));
+ libtest::vchar_t port_str;
+ port_str.resize(NI_MAXSERV);
+ snprintf(&port_str[0], port_str.size(), "%u", int(arg->port()));
server_config_string+= "--server=";
server_config_string+= arg->hostname();
server_config_string+= ":";
- server_config_string+= port_str;
+ server_config_string+= &port_str[0];
server_config_string+= " ";
}
@@ -239,16 +241,6 @@
}
}
}
- else if (server_type.compare("memcached-sasl") == 0)
- {
- if (MEMCACHED_BINARY)
- {
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached_sasl("localhost", try_port, username(), password());
- }
- }
- }
else if (server_type.compare("memcached") == 0)
{
if (HAVE_MEMCACHED_BINARY)
@@ -302,9 +294,14 @@
{
if (opt_startup_message)
{
- Outn();
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
- Outn();
+#if defined(DEBUG)
+ if (DEBUG)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
+#endif
}
}
}
@@ -405,9 +402,14 @@
{
if (opt_startup_message)
{
- Outn();
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
- Outn();
+#if defined(DEBUG)
+ if (DEBUG)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
+#endif
}
}
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/signal.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <csignal>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/skiptest.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/test.hpp>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/socket.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
static char global_socket[1024]= { 0 };
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/strerror.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/test.hpp
^
|
| @@ -47,6 +47,7 @@
#include <libtest/vchar.hpp>
#include <libtest/fatal.hpp>
+#include <libtest/result.hpp>
#include <libtest/has.hpp>
#include <libtest/error.h>
@@ -76,3 +77,4 @@
#include <libtest/cpu.hpp>
#include <libtest/tmpfile.hpp>
#include <libtest/client.hpp>
+#include <libtest/thread.hpp>
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libtest/thread.hpp
^
|
| @@ -0,0 +1,323 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *
+ * 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.
+ *
+ */
+
+#pragma once
+
+#include <pthread.h>
+
+namespace libtest
+{
+namespace thread
+{
+
+class Mutex
+{
+public:
+ Mutex()
+ {
+ int err;
+ if ((err= pthread_mutex_init(&_mutex, NULL)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_mutex_init: %s", strerror(err));
+ }
+ }
+
+ ~Mutex()
+ {
+ int err;
+ if ((err= pthread_mutex_destroy(&_mutex)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_destroy: %s", strerror(err));
+ }
+ }
+
+ pthread_mutex_t* handle()
+ {
+ return &_mutex;
+ }
+
+private:
+ pthread_mutex_t _mutex;
+};
+
+class ScopedLock
+{
+public:
+ ScopedLock(Mutex& mutex_) :
+ _mutex(mutex_)
+ {
+ init();
+ }
+
+ ~ScopedLock()
+ {
+ int err;
+ if ((err= pthread_mutex_unlock(_mutex.handle())))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_mutex_unlock: %s", strerror(err));
+ }
+ }
+
+ Mutex* handle()
+ {
+ return &_mutex;
+ }
+
+private:
+ void init()
+ {
+ int err;
+ if ((err= pthread_mutex_lock(_mutex.handle())))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_mutex_lock: %s", strerror(err));
+ }
+ }
+
+private:
+ Mutex& _mutex;
+};
+
+class Condition
+{
+public:
+ Condition()
+ {
+ int err;
+ if ((err= pthread_cond_init(&_cond, NULL)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_mutex_init: %s", strerror(err));
+ }
+ }
+
+ ~Condition()
+ {
+ int err;
+ if ((err= pthread_cond_destroy(&_cond)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_destroy: %s", strerror(err));
+ }
+ }
+
+ void broadcast()
+ {
+ int err;
+ if ((err= pthread_cond_broadcast(&_cond)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_broadcast: %s", strerror(err));
+ }
+ }
+
+ void signal()
+ {
+ int err;
+ if ((err= pthread_cond_signal(&_cond)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_broadcast: %s", strerror(err));
+ }
+ }
+
+ void wait(ScopedLock& lock_)
+ {
+ int err;
+ if ((err= pthread_cond_wait(&_cond, lock_.handle()->handle())))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_cond_wait: %s", strerror(err));
+ }
+ }
+
+private:
+ pthread_cond_t _cond;
+};
+
+class Barrier
+{
+public:
+ Barrier(uint32_t count):
+ _threshold(count),
+ _count(count),
+ _generation(0)
+ {
+ if (_count == 0)
+ {
+ fatal_assert("Zero is an invalid value");
+ }
+ }
+
+ ~Barrier()
+ {
+ }
+
+ bool wait()
+ {
+ ScopedLock l(_mutex);
+ uint32_t gen = _generation;
+
+ if (--_count == 0)
+ {
+ _generation++;
+ _count = _threshold;
+ _cond.broadcast();
+
+ return true;
+ }
+
+ while (gen == _generation)
+ {
+ _cond.wait(l);
+ }
+
+ return false;
+ }
+
+private:
+ Mutex _mutex;
+ Condition _cond;
+ uint32_t _threshold;
+ uint32_t _count;
+ uint32_t _generation;
+};
+
+class Thread
+{
+private:
+ typedef void *(*start_routine_fn) (void *);
+
+public:
+ template <class Function,class Arg1>
+ Thread(Function func, Arg1 arg):
+ _joined(false),
+ _func((start_routine_fn)func),
+ _context(arg)
+ {
+ int err;
+ if ((err= pthread_create(&_thread, NULL, entry_func, (void*)this)))
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_create: %s", strerror(err));
+ }
+ _owner= pthread_self();
+ }
+
+ bool running() const
+ {
+ return (pthread_kill(_thread, 0) == 0);
+ }
+
+ bool detached()
+ {
+ if (EDEADLK == pthread_join(_thread, NULL))
+ {
+ return true;
+ }
+
+ /* Result of pthread_join was EINVAL == detached thread */
+ return false;
+ }
+
+ bool join()
+ {
+ if (_thread == pthread_self())
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Thread cannot join on itself");
+ }
+
+ if (_owner != pthread_self())
+ {
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Attempt made by a non-owner thead to join on thread");
+ }
+
+ bool ret= false;
+ {
+ ScopedLock l(_join_mutex);
+ if (_joined == false)
+ {
+ int err;
+ if ((err= pthread_join(_thread, NULL)))
+ {
+ switch(err)
+ {
+ case EINVAL:
+ break;
+
+ case ESRCH:
+ ret= true;
+ break;
+
+ case EDEADLK:
+ default:
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "pthread_join: %s", strerror(err));
+ }
+ }
+ else
+ {
+ ret= true;
+ }
+
+ _joined= true;
+ }
+ }
+
+ return ret;
+ }
+
+ ~Thread()
+ {
+ join();
+ }
+
+protected:
+ void run()
+ {
+ _func(_context);
+ }
+
+private:
+ static void * entry_func(void* This)
+ {
+ ((Thread *)This)->run();
+ return NULL;
+ }
+
+private:
+ bool _joined;
+ pthread_t _thread;
+ pthread_t _owner;
+ start_routine_fn _func;
+ void* _context;
+ Mutex _join_mutex;
+};
+
+} // namespace thread
+} // namespace libtest
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/timer.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/timer.hpp>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/tmpfile.cc
^
|
| @@ -34,27 +34,30 @@
*
*/
+#include "libtest/yatlcon.h"
+
#include <libtest/common.h>
namespace libtest {
std::string create_tmpfile(const std::string& name)
{
- char file_buffer[FILENAME_MAX];
+ libtest::vchar_t file_buffer;
+ file_buffer.resize(FILENAME_MAX);
file_buffer[0]= 0;
- int length= snprintf(file_buffer, sizeof(file_buffer), "var/tmp/%s.XXXXXX", name.c_str());
+ int length= snprintf(&file_buffer[0], file_buffer.size(), "var/tmp/%s.XXXXXX", name.c_str());
fatal_assert(length > 0);
int fd;
- if ((fd= mkstemp(file_buffer)) == -1)
+ if ((fd= mkstemp(&file_buffer[0])) == -1)
{
- throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", &file_buffer[0], strerror(errno));
}
close(fd);
- unlink(file_buffer);
+ unlink(&file_buffer[0]);
- return file_buffer;
+ return &file_buffer[0];
}
} // namespace libtest
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/unittest.cc
^
|
| @@ -34,16 +34,16 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/test.hpp>
-#if defined(LIBTEST_WITH_LIBMEMCACHED_SUPPORT) && LIBTEST_WITH_LIBMEMCACHED_SUPPORT
-#include <libmemcached-1.0/memcached.h>
+#if defined(HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H) && HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H
+# include <libmemcached-1.0/types/return.h>
#endif
-#if defined(LIBTEST_WITH_LIBGEARMAN_SUPPORT) && LIBTEST_WITH_LIBGEARMAN_SUPPORT
-#include <libgearman/gearman.h>
+#if defined(HAVE_LIBGEARMAN_1_0_RETURN_H) && HAVE_LIBGEARMAN_1_0_RETURN_H
+# include <libgearman-1.0/return.h>
#endif
#include <cstdlib>
@@ -56,6 +56,18 @@
// Used to track setups where we see if failure is happening
static uint32_t fatal_calls= 0;
+static test_return_t getenv_TEST(void *)
+{
+#if 0
+ for (char **ptr= environ; *ptr; ptr++)
+ {
+ Error << *ptr;
+ }
+#endif
+
+ return TEST_SUCCESS;
+}
+
static test_return_t LIBTOOL_COMMAND_test(void *)
{
test_true(getenv("LIBTOOL_COMMAND"));
@@ -83,7 +95,7 @@
static test_return_t test_success_equals_one_test(void *)
{
test_skip(HAVE_LIBMEMCACHED, 1);
-#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
+#if defined(HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H) && HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H
test_zero(MEMCACHED_SUCCESS);
#endif
return TEST_SUCCESS;
@@ -94,6 +106,60 @@
return TEST_SUCCESS;
}
+static test_return_t test_throw_success_TEST(void *)
+{
+ try {
+ _SUCCESS;
+ }
+ catch (libtest::__success)
+ {
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ return TEST_FAILURE;
+ }
+
+ return TEST_FAILURE;
+}
+
+static test_return_t test_throw_skip_TEST(void *)
+{
+ try {
+ SKIP;
+ }
+ catch (libtest::__skipped)
+ {
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ return TEST_FAILURE;
+ }
+
+ return TEST_FAILURE;
+}
+
+static test_return_t test_throw_fail_TEST(void *)
+{
+ std::string error_messsage("test message!");
+ try {
+ FAIL(error_messsage);
+ }
+ catch (libtest::__failure e)
+ {
+ std::string compare_message("test message!");
+ test_zero(compare_message.compare(e.what()));
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ return TEST_FAILURE;
+ }
+
+ return TEST_FAILURE;
+}
+
static test_return_t test_failure_test(void *)
{
return TEST_SKIPPED; // Only run this when debugging
@@ -245,7 +311,7 @@
static test_return_t _compare_memcached_return_t_test(void *)
{
test_skip(HAVE_LIBMEMCACHED, true);
-#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
+#if defined(HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H) && HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H
test_compare(MEMCACHED_SUCCESS, MEMCACHED_SUCCESS);
#endif
@@ -255,7 +321,7 @@
static test_return_t _compare_gearman_return_t_test(void *)
{
test_skip(HAVE_LIBGEARMAN, true);
-#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
+#if defined(HAVE_LIBGEARMAN_1_0_RETURN_H) && HAVE_LIBGEARMAN_1_0_RETURN_H
test_compare(GEARMAN_SUCCESS, GEARMAN_SUCCESS);
#endif
@@ -395,6 +461,8 @@
static test_return_t application_gdb_true_BINARY2(void *)
{
test_skip(0, access("/usr/bin/gdb", X_OK ));
+ test_skip(0, access("/usr/bin/true", X_OK ));
+
Application true_app("/usr/bin/true");
true_app.use_gdb();
@@ -407,6 +475,8 @@
static test_return_t application_gdb_true_BINARY(void *)
{
test_skip(0, access("/usr/bin/gdb", X_OK ));
+ test_skip(0, access("/usr/bin/true", X_OK ));
+
Application true_app("/usr/bin/true");
true_app.use_gdb();
@@ -440,6 +510,8 @@
const char *args[]= { "--fubar", 0 };
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
test_compare(Application::INVALID_POSIX_SPAWN, true_app.run(args));
+#elif defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
+ test_compare(Application::INVALID_POSIX_SPAWN, true_app.run(args));
#else
test_compare(Application::SUCCESS, true_app.run(args));
test_compare(Application::INVALID_POSIX_SPAWN, true_app.join());
@@ -608,8 +680,9 @@
static test_return_t wait_services_appliction_TEST(void *)
{
- test_skip(0, access("/usr/bin/gdb", X_OK ));
test_skip(0, access("/etc/services", R_OK ));
+ test_skip(0, access("/usr/bin/gdb", X_OK ));
+ test_skip(0, access("libtest/wait", X_OK ));
libtest::Application wait_app("libtest/wait", true);
wait_app.use_gdb();
@@ -628,8 +701,9 @@
test_skip(0, TARGET_OS_OSX);
#endif
- test_skip(0, access("/usr/bin/gdb", X_OK ));
test_skip(0, access("/etc/services", R_OK ));
+ test_skip(0, access("/usr/bin/gdb", X_OK ));
+ test_skip(0, access("libtest/wait", X_OK ));
libtest::Application wait_app("libtest/wait", true);
wait_app.use_gdb();
@@ -643,8 +717,9 @@
static test_return_t gdb_abort_services_appliction_TEST(void *)
{
- test_skip(true, false);
test_skip(0, access("/usr/bin/gdb", X_OK ));
+ test_skip(0, access("libtest/abort", X_OK ));
+ test_skip(true, false);
#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
test_skip(0, TARGET_OS_OSX);
@@ -734,6 +809,7 @@
static test_return_t create_tmpfile_TEST(void *)
{
+ test_skip(0, access("/usr/bin/touch", X_OK ));
std::string tmp= create_tmpfile(__func__);
test_compare(-1, access(tmp.c_str(), R_OK));
test_compare(-1, access(tmp.c_str(), F_OK));
@@ -770,6 +846,16 @@
{
test_skip(true, HAVE_LIBGEARMAN);
test_skip(true, has_gearmand());
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
+ if (GEARMAND_BINARY)
+ {
+ test_zero(access(GEARMAND_BINARY, X_OK ));
+ }
+ else
+ {
+ return TEST_SKIPPED;
+ }
+#endif
testing_service= "gearmand";
@@ -842,6 +928,7 @@
};
test_st environment_tests[] ={
+ {"getenv()", 0, getenv_TEST },
{"LIBTOOL_COMMAND", 0, LIBTOOL_COMMAND_test },
{"VALGRIND_COMMAND", 0, VALGRIND_COMMAND_test },
{"HELGRIND_COMMAND", 0, HELGRIND_COMMAND_test },
@@ -853,6 +940,9 @@
{"TEST_SUCCESS", false, test_success_test },
{"TEST_FAILURE", false, test_failure_test },
{"TEST_SUCCESS == 0", false, test_success_equals_one_test },
+ {"SUCCESS", false, test_throw_success_TEST },
+ {"SKIP", false, test_throw_skip_TEST },
+ {"FAIL", false, test_throw_fail_TEST },
{0, 0, 0}
};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/vchar.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
namespace libtest {
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/wait.cc
^
|
| @@ -34,7 +34,7 @@
*
*/
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
#include <cstdlib>
#include <fcntl.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/libtest/yatl.m4
^
|
| @@ -3,8 +3,14 @@
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-AC_SUBST([LIBTEST_VERSION], [1.0])
+AC_SUBST([LIBTEST_VERSION],[1.0])
AC_CONFIG_FILES([libtest/version.h])
m4_include([libtest/m4/mysql.m4])
m4_include([libtest/m4/memcached.m4])
+AC_DEFINE([HAVE_MEMCACHED_SASL_BINARY],[0],[If Memcached binary with sasl support is available])
+
+YATL_MYSQL
+YATL_MEMCACHED
+
+AC_CONFIG_FILES([libtest/yatlcon.h])
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/libtest/yatlcon.h.in
^
|
| @@ -0,0 +1,41 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Data Differential YATL (i.e. libtest) library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ * 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.
+ *
+ */
+
+
+#pragma once
+
+#include "@AUTOHEADER_FILE@"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_assert.m4
^
|
| @@ -43,23 +43,22 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#serial 4
+#serial 6
AC_DEFUN([AX_ASSERT],
[AC_PREREQ([2.63])dnl
AC_REQUIRE([AX_DEBUG])
+ AC_REQUIRE([AX_VCS_CHECKOUT])
AC_ARG_ENABLE([assert],
[AS_HELP_STRING([--enable-assert],
- [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],[
- ax_enable_assert=yes
- ],[
- ax_enable_assert=no
- ])
+ [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],
+ [ax_enable_assert=yes],
+ [ax_enable_assert=no])
- AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" ],[
- ax_enable_assert="yes"
- AC_DEFINE(NDEBUG,[1],[Define to 1 to enable assert'ing code.])
- ])
+ AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ],
+ [ax_enable_assert="yes"],
+ [ax_enable_assert="no"
+ AC_DEFINE(NDEBUG,[1],[Define to 1 to disable assert'ing code.])])
AC_MSG_CHECKING([for assert])
AC_MSG_RESULT([$ax_enable_assert])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_check_library.m4
^
|
| @@ -32,6 +32,7 @@
#
# LICENSE
#
+# Copyright (c) 2012 Brian Aker <brian@tangent.org>
# Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com>
#
# This program is free software: you can redistribute it and/or modify it
@@ -60,36 +61,36 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 4
+#serial 6
-AC_DEFUN([AX_CHECK_LIBRARY], [
- AC_ARG_VAR($1[_CPPFLAGS], [C preprocessor flags for ]$1[ headers])
- AC_ARG_VAR($1[_LDFLAGS], [linker flags for ]$1[ libraries])
-
- AC_CACHE_VAL(AS_TR_SH([ax_cv_have_]$1),
- [save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
-
- AS_IF([test "x$]$1[_CPPFLAGS" != "x"],
- [CPPFLAGS="$CPPFLAGS $]$1[_CPPFLAGS"])
-
- AS_IF([test "x$]$1[_LDFLAGS" != "x"],
- [LDFLAGS="$LDFLAGS $]$1[_LDFLAGS"])
-
- AC_CHECK_HEADER($2, [
- AC_CHECK_LIB($3, [main],
- [AS_TR_SH([ax_cv_have_]$1)=yes],
- [AS_TR_SH([ax_cv_have_]$1)=no])
- ], [AS_TR_SH([ax_cv_have_]$1)=no])
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+AC_DEFUN([AX_CHECK_LIBRARY],
+ [AC_ARG_VAR($1[_CPPFLAGS],[C preprocessor flags for ]$1[ headers])
+ AC_ARG_VAR($1[_LDFLAGS],[linker flags for ]$1[ libraries])
+
+ AC_CACHE_VAL(AS_TR_SH([ax_cv_have_]$1),
+ [AX_SAVE_FLAGS
+
+ AS_IF([test "x$]$1[_CPPFLAGS" != "x"],
+ [CPPFLAGS="$CPPFLAGS $]$1[_CPPFLAGS"])
+
+ AS_IF([test "x$]$1[_LDFLAGS" != "x"],
+ [LDFLAGS="$LDFLAGS $]$1[_LDFLAGS"])
+
+ AC_CHECK_HEADER($2, [
+ AC_CHECK_LIB($3, [main],
+ [AS_TR_SH([ax_cv_have_]$1)=yes],
+ [AS_TR_SH([ax_cv_have_]$1)=no])
+ ], [AS_TR_SH([ax_cv_have_]$1)=no])
+
+ AX_RESTORE_FLAGS
+ ])
+
+ AS_IF([test "$]AS_TR_SH([ax_cv_have_]$1)[" = "yes"],
+ [AC_DEFINE([HAVE_]$1, [1], [Define to 1 if ]$1[ is found])
+ AC_SUBST($1[_CPPFLAGS])
+ AC_SUBST($1[_LDFLAGS])
+ AC_SUBST($1[_LIB],[-l]$3)
+ ifelse([$4], , :, [$4])],
+ [ifelse([$5], , :, [$5])])
+ AM_CONDITIONAL([HAVE_]$1,[test "$]AS_TR_SH([ax_cv_have_]$1)[" = "yes"])
])
-
- AS_IF([test "$]AS_TR_SH([ax_cv_have_]$1)[" = "yes"],
- AC_DEFINE([HAVE_]$1, [1], [Define to 1 if ]$1[ is found])
- m4_ifval( m4_normalize([$4]), [$4]),
- m4_ifval( m4_normalize([$5]), [$5]))
-])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_cxx_gcc_abi_demangle.m4
^
|
| @@ -16,6 +16,7 @@
#
# LICENSE
#
+# Copyright (c) 2012 Brian Aker <brian@tangent.org>
# Copyright (c) 2008 Neil Ferguson <nferguso@eso.org>
#
# Copying and distribution of this file, with or without modification, are
@@ -25,35 +26,32 @@
#serial 9
- AC_DEFUN([AX_CXX_GCC_ABI_DEMANGLE],
- [AC_CACHE_CHECK([whether the compiler supports GCC C++ ABI name demangling],
- [ax_cv_cxx_gcc_abi_demangle],
- [AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [
-#include <typeinfo>
+AC_DEFUN([AX_CXX_GCC_ABI_DEMANGLE],
+ [AC_PREREQ([2.63])dnl
+ AC_CACHE_CHECK([whether the compiler supports GCC C++ ABI name demangling],
+ [ax_cv_cxx_gcc_abi_demangle],
+ [AC_LANG_PUSH([C++])
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <typeinfo>
#include <cxxabi.h>
#include <cstdlib>
#include <string>
+ template<typename TYPE>
+ class A {};]],
+ [[A<int> instance;
+ int status = 0;
+ char* c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status);
-template<typename TYPE> class A {};
- ],[
-A<int> instance;
-int status = 0;
-char* c_name = 0;
+ std::string name(c_name);
+ ::free(c_name);
-c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status);
-std::string name(c_name);
-::free(c_name);
-return name == "A<int>";
- ])],
- [ax_cv_cxx_gcc_abi_demangle=yes],
- [ax_cv_cxx_gcc_abi_demangle=no])
- AC_LANG_POP()
- ])
-
- if test "$ax_cv_cxx_gcc_abi_demangle" = yes; then
- AC_DEFINE(HAVE_GCC_ABI_DEMANGLE, [1], [define if the compiler supports GCC C++ ABI name demangling])
- fi
- ])
+ if (name.compare("A<int>") != 0)
+ {
+ return EXIT_FAILURE;
+ }]])],
+ [ax_cv_cxx_gcc_abi_demangle=yes],
+ [ax_cv_cxx_gcc_abi_demangle=no],
+ [ax_cv_cxx_gcc_abi_demangle=no])
+ AC_LANG_POP])
+ AS_IF([test "x$ax_cv_cxx_gcc_abi_demangle" = xyes],
+ [AC_DEFINE([HAVE_GCC_ABI_DEMANGLE],[1],[define if the compiler supports GCC C++ ABI name demangling])])
+ ])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_debug.m4
^
|
| @@ -43,19 +43,17 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#serial 3
+#serial 4
AC_DEFUN([AX_DEBUG],
[AC_PREREQ([2.63])dnl
AC_ARG_ENABLE([debug],
[AS_HELP_STRING([--enable-debug],
- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
- ax_enable_debug=yes
- AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
- ],[
- ax_enable_debug=no
- AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])
- ])
+ [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
+ [ax_enable_debug=yes
+ AC_DEFINE(DEBUG,[1],[Define to 1 to enable debugging code.])],
+ [ax_enable_debug=no
+ AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])])
AC_MSG_CHECKING([for debug])
AC_MSG_RESULT([$ax_enable_debug])
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/m4/ax_dlopen.m4
^
|
| @@ -0,0 +1,11 @@
+#serial 1
+
+AC_DEFUN([AX_DLOPEN],
+ [AS_IF([test "x$enable_shared" = xyes],
+ [AX_CHECK_LIBRARY([DL],[dlfcn.h],[dl],
+ [AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])
+ AC_CHECK_LIB([dl],[dlopen],[AC_DEFINE([HAVE_DLOPEN],[1],[Have dlopen])])
+ AC_CHECK_LIB([dl],[dladdr],[AC_DEFINE([HAVE_DLADDR],[1],[Have dladdr])])])],
+ [AM_CONDITIONAL([HAVE_DL],false)])
+ ])
+
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/m4/ax_gcc_atomic_builtins.m4
^
|
| @@ -0,0 +1,37 @@
+# serial 1
+#
+AC_DEFUN([HAVE_GCC_ATOMICS],
+ [AC_CACHE_CHECK([whether the compiler provides atomic builtins],
+ [ax_cv_gcc_atomic_builtins],
+ [AX_SAVE_FLAGS
+ AC_LANG_PUSH([C])
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([],
+ [[
+ int foo= -10; int bar= 10;
+ if (!__sync_fetch_and_add(&foo, bar) || foo)
+ {
+ return -1;
+ }
+ bar= __sync_lock_test_and_set(&foo, bar);
+ if (bar || foo != 10)
+ {
+ return -1;
+ }
+ bar= __sync_val_compare_and_swap(&bar, foo, 15);
+ if (bar)
+ {
+ return -1;
+ }
+ ]])],
+ [ax_cv_gcc_atomic_builtins=yes],
+ [ax_cv_gcc_atomic_builtins=no],
+ [AC_MSG_WARN([test program execution failed])])
+ AC_LANG_POP
+ AX_RESTORE_FLAGS
+ ])
+
+ AS_IF([test "x$ax_cv_gcc_atomic_builtins" = "xyes"],
+ [AC_DEFINE([HAVE_GCC_ATOMIC_BUILTINS],[1],
+ [Define to 1 if compiler provides atomic builtins.])
+ ])
+ ])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_harden_compiler_flags.m4
^
|
| @@ -52,7 +52,14 @@
# ? _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
# compatibility issues memcached_stat_st
-#serial 6
+#serial 7
+
+AC_DEFUN([_WARNINGS_AS_ERRORS],
+ [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
+ [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[ac_cv_warnings_as_errors=yes],
+ [ac_cv_warnings_as_errors=no])
+ ])
+ ])
AC_DEFUN([_APPEND_LINK_FLAGS_ERROR],
[AC_REQUIRE([AX_APPEND_LINK_FLAGS])
@@ -64,11 +71,13 @@
AX_APPEND_COMPILE_FLAGS([$1],,[-Werror])
])
+# Everything above this does the heavy lifting, while what follows does the specifics.
+
AC_DEFUN([_HARDEN_LINKER_FLAGS],
[_APPEND_LINK_FLAGS_ERROR([-z relro -z now])
_APPEND_LINK_FLAGS_ERROR([-pie])
AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
- [_APPEND_LINK_FLAGS_ERROR([-Werror])])
+ [AX_APPEND_LINK_FLAGS([-Werror])])
])
AC_DEFUN([_HARDEN_CC_COMPILER_FLAGS],
@@ -134,19 +143,23 @@
_APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
_APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
- AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
- [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
- AS_IF([test "x$ac_c_gcc_recent" = xyes],
- [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2])
- _APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
- _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector])
- _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
- ])])
+ AS_IF([test "x$ax_enable_debug" = xno],
+ [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+ [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
+ AS_IF([test "x$ac_c_gcc_recent" = xyes],
+ [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2])
+ _APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
+ _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector])
+ _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
+ ])])])
AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
[_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])],
[_APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
+ AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
+ [AX_APPEND_FLAG([-Werror])])
+
AC_LANG_POP([C])
])
@@ -210,17 +223,18 @@
_APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
_APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
- AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+ AS_IF([test "x$ax_enable_debug" = xno],
+ [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
[_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
AS_IF([test "x$ac_c_gcc_recent" = xyes],
[_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2])
_APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
_APPEND_COMPILE_FLAGS_ERROR([-fstack-protector])
_APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
- ])])
+ ])])])
AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
- [_APPEND_COMPILE_FLAGS_ERROR([-Werror])])
+ [AX_APPEND_FLAG([-Werror])])
AC_LANG_POP([C++])
])
@@ -236,6 +250,7 @@
# _HARDEN_CC_COMPILER_FLAGS, _HARDEN_CXX_COMPILER_FLAGS, _CC_OTHER_FLAGS
AC_DEFUN([AX_HARDEN_COMPILER_FLAGS],
[AC_PREREQ([2.63])dnl
+ AC_REQUIRE([_WARNINGS_AS_ERRORS])
AC_REQUIRE([AX_APPEND_LINK_FLAGS])
AC_REQUIRE([AX_COMPILER_VERSION])
AC_REQUIRE([AX_DEBUG])
@@ -244,11 +259,6 @@
AC_REQUIRE([gl_VISIBILITY])
AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"])
- AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
- [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[ac_cv_warnings_as_errors=yes],
- [ac_cv_warnings_as_errors=no])
- ])
-
AC_REQUIRE([_HARDEN_LINKER_FLAGS])
AC_REQUIRE([_HARDEN_CC_COMPILER_FLAGS])
AC_REQUIRE([_HARDEN_CXX_COMPILER_FLAGS])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_libevent.m4
^
|
| @@ -3,7 +3,9 @@
#
# SYNOPSIS
#
-# AX_LIBEVENT(), AX_LIBEVENT2(), AX_LIBEVENT2_EVHTTP()
+# AX_LIBEVENT([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+# AX_LIBEVENT2()
+# AX_LIBEVENT2_EVHTTP()
#
# DESCRIPTION
#
@@ -18,101 +20,107 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 2
+#serial 4
AC_DEFUN([AX_LIBEVENT],
[AC_PREREQ([2.63])dnl
AC_CACHE_CHECK([test for a working libevent],[ax_cv_libevent],
- [AX_SAVE_FLAGS
- LIBS="-levent $LIBS"
- AC_LANG_PUSH([C])
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([
+ [AX_SAVE_FLAGS
+ LIBS="-levent $LIBS"
+ AC_LANG_PUSH([C])
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([
#include <sys/types.h>
#include <sys/time.h>
#include <stdlib.h>
#include <event.h>
- ],[
- struct event_base *tmp_event= event_init();
- event_base_free(tmp_event);
- ])],
- [ax_cv_libevent=yes],
- [ax_cv_libevent=no],
- [AC_MSG_WARN([test program execution failed])])
- AC_LANG_POP
- AX_RESTORE_FLAGS
- ])
+ ],[
+ struct event_base *tmp_event= event_init();
+ event_base_free(tmp_event);
+ ])],
+ [ax_cv_libevent=yes],
+ [ax_cv_libevent=no],
+ [AC_MSG_WARN([test program execution failed])])
+ AC_LANG_POP
+ AX_RESTORE_FLAGS
+ ])
AS_IF([test "x$ax_cv_libevent" = "xyes"],
- [LIBEVENT_LDFLAGS="-levent"
- AC_SUBST(LIBEVENT_LDFLAGS)
- AC_DEFINE([HAVE_LIBEVENT],[1],[Define if event_init is present in event.h.])],
- [AC_DEFINE([HAVE_LIBEVENT],[0],[Define if event_init is present in event.h.])])
+ [AC_SUBST([LIBEVENT_LIB],[-levent])
+ AC_DEFINE([HAVE_LIBEVENT],[1],[Define if event_init is present in event.h.])],
+ [AC_DEFINE([HAVE_LIBEVENT],[0],[Define if event_init is present in event.h.])])
AM_CONDITIONAL(HAVE_LIBEVENT, test "x$ax_cv_libevent" = "xyes")
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+ AS_IF([test "x$ax_cv_libevent" = xyes],
+ [$1],
+ [$2])
])
- AC_DEFUN([AX_LIBEVENT2],
- [AC_REQUIRE([AX_LIBEVENT])
- AC_CACHE_CHECK([test for a working libevent version 2],[ax_cv_libevent2],
- [AX_SAVE_FLAGS
- LIBS="-levent $LIBS"
- AC_LANG_PUSH([C])
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([
+AC_DEFUN([AX_LIBEVENT2],
+ [AC_REQUIRE([AX_LIBEVENT])
+ AC_CACHE_CHECK([test for a working libevent version 2],[ax_cv_libevent2],
+ [AX_SAVE_FLAGS
+ LIBS="-levent $LIBS"
+ AC_LANG_PUSH([C])
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([
#include <sys/types.h>
#include <sys/time.h>
#include <stdlib.h>
#include <event2/event.h>
- ],[
- struct event_base *tmp_event= event_init();
- event_base_free(tmp_event);
- ])],
- [ax_cv_libevent2=yes],
- [ax_cv_libevent2=no],
- [AC_MSG_WARN([test program execution failed])])
- AC_LANG_POP
- AX_RESTORE_FLAGS
- ])
-
- AS_IF([test "x$ax_cv_libevent2" = xyes],
- [LIBEVENT2_LDFLAGS="-levent"
- AC_SUBST(LIBEVENT2_LDFLAGS)
- AC_DEFINE([HAVE_LIBEVENT2],[1],[Define if event_init is present in event2/event.h.])],
- [AC_DEFINE([HAVE_LIBEVENT2],[0],[Define if event_init is present in event2/event.h.])])
-
- AM_CONDITIONAL([HAVE_LIBEVENT2], [test "x$ax_cv_libevent2" = xyes])
- ])
-
- AC_DEFUN([AX_LIBEVENT2_EVHTTP],
- [AC_REQUIRE([AX_LIBEVENT2])
- AC_CACHE_CHECK([test for a working libevent2 evhttp interface], [ax_cv_libevent2_evhttp],
- [AX_SAVE_FLAGS
- LIBS="-levent $LIBS"
- AC_LANG_PUSH([C])
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([
+ ],[
+ struct event_base *tmp_event= event_init();
+ event_base_free(tmp_event);
+ ])],
+ [ax_cv_libevent2=yes],
+ [ax_cv_libevent2=no],
+ [AC_MSG_WARN([test program execution failed])])
+ AC_LANG_POP([C])
+ AX_RESTORE_FLAGS
+ ])
+
+ AS_IF([test "x$ax_cv_libevent2" = xyes],
+ [AC_SUBST([LIBEVENT2_LIB],[-levent])
+ AC_DEFINE([HAVE_LIBEVENT2],[1],[Define if event_init is present in event2/event.h.])],
+ [AC_DEFINE([HAVE_LIBEVENT2],[0],[Define if event_init is present in event2/event.h.])])
+
+ AM_CONDITIONAL([HAVE_LIBEVENT2], [test "x$ax_cv_libevent2" = xyes])
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+ AS_IF([test "x$ax_cv_libevent2" = xyes],
+ [$1],
+ [$2])
+ ])dnl AX_LIBEVENT2
+
+#
+AC_DEFUN([AX_LIBEVENT2_EVHTTP],
+ [AC_REQUIRE([AX_LIBEVENT2])
+ AC_CACHE_CHECK([test for a working libevent2 evhttp interface], [ax_cv_libevent2_evhttp],
+ [AX_SAVE_FLAGS
+ LIBS="-levent $LIBS"
+ AC_LANG_PUSH([C])
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([
#include <sys/types.h>
#include <sys/time.h>
#include <stdlib.h>
#include <event2/event.h>
#include <event2/http.h>
- ],[
- struct event_base *libbase= event_base_new();
- struct evhttp *libsrvr= evhttp_new(libbase);
- ])],
- [ax_cv_libevent2_evhttp=yes],
- [ax_cv_libevent2_evhttp=no],
- [AC_MSG_WARN([test program execution failed])])
- AC_LANG_POP
- AX_RESTORE_FLAGS
- ])
-
- AS_IF([test "x$ax_cv_libevent2_evhttp" = "xyes"],
- [LIBEVENT2_LDFLAGS="-levent"
- AC_SUBST(LIBEVENT2_LDFLAGS)
- AC_DEFINE([HAVE_LIBEVENT2],[1],[Define if event_init is present in event2/event.h.])],
- [AC_DEFINE([HAVE_LIBEVENT2],[0],[Define if event_init is present in event2/event.h.])])
-
- AM_CONDITIONAL([HAVE_LIBEVENT2_EVHTTP],[test "x$ax_cv_libevent2_evhttp" = xyes])
- ])
+ ],[
+ struct event_base *libbase= event_base_new();
+ struct evhttp *libsrvr= evhttp_new(libbase);
+ ])],
+ [ax_cv_libevent2_evhttp=yes],
+ [ax_cv_libevent2_evhttp=no],
+ [AC_MSG_WARN([test program execution failed])])
+ AC_LANG_POP([C])
+ AX_RESTORE_FLAGS
+ ])
+
+ AS_IF([test "x$ax_cv_libevent2_evhttp" = "xyes"],
+ [AC_DEFINE([HAVE_LIBEVENT2_EVHTTP],[1],[Define if event_init is present in event2/http.h.])],
+ [AC_DEFINE([HAVE_LIBEVENT2_EVHTTP],[0],[Define if event_init is present in event2/http.h.])])
+
+ AM_CONDITIONAL([HAVE_LIBEVENT2_EVHTTP],[test "x$ax_cv_libevent2_evhttp" = xyes])
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+ AS_IF([test "x$ax_cv_libevent2_evhttp" = xyes],
+ [$1],
+ [$2])
+ ])dnl AX_LIBEVENT2_EVHTTP
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_sasl.m4
^
|
| @@ -23,22 +23,21 @@
#serial 2
AC_DEFUN([AX_SASL_OPTION],
- [AC_ARG_ENABLE([sasl],
+ [AC_REQUIRE([AX_SASL_CHECK])
+ AC_ARG_ENABLE([sasl],
[AS_HELP_STRING([--disable-sasl], [Build with sasl support @<:@default=on@:>@])],
[ac_enable_sasl="$enableval"],
[ac_enable_sasl=yes])
- ax_sasl_option=no
AS_IF([test "x${ac_enable_sasl}" = xyes],
- [AX_SASL_CHECK
- echo "$ax_sasl_check"
+ [AC_MSG_CHECKING([checking to see if enabling sasl])
AS_IF([test "x${ax_sasl_check}" = xyes],
[ax_sasl_option=yes],
- [AC_MSG_WARN([request to add sasl support failed, please see config.log])])
+ [AC_MSG_WARN([request to add sasl support failed, please see config.log])
+ ac_enable_sasl=no
+ ax_sasl_option=no])
+ AC_MSG_RESULT(["$ax_sasl_option"])
])
-
- AC_MSG_CHECKING([checking to see if enabling sasl])
- AC_MSG_RESULT(["$ax_sasl_option"])
AM_CONDITIONAL([HAVE_SASL],[test "x${ax_sasl_option}" = xyes])
])
@@ -46,7 +45,7 @@
[ax_sasl_check=no
AX_CHECK_LIBRARY([LIBSASL],[sasl/sasl.h],[sasl2],
[ax_sasl_check=yes
- AC_SUBST([SASL_LDFLAGS],[[-lsasl2]])
+ AC_SUBST([SASL_LIB],[[-lsasl2]])
])
AC_MSG_CHECKING([checking to see if sasl works])
AC_MSG_RESULT(["$ax_sasl_check"])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_uuid.m4
^
|
| @@ -21,7 +21,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 5
+#serial 6
AC_DEFUN([AX_UUID],
[AC_PREREQ([2.63])dnl
@@ -62,14 +62,14 @@
[ax_libuuid=yes])
],[ax_libuuid=no])
- AS_IF([test "$ax_libuuid" = yes],
+ AS_IF([test "x$ax_libuuid" = xyes],
[AC_DEFINE([HAVE_UUID_UUID_H],[1],[Have uuid/uuid.h])
- AS_IF([test "$ax_cv_libuuid_is_required" = yes],[ LIBUUID_LDFLAGS='-luuid' ])],
+ AS_IF([test "x$ax_cv_libuuid_is_required" = xyes],[ LIBUUID_LIB='-luuid' ])],
[AC_DEFINE([HAVE_UUID_UUID_H],[0],[Have uuid/uuid.h])
])
- AC_SUBST([LIBUUID_LDFLAGS])
- AM_CONDITIONAL([HAVE_LIBUUID],[test "$ax_libuuid" = yes])
+ AC_SUBST([LIBUUID_LIB])
+ AM_CONDITIONAL([HAVE_LIBUUID],[test "x$ax_libuuid" = xyes])
])
AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE],
@@ -78,7 +78,7 @@
AC_CACHE_CHECK([for uuid_generate_time_safe],
[ax_cv_uuid_generate_time_safe],
[AX_SAVE_FLAGS
- LIBS="$LIBUUID_LDFLAGS $LIBS"
+ LIBS="$LIBUUID_LIB $LIBS"
AC_LANG_PUSH([C])
AC_RUN_IFELSE([
AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/ax_vcs_checkout.m4
^
|
| @@ -68,7 +68,8 @@
[ac_cv_vcs_checkout=no])
])
- AM_CONDITIONAL([IS_VCS_CHECKOUT], [test "x$ac_cv_vcs_checkout" = "xyes"])
- AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],[AC_DEFINE([VCS_CHECKOUT],[1],[Define if the code was built from VCS.])],
+ AM_CONDITIONAL([IS_VCS_CHECKOUT],[test "x$ac_cv_vcs_checkout" = "xyes"])
+ AS_IF([test "x$ac_cv_vcs_checkout" = "xyes"],
+ [AC_DEFINE([VCS_CHECKOUT],[1],[Define if the code was built from VCS.])],
[AC_DEFINE([VCS_CHECKOUT],[0],[Define if the code was built from VCS.])])
])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/bottom.m4
^
|
| @@ -5,7 +5,7 @@
/* _SYS_FEATURE_TESTS_H is Solaris, _FEATURES_H is GCC */
#if defined( _SYS_FEATURE_TESTS_H) || defined(_FEATURES_H)
-#error "You should include config.h as your first include file"
+#error "You should include mem_config.h as your first include file"
#endif
])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/m4/libgearman.m4
^
|
| @@ -1,10 +1,5 @@
-# serial 1
+# serial 2
AC_DEFUN([CHECK_FOR_LIBGEARMAND],
- [AX_CHECK_LIBRARY([LIBGEARMAN], [libgearman/gearmand.h], [gearman],
- [ax_check_for_libgearman=yes],
- [ax_check_for_libgearman=no])
- AS_IF([test "$ax_check_for_libgearman" = xyes],
- [AC_DEFINE([HAVE_LIBGEARMAN],[1],[Enables libgearman Support])],
- [AC_DEFINE([HAVE_LIBGEARMAN],[0],[Enables libgearman Support])])
- AM_CONDITIONAL(HAVE_LIBGEARMAN,[test "$ax_check_for_libgearman" = xyes])
- ])
+ [AX_CHECK_LIBRARY([LIBGEARMAN],[libgearman/gearman.h],[gearman],,
+ [AC_DEFINE([HAVE_LIBGEARMAN],[0],[Define to 1 to compile in libgearman support])])
+ ])
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_clone.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_CLONE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_CLONE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_clone \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_crc32.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_CRC32" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_CRC32" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_crc32 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_create.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_CREATE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_CREATE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_create \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_fnv1_32.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1_32" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_FNV1_32" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_fnv1_32 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_fnv1_64.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1_64" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_FNV1_64" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_fnv1_64 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_fnv1a_32.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1A_32" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_FNV1A_32" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_fnv1a_32 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_fnv1a_64.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FNV1A_64" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_FNV1A_64" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_fnv1a_64 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_free.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FREE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_FREE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_free \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_functions.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_FUNCTIONS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_FUNCTIONS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_functions \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_hsieh.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_HSIEH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_HSIEH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_hsieh \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_is_allocated.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_IS_ALLOCATED" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_IS_ALLOCATED" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_is_allocated \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_jenkins.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_JENKINS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_JENKINS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_jenkins \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_md5.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_MD5" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_MD5" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_md5 \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_murmur.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_MURMUR" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_MURMUR" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_murmur \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/hashkit_value.3
^
|
| @@ -1,4 +1,4 @@
-.TH "HASHKIT_VALUE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "HASHKIT_VALUE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
hashkit_value \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/include.am
^
|
| @@ -3,7 +3,6 @@
# All paths should be given relative to the root
if HAVE_RECENT_SPHINX
-
if IS_VCS_CHECKOUT
dist-hook: man
@@ -11,10 +10,11 @@
# Build rule for documentation
$(dist_man_MANS): man
-endif
-
BUILT_SOURCES+= $(dist_man_MANS)
+endif
+endif
+
dist_man_MANS+= man/memaslap.1
dist_man_MANS+= man/memcapable.1
dist_man_MANS+= man/memcat.1
@@ -133,5 +133,3 @@
dist_man_MANS+= man/memcached_touch_by_key.3
dist_man_MANS+= man/memcached_verbosity.3
dist_man_MANS+= man/memcached_version.3
-
-endif
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/libhashkit.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBHASHKIT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "LIBHASHKIT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
libhashkit \- libhashkit Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/libmemcached.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "LIBMEMCACHED" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
libmemcached \- Introducing the C Client Library for memcached
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/libmemcached_check_configuration.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
libmemcached_check_configuration \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/libmemcached_configuration.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_CONFIGURATION" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "LIBMEMCACHED_CONFIGURATION" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
libmemcached_configuration \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/libmemcached_examples.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHED_EXAMPLES" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "LIBMEMCACHED_EXAMPLES" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
libmemcached_examples \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/libmemcachedutil.3
^
|
| @@ -1,4 +1,4 @@
-.TH "LIBMEMCACHEDUTIL" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "LIBMEMCACHEDUTIL" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
libmemcachedutil \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memaslap.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMASLAP" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMASLAP" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memaslap \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_add.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_ADD" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_ADD" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_add \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_add_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_ADD_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_ADD_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_add_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_analyze.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_ANALYZE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_ANALYZE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_analyze \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_append.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_APPEND" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_APPEND" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_append \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_append_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_APPEND_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_APPEND_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_append_by_key \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_behavior_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR_GET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR_GET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_behavior_get \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_behavior_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_BEHAVIOR_SET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_BEHAVIOR_SET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_behavior_set \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_callback_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK_GET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_CALLBACK_GET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_callback_get \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_callback_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CALLBACK_SET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_CALLBACK_SET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_callback_set \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_cas.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CAS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_CAS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_cas \- Working with data on the server in an atomic fashion
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_cas_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CAS_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_CAS_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_cas_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_clone.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CLONE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_CLONE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_clone \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_create.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_CREATE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_CREATE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_create \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_decrement.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DECREMENT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_DECREMENT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_decrement \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_decrement_with_initial.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_decrement_with_initial \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_delete.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DELETE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_DELETE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_delete \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_delete_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DELETE_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_DELETE_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_delete_by_key \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_destroy_sasl_auth_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_destroy_sasl_auth_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_dump.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_DUMP" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_DUMP" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_dump \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_exist.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_EXIST" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_EXIST" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_exist \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_exist_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_EXIST_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_EXIST_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_exist_by_key \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_fetch.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_FETCH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_fetch \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_fetch_execute.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH_EXECUTE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_FETCH_EXECUTE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_fetch_execute \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_fetch_result.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FETCH_RESULT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_FETCH_RESULT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_fetch_result \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_flush_buffers.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FLUSH_BUFFERS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_FLUSH_BUFFERS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_flush_buffers \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_free.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_FREE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_FREE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_free \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_generate_hash.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GENERATE_HASH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GENERATE_HASH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_generate_hash \- Generating hash values directly
.
@@ -87,6 +87,10 @@
.TP
.B MEMCACHED_HASH_HSIEH
.UNINDENT
+.INDENT 0.0
+.TP
+.B MEMCACHED_HASH_MURMUR3
+.UNINDENT
.sp
Compile and link with \-lmemcachedutil \-lmemcached
.SH DESCRIPTION
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_generate_hash_value.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_generate_hash_value \- Generating hash values directly
.
@@ -87,6 +87,10 @@
.TP
.B MEMCACHED_HASH_HSIEH
.UNINDENT
+.INDENT 0.0
+.TP
+.B MEMCACHED_HASH_MURMUR3
+.UNINDENT
.sp
Compile and link with \-lmemcachedutil \-lmemcached
.SH DESCRIPTION
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_get \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_get_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GET_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_get_by_key \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_get_memory_allocators.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_get_memory_allocators \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_get_sasl_callbacks.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_get_sasl_callbacks \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_get_user_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_GET_USER_DATA" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_GET_USER_DATA" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_get_user_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_increment.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_INCREMENT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_INCREMENT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_increment \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_increment_with_initial.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_increment_with_initial \- Incrementing and Decrementing Values
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_last_error_message.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_last_error_message \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_lib_version.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_LIB_VERSION" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_LIB_VERSION" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_lib_version \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_mget.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_MGET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_mget \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_mget_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_MGET_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_mget_by_key \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_mget_execute.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_EXECUTE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_MGET_EXECUTE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_mget_execute \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_mget_execute_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_mget_execute_by_key \- Retrieving data from the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_behavior_get.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_behavior_get \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_behavior_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_behavior_set \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_create.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_CREATE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_CREATE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_create \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_destroy.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_DESTROY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_DESTROY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_destroy \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_fetch.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_FETCH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_FETCH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_fetch \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_pop.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_POP" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_POP" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_pop \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_push.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_PUSH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_PUSH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_push \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_release.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_RELEASE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_RELEASE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_release \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_pool_st.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_POOL_ST" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_POOL_ST" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_pool_st \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_prepend.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_PREPEND" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_PREPEND" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_prepend \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_prepend_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_PREPEND_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_PREPEND_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_prepend_by_key \- Appending to or Prepending to data on the server
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_quit.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_QUIT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_QUIT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_quit \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_replace.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_REPLACE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_REPLACE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_replace \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_replace_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_REPLACE_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_REPLACE_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_replace_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_sasl_set_auth_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_sasl_set_auth_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_add.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_ADD" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_ADD" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_add \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_count.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_COUNT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_COUNT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_count \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_cursor.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_CURSOR" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_CURSOR" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_cursor \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_list.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_list \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_list_append.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_list_append \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_list_count.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_list_count \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_list_free.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_LIST_FREE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_LIST_FREE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_list_free \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_server_push.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVER_PUSH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVER_PUSH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_server_push \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_servers_parse.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SERVERS_PARSE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SERVERS_PARSE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_servers_parse \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_set.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SET" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_set \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_set_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SET_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_set_by_key \- Storing and Replacing Data
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_set_memory_allocators.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_set_memory_allocators \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_set_sasl_callbacks.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_set_sasl_callbacks \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_set_user_data.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_SET_USER_DATA" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_SET_USER_DATA" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_set_user_data \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_stat.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_STAT" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_stat \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_stat_execute.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_EXECUTE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_STAT_EXECUTE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_stat_execute \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_stat_get_keys.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_GET_KEYS" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_STAT_GET_KEYS" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_stat_get_keys \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_stat_get_value.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_GET_VALUE" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_STAT_GET_VALUE" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_stat_get_value \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_stat_servername.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STAT_SERVERNAME" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_STAT_SERVERNAME" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_stat_servername \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_strerror.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_STRERROR" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_STRERROR" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_strerror \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_touch.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_TOUCH" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_TOUCH" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_touch \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_touch_by_key.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_TOUCH_BY_KEY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_TOUCH_BY_KEY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_touch_by_key \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_verbosity.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_VERBOSITY" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_VERBOSITY" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_verbosity \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcached_version.3
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCACHED_VERSION" "3" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCACHED_VERSION" "3" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcached_version \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcapable.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCAPABLE" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCAPABLE" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcapable \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcat.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCAT" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCAT" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcat \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memcp.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMCP" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMCP" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memcp \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memdump.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMDUMP" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMDUMP" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memdump \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memerror.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMERROR" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMERROR" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memerror \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memexist.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMEXIST" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMEXIST" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memexist \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memflush.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMFLUSH" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMFLUSH" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memflush \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memparse.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMPARSE" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMPARSE" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memparse \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memping.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMPING" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMPING" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memping \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memrm.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMRM" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMRM" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memrm \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memslap.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMSLAP" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMSLAP" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memslap \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memstat.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMSTAT" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMSTAT" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memstat \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/man/memtouch.1
^
|
| @@ -1,4 +1,4 @@
-.TH "MEMTOUCH" "1" "November 14, 2012" "1.0.14" "libmemcached"
+.TH "MEMTOUCH" "1" "December 17, 2012" "1.0.15" "libmemcached"
.SH NAME
memtouch \- libmemcached Documentation
.
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/mem_config.in
^
|
| @@ -5,7 +5,7 @@
/* _SYS_FEATURE_TESTS_H is Solaris, _FEATURES_H is GCC */
#if defined( _SYS_FEATURE_TESTS_H) || defined(_FEATURES_H)
-#error "You should include config.h as your first include file"
+#error "You should include mem_config.h as your first include file"
#endif
@@ -13,9 +13,6 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
-/* Support for backtrace(). */
-#undef AX_ENABLE_BACKTRACE
-
/* the location of <cinttypes> */
#undef CINTTYPES_H
@@ -83,9 +80,18 @@
don't. */
#undef HAVE_DECL_STRERROR_R
+/* Define to 1 if DL is found */
+#undef HAVE_DL
+
+/* Have dladdr */
+#undef HAVE_DLADDR
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* Have dlopen */
+#undef HAVE_DLOPEN
+
/* Support for DrizzleD */
#undef HAVE_DRIZZLED_BINARY
@@ -125,6 +131,9 @@
/* define if the compiler supports GCC C++ ABI name demangling */
#undef HAVE_GCC_ABI_DEMANGLE
+/* Define to 1 if compiler provides atomic builtins. */
+#undef HAVE_GCC_ATOMIC_BUILTINS
+
/* If Gearmand binary is available */
#undef HAVE_GEARMAND_BINARY
@@ -161,18 +170,21 @@
/* Define if event_init is present in event.h. */
#undef HAVE_LIBEVENT
-/* Enables libgearman Support */
+/* Define to 1 to compile in libgearman support */
#undef HAVE_LIBGEARMAN
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
/* Enables libmemcached Support */
#undef HAVE_LIBMEMCACHED
+/* Have libmemcached-1.0/memcached.h */
+#undef HAVE_LIBMEMCACHED_MEMCACHED_H
+
+/* Have libmemcachedutil-1.0/util.h */
+#undef HAVE_LIBMEMCACHED_UTIL_H
+
/* Define to 1 if MySQL libraries are available */
#undef HAVE_LIBMYSQL_BUILD
@@ -197,6 +209,9 @@
/* If Memcached binary is available */
#undef HAVE_MEMCACHED_BINARY
+/* If Memcached binary with sasl support is available */
+#undef HAVE_MEMCACHED_SASL_BINARY
+
/* Define to 1 if you have the `memchr' function. */
#undef HAVE_MEMCHR
@@ -272,6 +287,9 @@
/* Define to 1 if you have the `setppriv' function. */
#undef HAVE_SETPPRIV
+/* Enable code which requires shared library support. Like backtrace(). */
+#undef HAVE_SHARED_ENABLED
+
/* Define to 1 if you have the `sigignore' function. */
#undef HAVE_SIGIGNORE
@@ -424,7 +442,7 @@
/* Name of the mysqld binary used in make test */
#undef MYSQLD_BINARY
-/* Define to 1 to enable assert'ing code. */
+/* Define to 1 to disable assert'ing code. */
#undef NDEBUG
/* Name of package */
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/poll/poll.c
^
|
| @@ -8,7 +8,7 @@
* Summary: Implementation of poll by using select
*
*/
-#include "config.h"
+#include "mem_config.h"
#if defined(WIN32) || defined(__MINGW32__)
# include <winsock2.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/rpm/include.am
^
|
| @@ -16,7 +16,7 @@
@rpmbuild -ba support/$(PACKAGE).spec
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-$(VERSION)*.rpm .
@cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-devel-$(VERSION)*.rpm .
- @cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
+ -cp ~/rpmbuild/RPMS/x86_64/$(PACKAGE)-debuginfo-$(VERSION)*.rpm .
@cp ~/rpmbuild/SRPMS/$(PACKAGE)-$(VERSION)*.rpm .
rpm-sign: rpm-build
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/support/libmemcached.spec
^
|
| @@ -1,6 +1,6 @@
Name: libmemcached
Summary: memcached C library and command line tools
-Version: 1.0.14
+Version: 1.0.15
Release: 1
License: BSD
Group: System Environment/Libraries
@@ -10,7 +10,6 @@
# For test suite
BuildRequires: bash
BuildRequires: binutils
-BuildRequires: ccache
BuildRequires: coreutils
BuildRequires: cpio
BuildRequires: cyrus-sasl-devel
@@ -20,7 +19,6 @@
BuildRequires: findutils
BuildRequires: gawk
BuildRequires: gcc
-BuildRequires: gdb
BuildRequires: glibc
BuildRequires: glibc-common
BuildRequires: glibc-devel
@@ -31,14 +29,10 @@
BuildRequires: libevent-devel
BuildRequires: libstdc++-devel
BuildRequires: libuuid-devel
-BuildRequires: llvm-libs
BuildRequires: make
BuildRequires: memcached
-BuildRequires: mysql-libs
BuildRequires: pkgconfig
-BuildRequires: protobuf-devel
BuildRequires: python-sphinx
-BuildRequires: qt3
BuildRequires: sed
BuildRequires: tar
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/support/libmemcached.spec.in
^
|
| @@ -10,7 +10,6 @@
# For test suite
BuildRequires: bash
BuildRequires: binutils
-BuildRequires: ccache
BuildRequires: coreutils
BuildRequires: cpio
BuildRequires: cyrus-sasl-devel
@@ -20,7 +19,6 @@
BuildRequires: findutils
BuildRequires: gawk
BuildRequires: gcc
-BuildRequires: gdb
BuildRequires: glibc
BuildRequires: glibc-common
BuildRequires: glibc-devel
@@ -31,14 +29,10 @@
BuildRequires: libevent-devel
BuildRequires: libstdc++-devel
BuildRequires: libuuid-devel
-BuildRequires: llvm-libs
BuildRequires: make
BuildRequires: memcached
-BuildRequires: mysql-libs
BuildRequires: pkgconfig
-BuildRequires: protobuf-devel
BuildRequires: python-sphinx
-BuildRequires: qt3
BuildRequires: sed
BuildRequires: tar
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/cli.am
^
|
| @@ -11,77 +11,77 @@
tests_memcapable_SOURCES= tests/memcapable.cc
tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcapable
+EXTRA_tests_memcapable_DEPENDENCIES= clients/memcapable
tests_memcapable_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memcapable
noinst_PROGRAMS+= tests/memcapable
tests_memstat_SOURCES= tests/memstat.cc
tests_memstat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memstat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memstat
+EXTRA_tests_memstat_DEPENDENCIES= clients/memstat
tests_memstat_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memstat
noinst_PROGRAMS+= tests/memstat
tests_memcp_SOURCES= tests/memcp.cc
tests_memcp_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcp_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcp
+EXTRA_tests_memcp_DEPENDENCIES= clients/memcp
tests_memcp_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memcp
noinst_PROGRAMS+= tests/memcp
tests_memflush_SOURCES= tests/memflush.cc
tests_memflush_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memflush_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memflush
+EXTRA_tests_memflush_DEPENDENCIES= clients/memflush
tests_memflush_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memflush
noinst_PROGRAMS+= tests/memflush
tests_memrm_SOURCES= tests/memrm.cc
tests_memrm_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memrm_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memrm
+EXTRA_tests_memrm_DEPENDENCIES= clients/memrm
tests_memrm_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memrm
noinst_PROGRAMS+= tests/memrm
tests_memexist_SOURCES= tests/memexist.cc
tests_memexist_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memexist_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memexist
+EXTRA_tests_memexist_DEPENDENCIES= clients/memexist
tests_memexist_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memexist
noinst_PROGRAMS+= tests/memexist
tests_memtouch_SOURCES= tests/memtouch.cc
tests_memtouch_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memtouch_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memtouch
+EXTRA_tests_memtouch_DEPENDENCIES= clients/memtouch
tests_memtouch_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memtouch
noinst_PROGRAMS+= tests/memtouch
tests_memcat_SOURCES= tests/memcat.cc
tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcat
+EXTRA_tests_memcat_DEPENDENCIES= clients/memcat
tests_memcat_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memcat
noinst_PROGRAMS+= tests/memcat
tests_memerror_SOURCES= tests/memerror.cc
tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memerror_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memerror
+EXTRA_tests_memerror_DEPENDENCIES= clients/memerror
tests_memerror_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memerror
noinst_PROGRAMS+= tests/memerror
tests_memslap_SOURCES= tests/memslap.cc
tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memslap
+EXTRA_tests_memslap_DEPENDENCIES= clients/memslap
tests_memslap_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memslap
noinst_PROGRAMS+= tests/memslap
tests_memdump_SOURCES= tests/memdump.cc
tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memdump_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memdump
+EXTRA_tests_memdump_DEPENDENCIES= clients/memdump
tests_memdump_LDADD= libtest/libtest.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/memdump
noinst_PROGRAMS+= tests/memdump
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/failure.cc
^
|
| @@ -102,7 +102,7 @@
return TEST_SUCCESS;
}
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
static test_return_t cull_TEST(memcached_st *memc)
{
uint32_t count= memcached_server_count(memc);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/hash_plus.cc
^
|
| @@ -130,6 +130,12 @@
list= hsieh_values;
break;
+ case HASHKIT_HASH_MURMUR3:
+#ifdef WORDS_BIGENDIAN
+ continue;
+#endif
+ list= murmur3_values;
+ break;
case HASHKIT_HASH_MURMUR:
#ifdef WORDS_BIGENDIAN
continue;
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/hash_results.h
^
|
| @@ -113,8 +113,17 @@
264013145U, 3995512858U, 2400956718U, 2346666219U,
926327338U, 442757446U, 1770805201U, 560483147U,
3902279934U };
+
+static uint32_t murmur3_values[]= { 1120212521U, 1448785489U, 4186307405U, 2686268514U,
+ 444808887U, 221750260U, 3074673162U, 1946933257U,
+ 2826416675U, 2430719166U, 3200429559U, 297894347U,
+ 732888124U, 4050076964U, 3298336176U, 1336207361U,
+ 810553576U, 3748182674U, 3860119212U, 3439537197U,
+ 3044240981U, 1464271804U, 3896193724U, 2915115798U,
+ 1702843840U };
#else
static uint32_t murmur_values[]= { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+static uint32_t murmur3_values[]= { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
#endif
static uint32_t jenkins_values[]= { 1442444624U, 4253821186U, 1885058256U, 2120131735U,
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/hashkit_functions.cc
^
|
| @@ -262,6 +262,27 @@
return TEST_SUCCESS;
}
+static test_return_t murmur3_TEST(hashkit_st *)
+{
+ test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_MURMUR3));
+
+#ifdef WORDS_BIGENDIAN
+ (void)murmur3_values;
+ return TEST_SKIPPED;
+#else
+ uint32_t x;
+ const char **ptr;
+
+ for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+ {
+ test_compare(murmur3_values[x],
+ libhashkit_murmur3(*ptr, strlen(*ptr)));
+ }
+
+ return TEST_SUCCESS;
+#endif
+}
+
static test_return_t murmur_run (hashkit_st *)
{
test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_MURMUR));
@@ -509,6 +530,7 @@
{"fnv1a_32", 0, (test_callback_fn*)fnv1a_32_run },
{"hsieh", 0, (test_callback_fn*)hsieh_run },
{"murmur", 0, (test_callback_fn*)murmur_run },
+ {"murmur3", 0, (test_callback_fn*)murmur3_TEST },
{"jenkis", 0, (test_callback_fn*)jenkins_run },
{0, 0, (test_callback_fn*)0}
};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/include.am
^
|
| @@ -13,10 +13,6 @@
TESTS_LDADDS+= libmemcached/libmemcachedutil.la
TESTS_LDADDS+= libtest/libtest.la
-DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
-
-PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
-
EXTRA_DIST+= tests/cpp_example.cc
noinst_HEADERS+= tests/exist.h
@@ -25,7 +21,7 @@
noinst_HEADERS+= tests/libmemcached_test_container.h
noinst_HEADERS+= tests/libmemcached_world.h
noinst_HEADERS+= tests/libmemcached_world_socket.h
-noinst_HEADERS+= tests/memc.h
+noinst_HEADERS+= tests/memc.hpp
noinst_HEADERS+= tests/runner.h
# Cycle should always run first
@@ -33,8 +29,7 @@
tests_cycle_CXXFLAGS= $(AM_CXXFLAGS)
tests_cycle_CXXFLAGS+= ${PTHREAD_CFLAGS}
tests_cycle_SOURCES= tests/cycle.cc
-tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
-tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+tests_cycle_LDADD= $(TESTS_LDADDS)
tests_cycle_LDADD+= ${PTHREAD_LIBS}
check_PROGRAMS+= tests/cycle
noinst_PROGRAMS+= tests/cycle
@@ -53,8 +48,7 @@
tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc
tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
-tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
-tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
+tests_failure_LDADD= $(TESTS_LDADDS)
check_PROGRAMS+= tests/failure
noinst_PROGRAMS+= tests/failure
@@ -62,12 +56,11 @@
@tests/failure
gdb-failure: tests/failure
- @$(DEBUG_COMMAND) tests/failure
+ @$(GDB_COMMAND) tests/failure
tests_testhashkit_SOURCES= tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
check_PROGRAMS+= tests/testhashkit
noinst_PROGRAMS+= tests/testhashkit
@@ -77,8 +70,7 @@
tests_hash_plus_SOURCES= tests/hash_plus.cc
tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
-tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD= $(tests_testhashkit_LDADD)
check_PROGRAMS+= tests/hash_plus
noinst_PROGRAMS+= tests/hash_plus
@@ -108,19 +100,19 @@
@$(PAHOLE_COMMAND) tests/testapp
gdb-mem: tests/libmemcached-1.0/testapp
- @$(DEBUG_COMMAND) tests/libmemcached-1.0/testapp
+ @$(GDB_COMMAND) tests/libmemcached-1.0/testapp
gdb-atom: tests/atomsmasher
- @$(DEBUG_COMMAND) tests/atomsmasher
+ @$(GDB_COMMAND) tests/atomsmasher
gdb-hash: tests/testhashkit
- @$(DEBUG_COMMAND) tests/testhashkit
+ @$(GDB_COMMAND) tests/testhashkit
gdb-hashplus: tests/hash_plus
- @$(DEBUG_COMMAND) tests/hash_plus
+ @$(GDB_COMMAND) tests/hash_plus
gdb-cycle: tests/cycle
- @$(DEBUG_COMMAND) tests/cycle
+ @$(GDB_COMMAND) tests/cycle
valgrind-cycle: tests/cycle
$(VALGRIND_COMMAND) tests/cycle
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/all_tests.h
^
|
| @@ -346,6 +346,7 @@
#endif
test_st ketama_auto_eject_hosts[] ={
+ {"basic ketama test", true, (test_callback_fn*)ketama_TEST },
{"auto_eject_hosts", true, (test_callback_fn*)auto_eject_hosts },
{"output_ketama_weighted_keys", true, (test_callback_fn*)output_ketama_weighted_keys },
{0, 0, (test_callback_fn*)0}
@@ -361,6 +362,7 @@
{"fnv1a_32", false, (test_callback_fn*)fnv1a_32_run },
{"hsieh", false, (test_callback_fn*)hsieh_run },
{"murmur", false, (test_callback_fn*)murmur_run },
+ {"murmur3", false, (test_callback_fn*)murmur3_TEST },
{"jenkis", false, (test_callback_fn*)jenkins_run },
{"memcached_get_hashkit", false, (test_callback_fn*)memcached_get_hashkit_test },
{0, 0, (test_callback_fn*)0}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/debug.cc
^
|
| @@ -46,7 +46,7 @@
#include <tests/debug.h>
#include <tests/print.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
/* Dump each server's keys */
static memcached_return_t print_keys_callback(const memcached_st *,
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/include.am
^
|
| @@ -38,9 +38,10 @@
noinst_HEADERS+= tests/touch.h
noinst_HEADERS+= tests/virtual_buckets.h
+if HAVE_DTRACE
+else
# Test internals
tests_libmemcached_1_0_internals_CXXFLAGS=
-tests_libmemcached_1_0_internals_DEPENDENCIES=
tests_libmemcached_1_0_internals_LDADD=
tests_libmemcached_1_0_internals_SOURCES=
@@ -48,9 +49,6 @@
tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc
tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS)
tests_libmemcached_1_0_internals_CXXFLAGS+= @PTHREAD_CFLAGS@
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedinternal.la
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la
tests_libmemcached_1_0_internals_LDADD+= @PTHREAD_LIBS@
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
@@ -58,11 +56,14 @@
check_PROGRAMS+= tests/libmemcached-1.0/internals
noinst_PROGRAMS+= tests/libmemcached-1.0/internals
+test-internal: tests/libmemcached-1.0/internals
+ @tests/testplus
+
+endif
tests_libmemcached_1_0_testapp_CXXFLAGS=
tests_libmemcached_1_0_testapp_CFLAGS=
tests_libmemcached_1_0_testapp_SOURCES=
-tests_libmemcached_1_0_testapp_DEPENDENCIES=
tests_libmemcached_1_0_testapp_LDADD=
tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS)
@@ -97,12 +98,8 @@
tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/stat.cc
tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/touch.cc
tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
-tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
-tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LDFLAGS@
+tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LIB@
tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
@@ -115,7 +112,6 @@
tests_libmemcached_1_0_testsocket_CXXFLAGS=
tests_libmemcached_1_0_testsocket_CFLAGS=
tests_libmemcached_1_0_testsocket_SOURCES=
-tests_libmemcached_1_0_testsocket_DEPENDENCIES=
tests_libmemcached_1_0_testsocket_LDADD=
tests_libmemcached_1_0_testsocket_CXXFLAGS+= @PTHREAD_CFLAGS@
@@ -153,12 +149,7 @@
tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/touch.cc
tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
-tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
-
-tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LDFLAGS@
+tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LIB@
tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
@@ -172,10 +163,9 @@
@tests/libmemcached-1.0/testsocket
gdb-socket: tests/libmemcached-1.0/testsocket
- @$(DEBUG_COMMAND) tests/libmemcached-1.0/testsocket
+ @$(GDB_COMMAND) tests/libmemcached-1.0/testsocket
tests_libmemcached_1_0_sasl_SOURCES=
-tests_libmemcached_1_0_sasl_DEPENDENCIES=
tests_libmemcached_1_0_sasl_LDADD=
tests_libmemcached_1_0_sasl_CXXFLAGS=
tests_libmemcached_1_0_sasl_CFLAGS=
@@ -203,9 +193,6 @@
tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc
-tests_libmemcached_1_0_sasl_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_sasl_DEPENDENCIES+= libtest/libtest.la
-
tests_libmemcached_1_0_sasl_LDADD+= @PTHREAD_LIBS@
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
@@ -219,14 +206,12 @@
@tests/libmemcached-1.0/sasl
gdb-sasl: tests/libmemcached-1.0/sasl
- @$(DEBUG_COMMAND) tests/libmemcached-1.0/sasl
+ @$(GDB_COMMAND) tests/libmemcached-1.0/sasl
tests_atomsmasher_SOURCES=
-tests_atomsmasher_DEPENDENCIES=
tests_atomsmasher_LDADD=
-tests_atomsmasher_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_atomsmasher_LDADD+= $(tests_atomsmasher_DEPENDENCIES)
+tests_atomsmasher_LDADD+= $(TESTS_LDADDS)
tests_atomsmasher_SOURCES+= clients/execute.cc
tests_atomsmasher_SOURCES+= clients/generator.cc
tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/atomsmasher.cc
@@ -239,7 +224,6 @@
tests_testudp_CFLAGS=
tests_testudp_SOURCES=
-tests_testudp_DEPENDENCIES=
tests_testudp_LDADD=
tests_testudp_CFLAGS+= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -250,8 +234,7 @@
tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc
tests_testudp_SOURCES+= tests/libmemcached-1.0/print.cc
tests_testudp_SOURCES+= tests/mem_udp.cc
-tests_testudp_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_testudp_LDADD+= $(tests_testudp_DEPENDENCIES)
+tests_testudp_LDADD+= $(TESTS_LDADDS)
check_PROGRAMS+= tests/testudp
noinst_PROGRAMS+= tests/testudp
@@ -260,7 +243,6 @@
tests_testplus_SOURCES=
tests_testplus_CXXFLAGS=
-tests_testplus_DEPENDENCIES=
tests_testplus_LDADD=
tests_testplus_SOURCES+= clients/execute.cc
@@ -272,8 +254,7 @@
tests_testplus_SOURCES+= tests/libmemcached-1.0/print.cc
tests_testplus_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_testplus_LDADD+= $(tests_testplus_DEPENDENCIES)
+tests_testplus_LDADD+= $(TESTS_LDADDS)
check_PROGRAMS+= tests/testplus
noinst_PROGRAMS+= tests/testplus
@@ -281,7 +262,7 @@
@tests/testplus
gdb-plus: tests/testplus
- $(DEBUG_COMMAND) tests/testplus
+ $(GDB_COMMAND) tests/testplus
valgrind-plus: tests/testplus
@$(VALGRIND_COMMAND) tests/testplus
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/ketama.cc
^
|
| @@ -41,7 +41,7 @@
#include "libmemcached/server_instance.h"
#include "libmemcached/continuum.hpp"
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
#include <tests/ketama.h>
#include <tests/ketama_test_cases.h>
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/mem_functions.cc
^
|
| @@ -86,12 +86,13 @@
#include "tests/libmemcached-1.0/setup_and_teardowns.h"
#include "tests/print.h"
#include "tests/debug.h"
+#include "tests/memc.hpp"
#define UUID_STRING_MAXLENGTH 36
#include "tests/keys.hpp"
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
static memcached_st * create_single_instance_memcached(const memcached_st *original_memc, const char *options)
{
@@ -2764,6 +2765,25 @@
return TEST_SUCCESS;
}
+test_return_t ketama_TEST(memcached_st *)
+{
+ test::Memc memc("--server=10.0.1.1:11211 --server=10.0.1.2:11211");
+
+ test_compare(MEMCACHED_SUCCESS,
+ memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, true));
+
+ test_compare(memcached_behavior_get(&memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED), uint64_t(1));
+
+ test_compare(memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5), MEMCACHED_SUCCESS);
+
+ test_compare(memcached_behavior_get(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH), MEMCACHED_HASH_MD5);
+
+ test_compare(memcached_behavior_set_distribution(&memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY), MEMCACHED_SUCCESS);
+
+
+ return TEST_SUCCESS;
+}
+
test_return_t output_ketama_weighted_keys(memcached_st *)
{
memcached_st *memc= memcached_create(NULL);
@@ -3680,6 +3700,27 @@
}
return TEST_SUCCESS;
+#endif
+}
+
+test_return_t murmur3_TEST(hashkit_st *)
+{
+ test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_MURMUR3));
+
+#ifdef WORDS_BIGENDIAN
+ (void)murmur3_values;
+ return TEST_SKIPPED;
+#else
+ uint32_t x;
+ const char **ptr;
+
+ for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+ {
+ test_compare(murmur3_values[x],
+ memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MURMUR3));
+ }
+
+ return TEST_SUCCESS;
#endif
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/mem_functions.h
^
|
| @@ -114,8 +114,10 @@
test_return_t mget_test(memcached_st *memc);
test_return_t murmur_avaibility_test (memcached_st *memc);
test_return_t murmur_run (memcached_st *);
+test_return_t murmur3_TEST(hashkit_st *);
test_return_t noreply_test(memcached_st *memc);
test_return_t one_at_a_time_run (memcached_st *);
+test_return_t ketama_TEST(memcached_st *);
test_return_t output_ketama_weighted_keys(memcached_st *);
test_return_t libmemcached_util_ping_TEST(memcached_st*);
test_return_t prepend_test(memcached_st *memc);
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/parser.cc
^
|
| @@ -49,7 +49,7 @@
#include <tests/libmemcached-1.0/parser.h>
#include <tests/print.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
enum scanner_type_t
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/pool.cc
^
|
| @@ -55,7 +55,7 @@
#include <pthread.h>
#include <poll.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached-1.0/replication.cc
^
|
| @@ -113,7 +113,7 @@
return TEST_SUCCESS;
}
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
test_return_t replication_get_test(memcached_st *memc)
{
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached_test_container.h
^
|
| @@ -59,6 +59,7 @@
void parent(memcached_st* arg)
{
+ assert(_parent != arg);
reset();
_parent= arg;
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/libmemcached_world.h
^
|
| @@ -49,17 +49,26 @@
return NULL;
}
- if ((servers.sasl()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0)))
+ if (servers.sasl())
{
- error= TEST_SKIPPED;
- return NULL;
- }
+ if (LIBMEMCACHED_WITH_SASL_SUPPORT == 0)
+ {
+ error= TEST_SKIPPED;
+ return NULL;
+ }
- // Assume we are running under valgrind, and bail
- if (servers.sasl() and getenv("TESTS_ENVIRONMENT"))
- {
- error= TEST_SKIPPED;
- return NULL;
+ if (HAVE_MEMCACHED_SASL_BINARY == 0)
+ {
+ error= TEST_SKIPPED;
+ return NULL;
+ }
+
+ // Assume we are running under valgrind, and bail
+ if (getenv("TESTS_ENVIRONMENT"))
+ {
+ error= TEST_SKIPPED;
+ return NULL;
+ }
}
for (uint32_t x= 0; x < servers.servers_to_run(); x++)
@@ -71,9 +80,6 @@
if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
{
error= TEST_SKIPPED;
-#if 0
- fatal_message("Could not start memcached-sasl");
-#endif
return NULL;
}
}
@@ -82,9 +88,6 @@
if (server_startup(servers, "memcached", port, 0, NULL) == false)
{
error= TEST_SKIPPED;
-#if 0
- fatal_message("Could not start memcached");
-#endif
return NULL;
}
}
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/mem_udp.cc
^
|
| @@ -63,7 +63,7 @@
#include <libtest/server.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
|
|
[-]
[+]
|
Added |
libmemcached-1.0.15.tar.bz2/tests/memc.hpp
^
|
| @@ -0,0 +1,104 @@
+/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ * Libmemcached library
+ *
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ * 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.
+ *
+ */
+
+#pragma once
+
+namespace test {
+
+class Memc {
+public:
+ Memc()
+ {
+ _memc= memcached_create(NULL);
+
+ if (_memc == NULL)
+ {
+ throw "memcached_create() failed";
+ }
+ }
+
+ Memc(const memcached_st* arg)
+ {
+ _memc= memcached_clone(NULL, arg);
+
+ if (_memc == NULL)
+ {
+ throw "memcached_clone() failed";
+ }
+ }
+
+ Memc(const std::string& arg)
+ {
+ _memc= memcached(arg.c_str(), arg.size());
+ if (_memc == NULL)
+ {
+ throw "memcached() failed";
+ }
+ }
+
+ Memc(in_port_t arg)
+ {
+ _memc= memcached_create(NULL);
+
+ if (_memc == NULL)
+ {
+ throw "memcached_create() failed";
+ }
+ memcached_server_add(_memc, "localhost", arg);
+ }
+
+ memcached_st* operator&() const
+ {
+ return _memc;
+ }
+
+ memcached_st* operator->() const
+ {
+ return _memc;
+ }
+
+ ~Memc()
+ {
+ memcached_free(_memc);
+ }
+
+private:
+ memcached_st *_memc;
+
+};
+
+} // namespace test
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/parser.am
^
|
| @@ -12,14 +12,12 @@
tests_parser_SOURCES=
tests_parser_CXXFLAGS=
-tests_parser_DEPENDENCIES=
tests_parser_LDADD=
tests_parser_SOURCES+= tests/parser.cc
tests_parser_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_parser_DEPENDENCIES+= $(TESTS_LDADDS)
-tests_parser_LDADD+= $(tests_parser_DEPENDENCIES)
+tests_parser_LDADD+= $(TESTS_LDADDS)
check_PROGRAMS+= tests/parser
noinst_PROGRAMS+= tests/parser
@@ -27,4 +25,4 @@
@tests/parser
valgrind-parser: tests/parser
- $(VALGRIND_COMMAND) tests/parser
+ @$(VALGRIND_COMMAND) tests/parser
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/parser.cc
^
|
| @@ -58,10 +58,7 @@
static test_return_t putenv_localhost_quoted_TEST(void*)
{
- char set_env[1024];
-
- snprintf(set_env, sizeof(set_env), "LIBMEMCACHED=\"--server=localhost\"");
- test_zero(putenv(set_env));
+ test_zero(setenv("LIBMEMCACHED", "\"--server=localhost\"", 1));
test_null(memcached(NULL, 0));
return TEST_SUCCESS;
@@ -69,24 +66,7 @@
static test_return_t putenv_NULL_TEST(void*)
{
- char set_env[1024];
-
- snprintf(set_env, sizeof(set_env), "LIBMEMCACHED");
- test_zero(putenv(set_env));
- memcached_st *memc= memcached(NULL, 0);
- test_true(memc);
-
- memcached_free(memc);
-
- return TEST_SUCCESS;
-}
-
-static test_return_t putenv_NULL_TEST2(void*)
-{
- char set_env[1024];
-
- snprintf(set_env, sizeof(set_env), "LIBMEMCACHED=");
- test_zero(putenv(set_env));
+ test_zero(setenv("LIBMEMCACHED", "", 1));
memcached_st *memc= memcached(NULL, 0);
test_true(memc);
@@ -97,10 +77,7 @@
static test_return_t putenv_localhost_TEST(void*)
{
- char set_env[1024];
-
- snprintf(set_env, sizeof(set_env), "LIBMEMCACHED=--server=localhost");
- test_zero(putenv(set_env));
+ test_zero(setenv("LIBMEMCACHED", "--server=localhost", 1));
memcached_st *memc= memcached(NULL, 0);
test_true(memc);
@@ -114,7 +91,6 @@
{"memcached(\"value\", 0)", false, (test_callback_fn*)memcached_zero_string_length_TEST },
{"putenv(LIBMEMCACHED=--server=localhost)", false, (test_callback_fn*)putenv_localhost_TEST },
{"putenv(LIBMEMCACHED)", false, (test_callback_fn*)putenv_NULL_TEST },
- {"putenv(LIBMEMCACHED=)", false, (test_callback_fn*)putenv_NULL_TEST2 },
{"putenv(LIBMEMCACHED=--server=\"localhost\")", false, (test_callback_fn*)putenv_localhost_quoted_TEST },
{0, 0, 0}
};
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/tests/runner.h
^
|
| @@ -39,7 +39,7 @@
#pragma once
#include "tests/libmemcached-1.0/generate.h"
-#include "tests/memc.h"
+#include "tests/memc.hpp"
#include "tests/print.h"
class LibmemcachedRunner : public libtest::Runner {
@@ -56,7 +56,7 @@
test_return_t flush(libmemcached_test_container_st *container)
{
- Memc memc(container->parent());
+ test::Memc memc(container->parent());
memcached_flush(&memc, 0);
memcached_quit(&memc);
@@ -78,7 +78,7 @@
{
test_true(container);
test_true(container->parent());
- Memc memc(container->parent());
+ test::Memc memc(container->parent());
test_compare(true, check());
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/util/instance.cc
^
|
| @@ -36,7 +36,7 @@
*/
-#include <mem_config.h>
+#include "mem_config.h"
#include "util/instance.hpp"
@@ -50,7 +50,23 @@
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
+#endif
+
+#ifndef INVALID_SOCKET
+# define INVALID_SOCKET -1
+#endif
+
+#ifndef SOCKET_ERROR
+# define SOCKET_ERROR -1
+#endif
+
+#ifndef get_socket_errno
+# define get_socket_errno() errno
+#endif
+
+#ifndef closesocket
+# define closesocket(a) close(a)
#endif
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/util/instance.hpp
^
|
| @@ -37,12 +37,13 @@
#pragma once
-#include <cstdio>
-#include <cerrno>
#include <cassert>
+#include <cerrno>
#include <cstddef>
-#include <sys/socket.h>
+#include <cstdio>
+#include <netinet/in.h>
#include <string>
+#include <sys/socket.h>
#include "util/operation.hpp"
|
|
[-]
[+]
|
Changed |
libmemcached-1.0.15.tar.bz2/util/pidfile.cc
^
|
| @@ -35,7 +35,7 @@
*
*/
-#include "config.h"
+#include "mem_config.h"
#include "util/pidfile.hpp"
|
