# 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/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
# 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
#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
{
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);
}
{
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];
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);
}
};
- if (memcached_instance_response_count(instance) == 0)
+ if (instance->response_count() == 0)
{
rc= memcached_connect(instance);
{
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)
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))
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)
{
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);
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
noinst_HEADERS+= libmemcached/watchpoint.h
lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_DEPENDENCIES=
+EXTRA_libmemcached_libmemcached_la_DEPENDENCIES=
libmemcached_libmemcached_la_LIBADD=
libmemcached_libmemcached_la_LDFLAGS=
libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
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
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,
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);
((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_;
-}
+++ /dev/null
-/* 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
#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,
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 *);
return instance;
}
- if (memcached_instance_response_count(instance) > 0)
+ if (instance->response_count() > 0)
{
fds[host_index].events= POLLIN;
fds[host_index].revents= 0;
{
org::libmemcached::Instance* instance= memcached_instance_fetch(memc, x);
- if (memcached_instance_response_count(instance) > 0)
+ if (instance->response_count() > 0)
{
return instance;
}
${NO_CONVERSION} \
-DBUILDING_LIBMEMCACHEDINTERNAL
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
${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@
libmemcached_libmemcachedutil_la_LIBADD=
libmemcached_libmemcachedutil_la_LDFLAGS=
libmemcached_libmemcachedutil_la_CXXFLAGS=
-libmemcached_libmemcachedutil_la_DEPENDENCIES=
libmemcached_libmemcachedutil_la_CXXFLAGS+= \
${AM_CXXFLAGS} \
${NO_CONVERSION} \
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@
-libmemcached_libmemcachedutil_la_DEPENDENCIES+= libmemcached/libmemcached.la
-
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=
libtest_libtest_la_LIBADD+= $(CURL_LIBS)
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_LIBADD+= libmemcached/libmemcached.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
else
if HAVE_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= $(LIBMEMCACHED_UTIL_LDFLAGS)
libtest_libtest_la_SOURCES+= libtest/memcached.cc
else
libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
libtest_libtest_la_SOURCES+= libtest/gearmand.cc
libtest_libtest_la_SOURCES+= util/instance.cc
libtest_libtest_la_SOURCES+= util/operation.cc
-libtest_unittest_DEPENDENCIES+= gearmand/gearmand
+
+libtest_unittest_LDADD+= libgearman/libgearman.la
else
if HAVE_LIBGEARMAN
libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
$(TMP_DIR):
@$(mkdir_p) $(TMP_DIR)
-libtest_unittest_DEPENDENCIES+= libtest/libtest.la
libtest_unittest_LDADD+= libtest/libtest.la
libtest_unittest_SOURCES= libtest/unittest.cc
check_PROGRAMS+= libtest/unittest
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
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);
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
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
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
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
#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 *,
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=
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
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)
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_LIB@
tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@
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@
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_LIB@
tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
@$(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
tests_testudp_CFLAGS=
tests_testudp_SOURCES=
-tests_testudp_DEPENDENCIES=
tests_testudp_LDADD=
tests_testudp_CFLAGS+= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
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
tests_testplus_SOURCES=
tests_testplus_CXXFLAGS=
-tests_testplus_DEPENDENCIES=
tests_testplus_LDADD=
tests_testplus_SOURCES+= clients/execute.cc
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
#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>
#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)
{
#include <tests/libmemcached-1.0/parser.h>
#include <tests/print.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
enum scanner_type_t
{
#include <pthread.h>
#include <poll.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
return TEST_SUCCESS;
}
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
test_return_t replication_get_test(memcached_st *memc)
{
#include <libtest/server.h>
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
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
@tests/parser
valgrind-parser: tests/parser
- $(VALGRIND_COMMAND) tests/parser
+ @$(VALGRIND_COMMAND) tests/parser