From 5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 18 Feb 2020 10:04:55 +0100 Subject: [PATCH] reorganize directories --- .gitignore | 153 ++---------------- CMakeLists.txt | 25 ++- COPYING | 47 +++--- README.FIRST | 31 ---- clients/memcapable.sh | 2 - clients/memcat.sh | 3 - clients/memcp.sh | 2 - clients/memdump.sh | 2 - clients/memerror.sh | 2 - clients/memexist.sh | 3 - clients/memflush.sh | 2 - clients/memparse.sh | 2 - clients/memping.sh | 2 - clients/memrm.sh | 3 - clients/memslap.sh | 2 - clients/memstat.sh | 2 - clients/memtouch.sh | 3 - docs/gh-pages/publish.sh | 26 +++ gh-pages.sh | 26 --- include/CMakeLists.txt | 4 + .../libhashkit-1.0}/CMakeLists.txt | 2 +- .../libhashkit-1.0}/algorithm.h | 0 .../libhashkit-1.0}/basic_string.h | 0 .../libhashkit-1.0}/behavior.h | 0 .../libhashkit-1.0}/configure.h.in | 0 .../libhashkit-1.0}/digest.h | 0 .../libhashkit-1.0}/function.h | 0 .../libhashkit-1.0}/has.h | 0 .../libhashkit-1.0}/hashkit.h | 0 .../libhashkit-1.0}/hashkit.hpp | 0 .../libhashkit-1.0}/str_algorithm.h | 0 .../libhashkit-1.0}/strerror.h | 0 .../libhashkit-1.0}/string.h | 0 .../libhashkit-1.0}/types.h | 0 .../libhashkit-1.0}/visibility.h | 0 .../libmemcached-1.0}/CMakeLists.txt | 0 .../libmemcached-1.0}/alloc.h | 0 .../libmemcached-1.0}/allocators.h | 0 .../libmemcached-1.0}/analyze.h | 0 .../libmemcached-1.0}/auto.h | 0 .../libmemcached-1.0}/basic_string.h | 0 .../libmemcached-1.0}/behavior.h | 0 .../libmemcached-1.0}/callback.h | 0 .../libmemcached-1.0}/callbacks.h | 0 .../libmemcached-1.0}/configure.h.in | 0 .../libmemcached-1.0}/defaults.h | 0 .../libmemcached-1.0}/delete.h | 0 .../libmemcached-1.0}/deprecated_types.h | 0 .../libmemcached-1.0}/dump.h | 0 .../libmemcached-1.0}/encoding_key.h | 0 .../libmemcached-1.0}/error.h | 0 .../libmemcached-1.0}/exception.hpp | 0 .../libmemcached-1.0}/exist.h | 0 .../libmemcached-1.0}/fetch.h | 0 .../libmemcached-1.0}/flush.h | 0 .../libmemcached-1.0}/flush_buffers.h | 0 .../libmemcached-1.0}/get.h | 0 .../libmemcached-1.0}/hash.h | 0 .../libmemcached-1.0}/limits.h | 0 .../libmemcached-1.0}/memcached.h | 0 .../libmemcached-1.0}/memcached.hpp | 0 .../libmemcached-1.0}/options.h | 0 .../libmemcached-1.0}/parse.h | 0 .../libmemcached-1.0}/platform.h | 0 .../libmemcached-1.0}/quit.h | 0 .../libmemcached-1.0}/result.h | 0 .../libmemcached-1.0}/return.h | 0 .../libmemcached-1.0}/sasl.h | 0 .../libmemcached-1.0}/server.h | 0 .../libmemcached-1.0}/server_list.h | 0 .../libmemcached-1.0}/stats.h | 0 .../libmemcached-1.0}/storage.h | 0 .../libmemcached-1.0}/strerror.h | 0 .../libmemcached-1.0}/struct/allocator.h | 0 .../libmemcached-1.0}/struct/analysis.h | 0 .../libmemcached-1.0}/struct/callback.h | 0 .../libmemcached-1.0}/struct/memcached.h | 0 .../libmemcached-1.0}/struct/result.h | 0 .../libmemcached-1.0}/struct/sasl.h | 0 .../libmemcached-1.0}/struct/server.h | 0 .../libmemcached-1.0}/struct/stat.h | 0 .../libmemcached-1.0}/struct/string.h | 0 .../libmemcached-1.0}/t/c_sasl_test.c | 0 .../libmemcached-1.0}/t/c_test.c | 0 .../libmemcached-1.0}/t/cc_test.cc | 0 .../libmemcached-1.0}/touch.h | 0 .../libmemcached-1.0}/triggers.h | 0 .../libmemcached-1.0}/types.h | 0 .../libmemcached-1.0}/types/behavior.h | 0 .../libmemcached-1.0}/types/callback.h | 0 .../libmemcached-1.0}/types/connection.h | 0 .../libmemcached-1.0}/types/hash.h | 0 .../libmemcached-1.0}/types/return.h | 0 .../types/server_distribution.h | 0 .../libmemcached-1.0}/verbosity.h | 0 .../libmemcached-1.0}/version.h | 0 .../libmemcached-1.0}/visibility.h | 0 .../libmemcachedprotocol-0.0}/binary.h | 0 .../libmemcachedprotocol-0.0}/callback.h | 0 .../libmemcachedprotocol-0.0}/handler.h | 0 .../libmemcachedprotocol-0.0}/vbucket.h | 0 .../libmemcachedutil-1.0}/CMakeLists.txt | 0 .../libmemcachedutil-1.0}/flush.h | 0 .../libmemcachedutil-1.0}/ostream.hpp | 0 .../libmemcachedutil-1.0}/pid.h | 0 .../libmemcachedutil-1.0}/ping.h | 0 .../libmemcachedutil-1.0}/pool.h | 0 .../libmemcachedutil-1.0}/util.h | 0 .../libmemcachedutil-1.0}/version.h | 0 src/CMakeLists.txt | 9 ++ {clients => src/bin}/CMakeLists.txt | 3 +- {clients => src/bin}/client_options.h | 0 {clients => src/bin}/execute.cc | 2 +- {clients => src/bin}/execute.h | 2 +- {clients => src/bin}/generator.cc | 2 +- {clients => src/bin}/generator.h | 0 {clients => src/bin}/memaslap.c | 0 {clients => src/bin}/memcapable.cc | 2 +- src/bin/memcapable.sh | 2 + {clients => src/bin}/memcat.cc | 0 src/bin/memcat.sh | 3 + {clients => src/bin}/memcp.cc | 0 src/bin/memcp.sh | 2 + {clients => src/bin}/memdump.cc | 0 src/bin/memdump.sh | 2 + {clients => src/bin}/memerror.cc | 0 src/bin/memerror.sh | 2 + {clients => src/bin}/memexist.cc | 0 src/bin/memexist.sh | 3 + {clients => src/bin}/memflush.cc | 0 src/bin/memflush.sh | 2 + {clients => src/bin}/memparse.cc | 0 src/bin/memparse.sh | 2 + {clients => src/bin}/memping.cc | 0 src/bin/memping.sh | 2 + {clients => src/bin}/memrm.cc | 0 src/bin/memrm.sh | 3 + {clients => src/bin}/memslap.cc | 0 src/bin/memslap.sh | 2 + {clients => src/bin}/memstat.cc | 0 src/bin/memstat.sh | 2 + {clients => src/bin}/memtouch.cc | 0 src/bin/memtouch.sh | 3 + {clients => src/bin}/ms_atomic.h | 0 {clients => src/bin}/ms_conn.c | 0 {clients => src/bin}/ms_conn.h | 0 {clients => src/bin}/ms_memslap.h | 0 {clients => src/bin}/ms_setting.c | 0 {clients => src/bin}/ms_setting.h | 0 {clients => src/bin}/ms_sigsegv.c | 0 {clients => src/bin}/ms_sigsegv.h | 0 {clients => src/bin}/ms_stats.c | 0 {clients => src/bin}/ms_stats.h | 0 {clients => src/bin}/ms_task.c | 0 {clients => src/bin}/ms_task.h | 0 {clients => src/bin}/ms_thread.c | 0 {clients => src/bin}/ms_thread.h | 0 {clients => src/bin}/utilities.cc | 2 +- {clients => src/bin}/utilities.h | 2 +- {libhashkit => src/libhashkit}/CMakeLists.txt | 1 - {libhashkit => src/libhashkit}/aes.cc | 0 {libhashkit => src/libhashkit}/aes.h | 0 {libhashkit => src/libhashkit}/algorithm.cc | 0 {libhashkit => src/libhashkit}/algorithm.h | 0 {libhashkit => src/libhashkit}/behavior.cc | 0 {libhashkit => src/libhashkit}/common.h | 0 {libhashkit => src/libhashkit}/crc32.cc | 0 {libhashkit => src/libhashkit}/digest.cc | 0 {libhashkit => src/libhashkit}/encrypt.cc | 0 {libhashkit => src/libhashkit}/fnv_32.cc | 0 {libhashkit => src/libhashkit}/fnv_64.cc | 0 {libhashkit => src/libhashkit}/function.cc | 0 {libhashkit => src/libhashkit}/has.cc | 0 {libhashkit => src/libhashkit}/hashkit.cc | 0 {libhashkit => src/libhashkit}/hashkit.h | 0 .../libhashkit}/hashkitcon.h.in | 0 {libhashkit => src/libhashkit}/hsieh.cc | 0 {libhashkit => src/libhashkit}/is.h | 0 {libhashkit => src/libhashkit}/jenkins.cc | 0 {libhashkit => src/libhashkit}/ketama.cc | 0 {libhashkit => src/libhashkit}/md5.cc | 0 {libhashkit => src/libhashkit}/murmur.cc | 0 {libhashkit => src/libhashkit}/murmur3.cc | 0 {libhashkit => src/libhashkit}/murmur3.h | 0 {libhashkit => src/libhashkit}/murmur3_api.cc | 0 {libhashkit => src/libhashkit}/nohsieh.cc | 0 .../libhashkit}/one_at_a_time.cc | 0 {libhashkit => src/libhashkit}/rijndael.cc | 0 {libhashkit => src/libhashkit}/rijndael.hpp | 0 .../libhashkit}/str_algorithm.cc | 0 {libhashkit => src/libhashkit}/strerror.cc | 0 {libhashkit => src/libhashkit}/string.cc | 0 {libhashkit => src/libhashkit}/string.h | 0 .../libmemcached}/CMakeLists.txt | 4 +- .../libmemcached}/allocators.cc | 0 .../libmemcached}/allocators.hpp | 0 {libmemcached => src/libmemcached}/analyze.cc | 0 {libmemcached => src/libmemcached}/array.c | 0 {libmemcached => src/libmemcached}/array.h | 0 {libmemcached => src/libmemcached}/assert.hpp | 0 {libmemcached => src/libmemcached}/auto.cc | 0 .../libmemcached}/backtrace.cc | 0 .../libmemcached}/backtrace.hpp | 0 .../libmemcached}/behavior.cc | 0 .../libmemcached}/behavior.hpp | 0 .../libmemcached}/byteorder.cc | 0 .../libmemcached}/byteorder.h | 0 .../libmemcached}/callback.cc | 0 {libmemcached => src/libmemcached}/callback.h | 0 {libmemcached => src/libmemcached}/common.h | 0 {libmemcached => src/libmemcached}/connect.cc | 0 .../libmemcached}/connect.hpp | 0 .../libmemcached}/continuum.hpp | 0 .../libmemcached}/csl/common.h | 0 .../libmemcached}/csl/context.cc | 0 .../libmemcached}/csl/context.h | 0 .../libmemcached}/csl/parser.yy | 0 .../libmemcached}/csl/scanner.l | 0 .../libmemcached}/csl/server.h | 0 .../libmemcached}/csl/symbol.h | 0 {libmemcached => src/libmemcached}/delete.cc | 0 {libmemcached => src/libmemcached}/do.cc | 0 {libmemcached => src/libmemcached}/do.hpp | 0 {libmemcached => src/libmemcached}/dump.cc | 0 .../libmemcached}/encoding_key.cc | 0 .../libmemcached}/encoding_key.h | 0 {libmemcached => src/libmemcached}/error.cc | 0 {libmemcached => src/libmemcached}/error.hpp | 0 {libmemcached => src/libmemcached}/exist.cc | 0 {libmemcached => src/libmemcached}/fetch.cc | 0 {libmemcached => src/libmemcached}/flag.cc | 0 {libmemcached => src/libmemcached}/flag.hpp | 0 {libmemcached => src/libmemcached}/flush.cc | 0 .../libmemcached}/flush_buffers.cc | 0 {libmemcached => src/libmemcached}/get.cc | 0 {libmemcached => src/libmemcached}/hash.cc | 0 {libmemcached => src/libmemcached}/hash.hpp | 0 {libmemcached => src/libmemcached}/hosts.cc | 0 .../libmemcached}/initialize_query.cc | 0 .../libmemcached}/initialize_query.h | 0 .../libmemcached}/instance.cc | 0 .../libmemcached}/instance.hpp | 0 {libmemcached => src/libmemcached}/internal.h | 0 {libmemcached => src/libmemcached}/io.cc | 0 {libmemcached => src/libmemcached}/io.h | 0 {libmemcached => src/libmemcached}/io.hpp | 0 {libmemcached => src/libmemcached}/is.h | 0 {libmemcached => src/libmemcached}/key.cc | 0 {libmemcached => src/libmemcached}/key.hpp | 0 .../libmemcached}/libmemcached_probes.d | 0 .../libmemcached}/libmemcached_probes.h | 0 .../libmemcached}/memcached.cc | 0 .../libmemcached}/memcached.h | 0 .../libmemcached}/memcached.hpp | 0 .../libmemcached}/memcached/README.txt | 0 .../libmemcached}/memcached/protocol_binary.h | 0 .../libmemcached/memcached}/vbucket.h | 0 {libmemcached => src/libmemcached}/memory.h | 0 .../libmemcached}/namespace.cc | 0 .../libmemcached}/namespace.h | 0 {libmemcached => src/libmemcached}/options.cc | 0 .../libmemcached}/options.hpp | 0 {libmemcached => src/libmemcached}/parse.cc | 0 {libmemcached => src/libmemcached}/poll.cc | 0 {libmemcached => src/libmemcached}/poll.h | 0 {libmemcached => src/libmemcached}/purge.cc | 0 {libmemcached => src/libmemcached}/quit.cc | 0 {libmemcached => src/libmemcached}/quit.hpp | 0 .../libmemcached}/response.cc | 0 {libmemcached => src/libmemcached}/response.h | 0 {libmemcached => src/libmemcached}/result.cc | 0 {libmemcached => src/libmemcached}/result.h | 0 {libmemcached => src/libmemcached}/sasl.cc | 0 {libmemcached => src/libmemcached}/sasl.hpp | 0 {libmemcached => src/libmemcached}/server.cc | 0 {libmemcached => src/libmemcached}/server.hpp | 0 .../libmemcached}/server_instance.h | 0 .../libmemcached}/server_list.cc | 0 .../libmemcached}/server_list.hpp | 0 {libmemcached => src/libmemcached}/socket.hpp | 0 {libmemcached => src/libmemcached}/stats.cc | 0 {libmemcached => src/libmemcached}/storage.cc | 0 .../libmemcached}/strerror.cc | 0 {libmemcached => src/libmemcached}/string.cc | 0 {libmemcached => src/libmemcached}/string.hpp | 0 {libmemcached => src/libmemcached}/touch.cc | 0 {libmemcached => src/libmemcached}/udp.cc | 0 {libmemcached => src/libmemcached}/udp.hpp | 0 {libmemcached => src/libmemcached}/util.h | 0 .../libmemcached}/util/Makefile.am | 0 .../libmemcached}/verbosity.cc | 0 {libmemcached => src/libmemcached}/version.cc | 0 .../libmemcached}/version.hpp | 0 .../libmemcached}/virtual_bucket.c | 0 .../libmemcached}/virtual_bucket.h | 0 .../libmemcached}/watchpoint.h | 0 .../libmemcached}/windows.hpp | 0 .../libmemcachedprotocol}/ascii_handler.c | 0 .../libmemcachedprotocol}/ascii_handler.h | 0 .../libmemcachedprotocol}/binary_handler.c | 0 .../libmemcachedprotocol}/binary_handler.h | 0 .../libmemcachedprotocol}/cache.c | 0 .../libmemcachedprotocol}/cache.h | 0 .../libmemcachedprotocol}/common.h | 0 .../libmemcachedprotocol}/handler.c | 0 .../libmemcachedprotocol}/pedantic.c | 0 .../libmemcachedutil}/CMakeLists.txt | 1 - .../libmemcachedutil}/common.h | 0 .../libmemcachedutil}/flush.cc | 0 .../libmemcachedutil}/pid.cc | 0 .../libmemcachedutil}/ping.cc | 0 .../libmemcachedutil}/pool.cc | 0 .../libmemcachedutil}/version.cc | 0 {libtest => src/libtest}/CMakeLists.txt | 4 - {libtest => src/libtest}/alarm.cc | 0 {libtest => src/libtest}/alarm.h | 0 {libtest => src/libtest}/backtrace_test.cc | 0 {libtest => src/libtest}/binaries.cc | 0 {libtest => src/libtest}/binaries.h | 0 {libtest => src/libtest}/blobslap_worker.cc | 0 {libtest => src/libtest}/blobslap_worker.h | 0 {libtest => src/libtest}/callbacks.h | 0 {libtest => src/libtest}/client.cc | 0 {libtest => src/libtest}/client.hpp | 0 {libtest => src/libtest}/cmdline.cc | 0 {libtest => src/libtest}/cmdline.h | 0 {libtest => src/libtest}/collection.cc | 0 {libtest => src/libtest}/collection.h | 0 {libtest => src/libtest}/common.h | 0 {libtest => src/libtest}/comparison.cc | 0 {libtest => src/libtest}/comparison.hpp | 0 {libtest => src/libtest}/core.cc | 0 {libtest => src/libtest}/core.h | 0 {libtest => src/libtest}/core_count.cc | 0 {libtest => src/libtest}/cpu.cc | 0 {libtest => src/libtest}/cpu.hpp | 0 {libtest => src/libtest}/dns.cc | 0 {libtest => src/libtest}/dns.hpp | 0 {libtest => src/libtest}/dream.cc | 0 {libtest => src/libtest}/dream.h | 0 {libtest => src/libtest}/drizzled.cc | 0 {libtest => src/libtest}/drizzled.h | 0 {libtest => src/libtest}/error.h | 0 {libtest => src/libtest}/exception.cc | 0 {libtest => src/libtest}/exception.hpp | 0 .../libtest}/exception/disconnected.hpp | 0 {libtest => src/libtest}/exception/fatal.cc | 0 {libtest => src/libtest}/exception/fatal.hpp | 0 {libtest => src/libtest}/failed.cc | 0 {libtest => src/libtest}/formatter.cc | 0 {libtest => src/libtest}/formatter.hpp | 0 {libtest => src/libtest}/framework.cc | 0 {libtest => src/libtest}/framework.h | 0 {libtest => src/libtest}/gearmand.cc | 0 {libtest => src/libtest}/gearmand.h | 0 {libtest => src/libtest}/get.h | 0 {libtest => src/libtest}/has.cc | 0 {libtest => src/libtest}/has.hpp | 0 {libtest => src/libtest}/http.cc | 0 {libtest => src/libtest}/http.hpp | 0 {libtest => src/libtest}/is_local.cc | 0 {libtest => src/libtest}/is_local.hpp | 0 {libtest => src/libtest}/is_pid.hpp | 0 {libtest => src/libtest}/killpid.cc | 0 {libtest => src/libtest}/killpid.h | 0 {libtest => src/libtest}/libtool.cc | 0 {libtest => src/libtest}/libtool.hpp | 0 {libtest => src/libtest}/lite.h | 0 {libtest => src/libtest}/main.cc | 0 {libtest => src/libtest}/memcached.cc | 0 {libtest => src/libtest}/memcached.h | 0 {libtest => src/libtest}/memcached.hpp | 0 {libtest => src/libtest}/poll_error.hpp | 0 {libtest => src/libtest}/port.cc | 0 {libtest => src/libtest}/port.h | 0 {libtest => src/libtest}/result.cc | 0 {libtest => src/libtest}/result.hpp | 0 {libtest => src/libtest}/result/base.hpp | 0 {libtest => src/libtest}/result/fail.hpp | 0 {libtest => src/libtest}/result/skip.hpp | 0 {libtest => src/libtest}/result/success.hpp | 0 {libtest => src/libtest}/run-ci.gdb | 0 {libtest => src/libtest}/run.gdb | 0 {libtest => src/libtest}/runner.cc | 0 {libtest => src/libtest}/runner.h | 0 {libtest => src/libtest}/server.cc | 0 {libtest => src/libtest}/server.h | 0 {libtest => src/libtest}/server_container.cc | 0 {libtest => src/libtest}/server_container.h | 0 {libtest => src/libtest}/signal.cc | 0 {libtest => src/libtest}/signal.h | 0 {libtest => src/libtest}/skiptest.cc | 0 {libtest => src/libtest}/socket.cc | 0 {libtest => src/libtest}/socket.hpp | 0 {libtest => src/libtest}/stream.h | 0 {libtest => src/libtest}/strerror.cc | 0 {libtest => src/libtest}/strerror.h | 0 {libtest => src/libtest}/string.hpp | 0 {libtest => src/libtest}/test.h | 0 {libtest => src/libtest}/test.hpp | 0 {libtest => src/libtest}/thread.hpp | 0 {libtest => src/libtest}/timer.cc | 0 {libtest => src/libtest}/timer.hpp | 0 {libtest => src/libtest}/tmpfile.cc | 0 {libtest => src/libtest}/tmpfile.hpp | 0 {libtest => src/libtest}/unittest.cc | 0 {libtest => src/libtest}/valgrind.h | 0 {libtest => src/libtest}/vchar.cc | 0 {libtest => src/libtest}/vchar.hpp | 0 {libtest => src/libtest}/version.h.in | 0 {libtest => src/libtest}/visibility.h | 0 {libtest => src/libtest}/wait.cc | 0 {libtest => src/libtest}/wait.h | 0 {libtest => src/libtest}/yatl.h | 0 {libtest => src/libtest}/yatlcon.h.in | 0 mem_config.h.in => src/mem_config.h.in | 0 {util => src/util}/daemon.cc | 0 {util => src/util}/daemon.hpp | 0 {util => src/util}/instance.cc | 0 {util => src/util}/instance.hpp | 0 {util => src/util}/log.hpp | 0 {util => src/util}/logfile.cc | 0 {util => src/util}/logfile.hpp | 0 {util => src/util}/operation.cc | 0 {util => src/util}/operation.hpp | 0 {util => src/util}/pidfile.cc | 0 {util => src/util}/pidfile.hpp | 0 {util => src/util}/signal.cc | 0 {util => src/util}/signal.hpp | 0 {util => src/util}/string.hpp | 0 {win32 => src/win32}/wrappers.h | 0 tests/CMakeLists.txt | 5 - tests/cli.am | 133 --------------- tests/libmemcached-1.0/CMakeLists.txt | 5 +- tests/libmemcached-1.0/atomsmasher.cc | 4 +- tests/libmemcached-1.0/generate.cc | 4 +- tests/libmemcached-1.0/mem_functions.cc | 2 +- tests/memcapable.cc | 2 +- tests/memcat.cc | 2 +- tests/memcp.cc | 2 +- tests/memdump.cc | 2 +- tests/memerror.cc | 2 +- tests/memexist.cc | 2 +- tests/memflush.cc | 2 +- tests/memping.cc | 2 +- tests/memrm.cc | 2 +- tests/memslap.cc | 2 +- tests/memstat.cc | 2 +- tests/memtouch.cc | 2 +- 449 files changed, 147 insertions(+), 438 deletions(-) delete mode 100644 README.FIRST delete mode 100755 clients/memcapable.sh delete mode 100755 clients/memcat.sh delete mode 100755 clients/memcp.sh delete mode 100755 clients/memdump.sh delete mode 100755 clients/memerror.sh delete mode 100755 clients/memexist.sh delete mode 100755 clients/memflush.sh delete mode 100755 clients/memparse.sh delete mode 100755 clients/memping.sh delete mode 100755 clients/memrm.sh delete mode 100755 clients/memslap.sh delete mode 100755 clients/memstat.sh delete mode 100755 clients/memtouch.sh create mode 100755 docs/gh-pages/publish.sh delete mode 100755 gh-pages.sh create mode 100644 include/CMakeLists.txt rename {libhashkit-1.0 => include/libhashkit-1.0}/CMakeLists.txt (76%) rename {libhashkit-1.0 => include/libhashkit-1.0}/algorithm.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/basic_string.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/behavior.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/configure.h.in (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/digest.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/function.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/has.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/hashkit.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/hashkit.hpp (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/str_algorithm.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/strerror.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/string.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/types.h (100%) rename {libhashkit-1.0 => include/libhashkit-1.0}/visibility.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/CMakeLists.txt (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/alloc.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/allocators.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/analyze.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/auto.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/basic_string.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/behavior.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/callback.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/callbacks.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/configure.h.in (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/defaults.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/delete.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/deprecated_types.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/dump.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/encoding_key.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/error.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/exception.hpp (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/exist.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/fetch.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/flush.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/flush_buffers.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/get.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/hash.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/limits.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/memcached.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/memcached.hpp (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/options.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/parse.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/platform.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/quit.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/result.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/return.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/sasl.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/server.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/server_list.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/stats.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/storage.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/strerror.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/allocator.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/analysis.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/callback.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/memcached.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/result.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/sasl.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/server.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/stat.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/struct/string.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/t/c_sasl_test.c (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/t/c_test.c (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/t/cc_test.cc (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/touch.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/triggers.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types/behavior.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types/callback.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types/connection.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types/hash.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types/return.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/types/server_distribution.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/verbosity.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/version.h (100%) rename {libmemcached-1.0 => include/libmemcached-1.0}/visibility.h (100%) rename {libmemcachedprotocol-0.0 => include/libmemcachedprotocol-0.0}/binary.h (100%) rename {libmemcachedprotocol-0.0 => include/libmemcachedprotocol-0.0}/callback.h (100%) rename {libmemcachedprotocol-0.0 => include/libmemcachedprotocol-0.0}/handler.h (100%) rename {libmemcached/memcached => include/libmemcachedprotocol-0.0}/vbucket.h (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/CMakeLists.txt (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/flush.h (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/ostream.hpp (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/pid.h (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/ping.h (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/pool.h (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/util.h (100%) rename {libmemcachedutil-1.0 => include/libmemcachedutil-1.0}/version.h (100%) create mode 100644 src/CMakeLists.txt rename {clients => src/bin}/CMakeLists.txt (89%) rename {clients => src/bin}/client_options.h (100%) rename {clients => src/bin}/execute.cc (99%) rename {clients => src/bin}/execute.h (95%) rename {clients => src/bin}/generator.cc (98%) rename {clients => src/bin}/generator.h (100%) rename {clients => src/bin}/memaslap.c (100%) rename {clients => src/bin}/memcapable.cc (99%) create mode 100755 src/bin/memcapable.sh rename {clients => src/bin}/memcat.cc (100%) create mode 100755 src/bin/memcat.sh rename {clients => src/bin}/memcp.cc (100%) create mode 100755 src/bin/memcp.sh rename {clients => src/bin}/memdump.cc (100%) create mode 100755 src/bin/memdump.sh rename {clients => src/bin}/memerror.cc (100%) create mode 100755 src/bin/memerror.sh rename {clients => src/bin}/memexist.cc (100%) create mode 100755 src/bin/memexist.sh rename {clients => src/bin}/memflush.cc (100%) create mode 100755 src/bin/memflush.sh rename {clients => src/bin}/memparse.cc (100%) create mode 100755 src/bin/memparse.sh rename {clients => src/bin}/memping.cc (100%) create mode 100755 src/bin/memping.sh rename {clients => src/bin}/memrm.cc (100%) create mode 100755 src/bin/memrm.sh rename {clients => src/bin}/memslap.cc (100%) create mode 100755 src/bin/memslap.sh rename {clients => src/bin}/memstat.cc (100%) create mode 100755 src/bin/memstat.sh rename {clients => src/bin}/memtouch.cc (100%) create mode 100755 src/bin/memtouch.sh rename {clients => src/bin}/ms_atomic.h (100%) rename {clients => src/bin}/ms_conn.c (100%) rename {clients => src/bin}/ms_conn.h (100%) rename {clients => src/bin}/ms_memslap.h (100%) rename {clients => src/bin}/ms_setting.c (100%) rename {clients => src/bin}/ms_setting.h (100%) rename {clients => src/bin}/ms_sigsegv.c (100%) rename {clients => src/bin}/ms_sigsegv.h (100%) rename {clients => src/bin}/ms_stats.c (100%) rename {clients => src/bin}/ms_stats.h (100%) rename {clients => src/bin}/ms_task.c (100%) rename {clients => src/bin}/ms_task.h (100%) rename {clients => src/bin}/ms_thread.c (100%) rename {clients => src/bin}/ms_thread.h (100%) rename {clients => src/bin}/utilities.cc (99%) rename {clients => src/bin}/utilities.h (97%) rename {libhashkit => src/libhashkit}/CMakeLists.txt (96%) rename {libhashkit => src/libhashkit}/aes.cc (100%) rename {libhashkit => src/libhashkit}/aes.h (100%) rename {libhashkit => src/libhashkit}/algorithm.cc (100%) rename {libhashkit => src/libhashkit}/algorithm.h (100%) rename {libhashkit => src/libhashkit}/behavior.cc (100%) rename {libhashkit => src/libhashkit}/common.h (100%) rename {libhashkit => src/libhashkit}/crc32.cc (100%) rename {libhashkit => src/libhashkit}/digest.cc (100%) rename {libhashkit => src/libhashkit}/encrypt.cc (100%) rename {libhashkit => src/libhashkit}/fnv_32.cc (100%) rename {libhashkit => src/libhashkit}/fnv_64.cc (100%) rename {libhashkit => src/libhashkit}/function.cc (100%) rename {libhashkit => src/libhashkit}/has.cc (100%) rename {libhashkit => src/libhashkit}/hashkit.cc (100%) rename {libhashkit => src/libhashkit}/hashkit.h (100%) rename {libhashkit => src/libhashkit}/hashkitcon.h.in (100%) rename {libhashkit => src/libhashkit}/hsieh.cc (100%) rename {libhashkit => src/libhashkit}/is.h (100%) rename {libhashkit => src/libhashkit}/jenkins.cc (100%) rename {libhashkit => src/libhashkit}/ketama.cc (100%) rename {libhashkit => src/libhashkit}/md5.cc (100%) rename {libhashkit => src/libhashkit}/murmur.cc (100%) rename {libhashkit => src/libhashkit}/murmur3.cc (100%) rename {libhashkit => src/libhashkit}/murmur3.h (100%) rename {libhashkit => src/libhashkit}/murmur3_api.cc (100%) rename {libhashkit => src/libhashkit}/nohsieh.cc (100%) rename {libhashkit => src/libhashkit}/one_at_a_time.cc (100%) rename {libhashkit => src/libhashkit}/rijndael.cc (100%) rename {libhashkit => src/libhashkit}/rijndael.hpp (100%) rename {libhashkit => src/libhashkit}/str_algorithm.cc (100%) rename {libhashkit => src/libhashkit}/strerror.cc (100%) rename {libhashkit => src/libhashkit}/string.cc (100%) rename {libhashkit => src/libhashkit}/string.h (100%) rename {libmemcached => src/libmemcached}/CMakeLists.txt (94%) rename {libmemcached => src/libmemcached}/allocators.cc (100%) rename {libmemcached => src/libmemcached}/allocators.hpp (100%) rename {libmemcached => src/libmemcached}/analyze.cc (100%) rename {libmemcached => src/libmemcached}/array.c (100%) rename {libmemcached => src/libmemcached}/array.h (100%) rename {libmemcached => src/libmemcached}/assert.hpp (100%) rename {libmemcached => src/libmemcached}/auto.cc (100%) rename {libmemcached => src/libmemcached}/backtrace.cc (100%) rename {libmemcached => src/libmemcached}/backtrace.hpp (100%) rename {libmemcached => src/libmemcached}/behavior.cc (100%) rename {libmemcached => src/libmemcached}/behavior.hpp (100%) rename {libmemcached => src/libmemcached}/byteorder.cc (100%) rename {libmemcached => src/libmemcached}/byteorder.h (100%) rename {libmemcached => src/libmemcached}/callback.cc (100%) rename {libmemcached => src/libmemcached}/callback.h (100%) rename {libmemcached => src/libmemcached}/common.h (100%) rename {libmemcached => src/libmemcached}/connect.cc (100%) rename {libmemcached => src/libmemcached}/connect.hpp (100%) rename {libmemcached => src/libmemcached}/continuum.hpp (100%) rename {libmemcached => src/libmemcached}/csl/common.h (100%) rename {libmemcached => src/libmemcached}/csl/context.cc (100%) rename {libmemcached => src/libmemcached}/csl/context.h (100%) rename {libmemcached => src/libmemcached}/csl/parser.yy (100%) rename {libmemcached => src/libmemcached}/csl/scanner.l (100%) rename {libmemcached => src/libmemcached}/csl/server.h (100%) rename {libmemcached => src/libmemcached}/csl/symbol.h (100%) rename {libmemcached => src/libmemcached}/delete.cc (100%) rename {libmemcached => src/libmemcached}/do.cc (100%) rename {libmemcached => src/libmemcached}/do.hpp (100%) rename {libmemcached => src/libmemcached}/dump.cc (100%) rename {libmemcached => src/libmemcached}/encoding_key.cc (100%) rename {libmemcached => src/libmemcached}/encoding_key.h (100%) rename {libmemcached => src/libmemcached}/error.cc (100%) rename {libmemcached => src/libmemcached}/error.hpp (100%) rename {libmemcached => src/libmemcached}/exist.cc (100%) rename {libmemcached => src/libmemcached}/fetch.cc (100%) rename {libmemcached => src/libmemcached}/flag.cc (100%) rename {libmemcached => src/libmemcached}/flag.hpp (100%) rename {libmemcached => src/libmemcached}/flush.cc (100%) rename {libmemcached => src/libmemcached}/flush_buffers.cc (100%) rename {libmemcached => src/libmemcached}/get.cc (100%) rename {libmemcached => src/libmemcached}/hash.cc (100%) rename {libmemcached => src/libmemcached}/hash.hpp (100%) rename {libmemcached => src/libmemcached}/hosts.cc (100%) rename {libmemcached => src/libmemcached}/initialize_query.cc (100%) rename {libmemcached => src/libmemcached}/initialize_query.h (100%) rename {libmemcached => src/libmemcached}/instance.cc (100%) rename {libmemcached => src/libmemcached}/instance.hpp (100%) rename {libmemcached => src/libmemcached}/internal.h (100%) rename {libmemcached => src/libmemcached}/io.cc (100%) rename {libmemcached => src/libmemcached}/io.h (100%) rename {libmemcached => src/libmemcached}/io.hpp (100%) rename {libmemcached => src/libmemcached}/is.h (100%) rename {libmemcached => src/libmemcached}/key.cc (100%) rename {libmemcached => src/libmemcached}/key.hpp (100%) rename {libmemcached => src/libmemcached}/libmemcached_probes.d (100%) rename {libmemcached => src/libmemcached}/libmemcached_probes.h (100%) rename {libmemcached => src/libmemcached}/memcached.cc (100%) rename {libmemcached => src/libmemcached}/memcached.h (100%) rename {libmemcached => src/libmemcached}/memcached.hpp (100%) rename {libmemcached => src/libmemcached}/memcached/README.txt (100%) rename {libmemcached => src/libmemcached}/memcached/protocol_binary.h (100%) rename {libmemcachedprotocol-0.0 => src/libmemcached/memcached}/vbucket.h (100%) rename {libmemcached => src/libmemcached}/memory.h (100%) rename {libmemcached => src/libmemcached}/namespace.cc (100%) rename {libmemcached => src/libmemcached}/namespace.h (100%) rename {libmemcached => src/libmemcached}/options.cc (100%) rename {libmemcached => src/libmemcached}/options.hpp (100%) rename {libmemcached => src/libmemcached}/parse.cc (100%) rename {libmemcached => src/libmemcached}/poll.cc (100%) rename {libmemcached => src/libmemcached}/poll.h (100%) rename {libmemcached => src/libmemcached}/purge.cc (100%) rename {libmemcached => src/libmemcached}/quit.cc (100%) rename {libmemcached => src/libmemcached}/quit.hpp (100%) rename {libmemcached => src/libmemcached}/response.cc (100%) rename {libmemcached => src/libmemcached}/response.h (100%) rename {libmemcached => src/libmemcached}/result.cc (100%) rename {libmemcached => src/libmemcached}/result.h (100%) rename {libmemcached => src/libmemcached}/sasl.cc (100%) rename {libmemcached => src/libmemcached}/sasl.hpp (100%) rename {libmemcached => src/libmemcached}/server.cc (100%) rename {libmemcached => src/libmemcached}/server.hpp (100%) rename {libmemcached => src/libmemcached}/server_instance.h (100%) rename {libmemcached => src/libmemcached}/server_list.cc (100%) rename {libmemcached => src/libmemcached}/server_list.hpp (100%) rename {libmemcached => src/libmemcached}/socket.hpp (100%) rename {libmemcached => src/libmemcached}/stats.cc (100%) rename {libmemcached => src/libmemcached}/storage.cc (100%) rename {libmemcached => src/libmemcached}/strerror.cc (100%) rename {libmemcached => src/libmemcached}/string.cc (100%) rename {libmemcached => src/libmemcached}/string.hpp (100%) rename {libmemcached => src/libmemcached}/touch.cc (100%) rename {libmemcached => src/libmemcached}/udp.cc (100%) rename {libmemcached => src/libmemcached}/udp.hpp (100%) rename {libmemcached => src/libmemcached}/util.h (100%) rename {libmemcached => src/libmemcached}/util/Makefile.am (100%) rename {libmemcached => src/libmemcached}/verbosity.cc (100%) rename {libmemcached => src/libmemcached}/version.cc (100%) rename {libmemcached => src/libmemcached}/version.hpp (100%) rename {libmemcached => src/libmemcached}/virtual_bucket.c (100%) rename {libmemcached => src/libmemcached}/virtual_bucket.h (100%) rename {libmemcached => src/libmemcached}/watchpoint.h (100%) rename {libmemcached => src/libmemcached}/windows.hpp (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/ascii_handler.c (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/ascii_handler.h (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/binary_handler.c (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/binary_handler.h (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/cache.c (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/cache.h (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/common.h (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/handler.c (100%) rename {libmemcachedprotocol => src/libmemcachedprotocol}/pedantic.c (100%) rename {libmemcachedutil => src/libmemcachedutil}/CMakeLists.txt (93%) rename {libmemcachedutil => src/libmemcachedutil}/common.h (100%) rename {libmemcachedutil => src/libmemcachedutil}/flush.cc (100%) rename {libmemcachedutil => src/libmemcachedutil}/pid.cc (100%) rename {libmemcachedutil => src/libmemcachedutil}/ping.cc (100%) rename {libmemcachedutil => src/libmemcachedutil}/pool.cc (100%) rename {libmemcachedutil => src/libmemcachedutil}/version.cc (100%) rename {libtest => src/libtest}/CMakeLists.txt (89%) rename {libtest => src/libtest}/alarm.cc (100%) rename {libtest => src/libtest}/alarm.h (100%) rename {libtest => src/libtest}/backtrace_test.cc (100%) rename {libtest => src/libtest}/binaries.cc (100%) rename {libtest => src/libtest}/binaries.h (100%) rename {libtest => src/libtest}/blobslap_worker.cc (100%) rename {libtest => src/libtest}/blobslap_worker.h (100%) rename {libtest => src/libtest}/callbacks.h (100%) rename {libtest => src/libtest}/client.cc (100%) rename {libtest => src/libtest}/client.hpp (100%) rename {libtest => src/libtest}/cmdline.cc (100%) rename {libtest => src/libtest}/cmdline.h (100%) rename {libtest => src/libtest}/collection.cc (100%) rename {libtest => src/libtest}/collection.h (100%) rename {libtest => src/libtest}/common.h (100%) rename {libtest => src/libtest}/comparison.cc (100%) rename {libtest => src/libtest}/comparison.hpp (100%) rename {libtest => src/libtest}/core.cc (100%) rename {libtest => src/libtest}/core.h (100%) rename {libtest => src/libtest}/core_count.cc (100%) rename {libtest => src/libtest}/cpu.cc (100%) rename {libtest => src/libtest}/cpu.hpp (100%) rename {libtest => src/libtest}/dns.cc (100%) rename {libtest => src/libtest}/dns.hpp (100%) rename {libtest => src/libtest}/dream.cc (100%) rename {libtest => src/libtest}/dream.h (100%) rename {libtest => src/libtest}/drizzled.cc (100%) rename {libtest => src/libtest}/drizzled.h (100%) rename {libtest => src/libtest}/error.h (100%) rename {libtest => src/libtest}/exception.cc (100%) rename {libtest => src/libtest}/exception.hpp (100%) rename {libtest => src/libtest}/exception/disconnected.hpp (100%) rename {libtest => src/libtest}/exception/fatal.cc (100%) rename {libtest => src/libtest}/exception/fatal.hpp (100%) rename {libtest => src/libtest}/failed.cc (100%) rename {libtest => src/libtest}/formatter.cc (100%) rename {libtest => src/libtest}/formatter.hpp (100%) rename {libtest => src/libtest}/framework.cc (100%) rename {libtest => src/libtest}/framework.h (100%) rename {libtest => src/libtest}/gearmand.cc (100%) rename {libtest => src/libtest}/gearmand.h (100%) rename {libtest => src/libtest}/get.h (100%) rename {libtest => src/libtest}/has.cc (100%) rename {libtest => src/libtest}/has.hpp (100%) rename {libtest => src/libtest}/http.cc (100%) rename {libtest => src/libtest}/http.hpp (100%) rename {libtest => src/libtest}/is_local.cc (100%) rename {libtest => src/libtest}/is_local.hpp (100%) rename {libtest => src/libtest}/is_pid.hpp (100%) rename {libtest => src/libtest}/killpid.cc (100%) rename {libtest => src/libtest}/killpid.h (100%) rename {libtest => src/libtest}/libtool.cc (100%) rename {libtest => src/libtest}/libtool.hpp (100%) rename {libtest => src/libtest}/lite.h (100%) rename {libtest => src/libtest}/main.cc (100%) rename {libtest => src/libtest}/memcached.cc (100%) rename {libtest => src/libtest}/memcached.h (100%) rename {libtest => src/libtest}/memcached.hpp (100%) rename {libtest => src/libtest}/poll_error.hpp (100%) rename {libtest => src/libtest}/port.cc (100%) rename {libtest => src/libtest}/port.h (100%) rename {libtest => src/libtest}/result.cc (100%) rename {libtest => src/libtest}/result.hpp (100%) rename {libtest => src/libtest}/result/base.hpp (100%) rename {libtest => src/libtest}/result/fail.hpp (100%) rename {libtest => src/libtest}/result/skip.hpp (100%) rename {libtest => src/libtest}/result/success.hpp (100%) rename {libtest => src/libtest}/run-ci.gdb (100%) rename {libtest => src/libtest}/run.gdb (100%) rename {libtest => src/libtest}/runner.cc (100%) rename {libtest => src/libtest}/runner.h (100%) rename {libtest => src/libtest}/server.cc (100%) rename {libtest => src/libtest}/server.h (100%) rename {libtest => src/libtest}/server_container.cc (100%) rename {libtest => src/libtest}/server_container.h (100%) rename {libtest => src/libtest}/signal.cc (100%) rename {libtest => src/libtest}/signal.h (100%) rename {libtest => src/libtest}/skiptest.cc (100%) rename {libtest => src/libtest}/socket.cc (100%) rename {libtest => src/libtest}/socket.hpp (100%) rename {libtest => src/libtest}/stream.h (100%) rename {libtest => src/libtest}/strerror.cc (100%) rename {libtest => src/libtest}/strerror.h (100%) rename {libtest => src/libtest}/string.hpp (100%) rename {libtest => src/libtest}/test.h (100%) rename {libtest => src/libtest}/test.hpp (100%) rename {libtest => src/libtest}/thread.hpp (100%) rename {libtest => src/libtest}/timer.cc (100%) rename {libtest => src/libtest}/timer.hpp (100%) rename {libtest => src/libtest}/tmpfile.cc (100%) rename {libtest => src/libtest}/tmpfile.hpp (100%) rename {libtest => src/libtest}/unittest.cc (100%) rename {libtest => src/libtest}/valgrind.h (100%) rename {libtest => src/libtest}/vchar.cc (100%) rename {libtest => src/libtest}/vchar.hpp (100%) rename {libtest => src/libtest}/version.h.in (100%) rename {libtest => src/libtest}/visibility.h (100%) rename {libtest => src/libtest}/wait.cc (100%) rename {libtest => src/libtest}/wait.h (100%) rename {libtest => src/libtest}/yatl.h (100%) rename {libtest => src/libtest}/yatlcon.h.in (100%) rename mem_config.h.in => src/mem_config.h.in (100%) rename {util => src/util}/daemon.cc (100%) rename {util => src/util}/daemon.hpp (100%) rename {util => src/util}/instance.cc (100%) rename {util => src/util}/instance.hpp (100%) rename {util => src/util}/log.hpp (100%) rename {util => src/util}/logfile.cc (100%) rename {util => src/util}/logfile.hpp (100%) rename {util => src/util}/operation.cc (100%) rename {util => src/util}/operation.hpp (100%) rename {util => src/util}/pidfile.cc (100%) rename {util => src/util}/pidfile.hpp (100%) rename {util => src/util}/signal.cc (100%) rename {util => src/util}/signal.hpp (100%) rename {util => src/util}/string.hpp (100%) rename {win32 => src/win32}/wrappers.h (100%) delete mode 100644 tests/cli.am diff --git a/.gitignore b/.gitignore index d2b042d4..dffd1bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *~ *.log -*.trs *.exe *.gz *.lo @@ -28,145 +27,25 @@ .idea/ .project .settings/ -INSTALL -Makefile -Makefile.in -TAGS -aclocal.m4 -aminclude.am -artifacts -autom4te.cache -autoscan.log -build-aux/ -clients/memaslap -clients/memcapable -clients/memcat -clients/memcp -clients/memdump -clients/memerror -clients/memexist -clients/memflush -clients/memparse -clients/memping -clients/memrm -clients/memslap -clients/memstat -clients/memtouch +src/bin/memaslap +src/bin/memcapable +src/bin/memcat +src/bin/memcp +src/bin/memdump +src/bin/memerror +src/bin/memexist +src/bin/memflush +src/bin/memparse +src/bin/memping +src/bin/memrm +src/bin/memslap +src/bin/memstat +src/bin/memtouch cmake-build-*/ -config.cache -config.log -config.status -config/compile -config/config.guess -config/config.sub -config/depcomp -config/install-sh -config/ltmain.sh -config/missing -config/pandora_vc_revinfo -config/top.h -configure -configure.scan -docs/*.[13] -docs/*.html -docs/build -docs/changes -docs/source/conf.py -docs/doctest/ -docs/doctrees/ -docs/html/ -docs/linkcheck/ -docs/text example/memcached_light example/t/memcached_light -libhashkit-1.0/configure.h -libhashkit/hashkitcon.h -libmemcached-1.0/configure.h -libmemcached-1.0/t/c_sasl_test -libmemcached-1.0/t/c_test -libmemcached-1.0/t/cc_test -libmemcached-1.2/configure.h -libmemcached-2.0/configure.h -libmemcached-?.??/ -libmemcached/configure.h -libmemcached/csl/parser.cc -libmemcached/csl/parser.h -libmemcached/csl/scanner.cc -libmemcached/csl/scanner.h -libmemcached/dtrace_probes.h -libmemcached/generated_probes.h -libmemcached/memcached_configure.h -libtest/.hg/ -libtest/.hgignore -libtest/abort -libtest/backtrace -libtest/core-count -libtest/skiptest -libtest/unittest -libtest/version.h -libtest/wait -libtest/yatlcon.h -libtool -m4/libtool.m4 -m4/libtool.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 -m4/lt~obsolete.m4 -man/*.1 -man/*.3 -man/*.8 -man/.doctrees/ -mem_config.h -mem_config.in -out -patch -patch2 -stamp-h1 -support/example.cnf -support/Makefile -support/Makefile.in -support/libmemcached-fc.spec -support/libmemcached.pc -support/libmemcached.spec tags -tests/atomsmasher -tests/c_sasl_test -tests/c_test -tests/cycle -tests/failure -tests/hash_plus -tests/hashplus -tests/internals -tests/libmemcached-1.0/internals -tests/libmemcached-1.0/sasl -tests/libmemcached-1.0/testapp -tests/libmemcached-1.0/testsocket -tests/memcapable -tests/memcat -tests/memcp -tests/memdump -tests/memerror -tests/memexist -tests/memflush -tests/memping -tests/memplus -tests/memrm -tests/memslap -tests/memstat -tests/memtouch -tests/output.cmp -tests/parser -tests/sasl -tests/startservers -tests/testapp -tests/testhashkit -tests/testplus -tests/testudp -tests/var/ -tmp_chroot -unittests/unittests venv/ /infer-out/ -/gh-pages/ -/gh-pages-build/ +/docs/gh-pages/source/ +/docs/gh-pages/build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f12aaca..36ca4988 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,13 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(CMakeConfig.txt) -include_directories(${CMAKE_BINARY_DIR}) +foreach(INCLUDE IN ITEMS ${CMAKE_BINARY_DIR} .) + include_directories( + ${INCLUDE}/ + ${INCLUDE}/include + ${INCLUDE}/src + ) +endforeach() set(AUTOHEADER_FILE mem_config.h) set(CLIENTS @@ -36,21 +42,14 @@ set(CLIENTS memtouch ) -add_subdirectory(clients) -add_subdirectory(libhashkit) -add_subdirectory(libhashkit-1.0) -add_subdirectory(libmemcached) -add_subdirectory(libmemcached-1.0) -add_subdirectory(libmemcachedutil) -add_subdirectory(libmemcachedutil-1.0) +add_subdirectory(include) +add_subdirectory(src) +add_subdirectory(docs) +add_subdirectory(support) if(BUILD_TESTING) - add_subdirectory(libtest) add_subdirectory(tests) endif() -add_subdirectory(docs) -add_subdirectory(support) - # keep last -configure_file(mem_config.h.in ${CMAKE_BINARY_DIR}/${AUTOHEADER_FILE} @ONLY) +configure_file(src/mem_config.h.in ${AUTOHEADER_FILE} @ONLY) diff --git a/COPYING b/COPYING index 0957f61a..0985e79d 100644 --- a/COPYING +++ b/COPYING @@ -1,32 +1,29 @@ -Software License Agreement (BSD License) +Copyright (c) 2011-2013 Brian Aker, DataDifferential, https://datadifferential.com/ +Copyright (c) 2020 Michael Wallner, SmugMug Inc, https://smugmug.com/ -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: +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. +1. 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. +2. 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. - * Neither the name of TangentOrg nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +3. Neither the name of the copyright holder nor the names of its contributors + may 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. +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 HOLDER 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. diff --git a/README.FIRST b/README.FIRST deleted file mode 100644 index 7c93b9b5..00000000 --- a/README.FIRST +++ /dev/null @@ -1,31 +0,0 @@ -Hi! - -If you are getting this code from http://launchpad.net/libmemcached then -continue reading. Otherwise these directions are not for you (well maybe...). - -To obtain code from http://bazaar.launchpad.net/libmemcached you will need to -issue the following command: - -bzr branch lp:libmemcached - -Once the tree is cloned you will need to build the "configure" script. You -can do this by running the script: - -./bootstrap.sh autoreconf - -It will set up all of the files you need to build libmemcached. At that -point it is just the typical "./configure; make; make test; make install" - -For a tarball release do a "make dist" and for an RPM type "make rpm". - -For patches, we prefer you push a branch to launchpad and then submit that -branch to be merged. For more information, see: - -https://help.launchpad.net/Code/UploadingABranch -https://help.launchpad.net/Code/Review - -Thanks and keep hacking! - -Cheers, - -Brian - Seattle, WA. diff --git a/clients/memcapable.sh b/clients/memcapable.sh deleted file mode 100755 index cc4f89af..00000000 --- a/clients/memcapable.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memcapable -vh localhost diff --git a/clients/memcat.sh b/clients/memcat.sh deleted file mode 100755 index e7497de0..00000000 --- a/clients/memcat.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -clients/memcp.sh -clients/memcat --servers=localhost -v mem.testdata diff --git a/clients/memcp.sh b/clients/memcp.sh deleted file mode 100755 index a2f7d53a..00000000 --- a/clients/memcp.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memcp -v --servers localhost mem.testdata diff --git a/clients/memdump.sh b/clients/memdump.sh deleted file mode 100755 index 6e131d2c..00000000 --- a/clients/memdump.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -clients/memdump -v --servers localhost diff --git a/clients/memerror.sh b/clients/memerror.sh deleted file mode 100755 index 3843b552..00000000 --- a/clients/memerror.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memerror 0 1 2 3 diff --git a/clients/memexist.sh b/clients/memexist.sh deleted file mode 100755 index aa8a2fed..00000000 --- a/clients/memexist.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -clients/memcp.sh -clients/memexist -v --servers localhost mem.testdata diff --git a/clients/memflush.sh b/clients/memflush.sh deleted file mode 100755 index f841e703..00000000 --- a/clients/memflush.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memflush -v --servers localhost diff --git a/clients/memparse.sh b/clients/memparse.sh deleted file mode 100755 index f18b8e0e..00000000 --- a/clients/memparse.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memparse --server=localhost:11211/?1 --server=127.0.0.1:11211/?2 diff --git a/clients/memping.sh b/clients/memping.sh deleted file mode 100755 index 33100e77..00000000 --- a/clients/memping.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memping -v --servers localhost diff --git a/clients/memrm.sh b/clients/memrm.sh deleted file mode 100755 index 4818d4d2..00000000 --- a/clients/memrm.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -clients/memcp.sh -clients/memrm -v --servers localhost mem.testdata diff --git a/clients/memslap.sh b/clients/memslap.sh deleted file mode 100755 index 85b78ef5..00000000 --- a/clients/memslap.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -clients/memslap -v --servers localhost diff --git a/clients/memstat.sh b/clients/memstat.sh deleted file mode 100755 index b52ba65f..00000000 --- a/clients/memstat.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -clients/memstat -v --servers localhost diff --git a/clients/memtouch.sh b/clients/memtouch.sh deleted file mode 100755 index 36531d53..00000000 --- a/clients/memtouch.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -clients/memcp.sh -clients/memtouch -v --servers localhost mem.testdata diff --git a/docs/gh-pages/publish.sh b/docs/gh-pages/publish.sh new file mode 100755 index 00000000..b87f8ef5 --- /dev/null +++ b/docs/gh-pages/publish.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +set -eu +cd "$(dirname $0)" + +if test -d source/.git +then + cd source + git pull -r + cd .. +else + git clone -b gh-pages github.com:m6w6/libmemcached source +fi + +mkdir -p build +cd build +cmake ../.. +make html +rsync -va --delete --exclude=.git/ docs/html/ ../source/ + +cd ../source +touch .nojekyll +git add -A +git ci -m "update docs" +git push + diff --git a/gh-pages.sh b/gh-pages.sh deleted file mode 100755 index 41847374..00000000 --- a/gh-pages.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -eu -cd "$(dirname $0)" - -if test -d gh-pages/.git -then - cd gh-pages - git pull -r - cd .. -else - git clone -b gh-pages github.com:m6w6/libmemcached gh-pages -fi - -mkdir -p gh-pages-build -cd gh-pages-build -cmake .. -make html -rsync -va --delete --exclude=.git/ docs/html/ ../gh-pages/ - -cd ../gh-pages -touch .nojekyll -git add -A -git ci -m "update docs" -git push - diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt new file mode 100644 index 00000000..90825091 --- /dev/null +++ b/include/CMakeLists.txt @@ -0,0 +1,4 @@ + +add_subdirectory(libhashkit-1.0) +add_subdirectory(libmemcached-1.0) +add_subdirectory(libmemcachedutil-1.0) diff --git a/libhashkit-1.0/CMakeLists.txt b/include/libhashkit-1.0/CMakeLists.txt similarity index 76% rename from libhashkit-1.0/CMakeLists.txt rename to include/libhashkit-1.0/CMakeLists.txt index 7fc72a3c..ee967319 100644 --- a/libhashkit-1.0/CMakeLists.txt +++ b/include/libhashkit-1.0/CMakeLists.txt @@ -1,7 +1,7 @@ configure_file(configure.h.in configure.h @ONLY) -install(DIRECTORY ../libhashkit-1.0 +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING REGEX "\\.h(pp)?$" ) diff --git a/libhashkit-1.0/algorithm.h b/include/libhashkit-1.0/algorithm.h similarity index 100% rename from libhashkit-1.0/algorithm.h rename to include/libhashkit-1.0/algorithm.h diff --git a/libhashkit-1.0/basic_string.h b/include/libhashkit-1.0/basic_string.h similarity index 100% rename from libhashkit-1.0/basic_string.h rename to include/libhashkit-1.0/basic_string.h diff --git a/libhashkit-1.0/behavior.h b/include/libhashkit-1.0/behavior.h similarity index 100% rename from libhashkit-1.0/behavior.h rename to include/libhashkit-1.0/behavior.h diff --git a/libhashkit-1.0/configure.h.in b/include/libhashkit-1.0/configure.h.in similarity index 100% rename from libhashkit-1.0/configure.h.in rename to include/libhashkit-1.0/configure.h.in diff --git a/libhashkit-1.0/digest.h b/include/libhashkit-1.0/digest.h similarity index 100% rename from libhashkit-1.0/digest.h rename to include/libhashkit-1.0/digest.h diff --git a/libhashkit-1.0/function.h b/include/libhashkit-1.0/function.h similarity index 100% rename from libhashkit-1.0/function.h rename to include/libhashkit-1.0/function.h diff --git a/libhashkit-1.0/has.h b/include/libhashkit-1.0/has.h similarity index 100% rename from libhashkit-1.0/has.h rename to include/libhashkit-1.0/has.h diff --git a/libhashkit-1.0/hashkit.h b/include/libhashkit-1.0/hashkit.h similarity index 100% rename from libhashkit-1.0/hashkit.h rename to include/libhashkit-1.0/hashkit.h diff --git a/libhashkit-1.0/hashkit.hpp b/include/libhashkit-1.0/hashkit.hpp similarity index 100% rename from libhashkit-1.0/hashkit.hpp rename to include/libhashkit-1.0/hashkit.hpp diff --git a/libhashkit-1.0/str_algorithm.h b/include/libhashkit-1.0/str_algorithm.h similarity index 100% rename from libhashkit-1.0/str_algorithm.h rename to include/libhashkit-1.0/str_algorithm.h diff --git a/libhashkit-1.0/strerror.h b/include/libhashkit-1.0/strerror.h similarity index 100% rename from libhashkit-1.0/strerror.h rename to include/libhashkit-1.0/strerror.h diff --git a/libhashkit-1.0/string.h b/include/libhashkit-1.0/string.h similarity index 100% rename from libhashkit-1.0/string.h rename to include/libhashkit-1.0/string.h diff --git a/libhashkit-1.0/types.h b/include/libhashkit-1.0/types.h similarity index 100% rename from libhashkit-1.0/types.h rename to include/libhashkit-1.0/types.h diff --git a/libhashkit-1.0/visibility.h b/include/libhashkit-1.0/visibility.h similarity index 100% rename from libhashkit-1.0/visibility.h rename to include/libhashkit-1.0/visibility.h diff --git a/libmemcached-1.0/CMakeLists.txt b/include/libmemcached-1.0/CMakeLists.txt similarity index 100% rename from libmemcached-1.0/CMakeLists.txt rename to include/libmemcached-1.0/CMakeLists.txt diff --git a/libmemcached-1.0/alloc.h b/include/libmemcached-1.0/alloc.h similarity index 100% rename from libmemcached-1.0/alloc.h rename to include/libmemcached-1.0/alloc.h diff --git a/libmemcached-1.0/allocators.h b/include/libmemcached-1.0/allocators.h similarity index 100% rename from libmemcached-1.0/allocators.h rename to include/libmemcached-1.0/allocators.h diff --git a/libmemcached-1.0/analyze.h b/include/libmemcached-1.0/analyze.h similarity index 100% rename from libmemcached-1.0/analyze.h rename to include/libmemcached-1.0/analyze.h diff --git a/libmemcached-1.0/auto.h b/include/libmemcached-1.0/auto.h similarity index 100% rename from libmemcached-1.0/auto.h rename to include/libmemcached-1.0/auto.h diff --git a/libmemcached-1.0/basic_string.h b/include/libmemcached-1.0/basic_string.h similarity index 100% rename from libmemcached-1.0/basic_string.h rename to include/libmemcached-1.0/basic_string.h diff --git a/libmemcached-1.0/behavior.h b/include/libmemcached-1.0/behavior.h similarity index 100% rename from libmemcached-1.0/behavior.h rename to include/libmemcached-1.0/behavior.h diff --git a/libmemcached-1.0/callback.h b/include/libmemcached-1.0/callback.h similarity index 100% rename from libmemcached-1.0/callback.h rename to include/libmemcached-1.0/callback.h diff --git a/libmemcached-1.0/callbacks.h b/include/libmemcached-1.0/callbacks.h similarity index 100% rename from libmemcached-1.0/callbacks.h rename to include/libmemcached-1.0/callbacks.h diff --git a/libmemcached-1.0/configure.h.in b/include/libmemcached-1.0/configure.h.in similarity index 100% rename from libmemcached-1.0/configure.h.in rename to include/libmemcached-1.0/configure.h.in diff --git a/libmemcached-1.0/defaults.h b/include/libmemcached-1.0/defaults.h similarity index 100% rename from libmemcached-1.0/defaults.h rename to include/libmemcached-1.0/defaults.h diff --git a/libmemcached-1.0/delete.h b/include/libmemcached-1.0/delete.h similarity index 100% rename from libmemcached-1.0/delete.h rename to include/libmemcached-1.0/delete.h diff --git a/libmemcached-1.0/deprecated_types.h b/include/libmemcached-1.0/deprecated_types.h similarity index 100% rename from libmemcached-1.0/deprecated_types.h rename to include/libmemcached-1.0/deprecated_types.h diff --git a/libmemcached-1.0/dump.h b/include/libmemcached-1.0/dump.h similarity index 100% rename from libmemcached-1.0/dump.h rename to include/libmemcached-1.0/dump.h diff --git a/libmemcached-1.0/encoding_key.h b/include/libmemcached-1.0/encoding_key.h similarity index 100% rename from libmemcached-1.0/encoding_key.h rename to include/libmemcached-1.0/encoding_key.h diff --git a/libmemcached-1.0/error.h b/include/libmemcached-1.0/error.h similarity index 100% rename from libmemcached-1.0/error.h rename to include/libmemcached-1.0/error.h diff --git a/libmemcached-1.0/exception.hpp b/include/libmemcached-1.0/exception.hpp similarity index 100% rename from libmemcached-1.0/exception.hpp rename to include/libmemcached-1.0/exception.hpp diff --git a/libmemcached-1.0/exist.h b/include/libmemcached-1.0/exist.h similarity index 100% rename from libmemcached-1.0/exist.h rename to include/libmemcached-1.0/exist.h diff --git a/libmemcached-1.0/fetch.h b/include/libmemcached-1.0/fetch.h similarity index 100% rename from libmemcached-1.0/fetch.h rename to include/libmemcached-1.0/fetch.h diff --git a/libmemcached-1.0/flush.h b/include/libmemcached-1.0/flush.h similarity index 100% rename from libmemcached-1.0/flush.h rename to include/libmemcached-1.0/flush.h diff --git a/libmemcached-1.0/flush_buffers.h b/include/libmemcached-1.0/flush_buffers.h similarity index 100% rename from libmemcached-1.0/flush_buffers.h rename to include/libmemcached-1.0/flush_buffers.h diff --git a/libmemcached-1.0/get.h b/include/libmemcached-1.0/get.h similarity index 100% rename from libmemcached-1.0/get.h rename to include/libmemcached-1.0/get.h diff --git a/libmemcached-1.0/hash.h b/include/libmemcached-1.0/hash.h similarity index 100% rename from libmemcached-1.0/hash.h rename to include/libmemcached-1.0/hash.h diff --git a/libmemcached-1.0/limits.h b/include/libmemcached-1.0/limits.h similarity index 100% rename from libmemcached-1.0/limits.h rename to include/libmemcached-1.0/limits.h diff --git a/libmemcached-1.0/memcached.h b/include/libmemcached-1.0/memcached.h similarity index 100% rename from libmemcached-1.0/memcached.h rename to include/libmemcached-1.0/memcached.h diff --git a/libmemcached-1.0/memcached.hpp b/include/libmemcached-1.0/memcached.hpp similarity index 100% rename from libmemcached-1.0/memcached.hpp rename to include/libmemcached-1.0/memcached.hpp diff --git a/libmemcached-1.0/options.h b/include/libmemcached-1.0/options.h similarity index 100% rename from libmemcached-1.0/options.h rename to include/libmemcached-1.0/options.h diff --git a/libmemcached-1.0/parse.h b/include/libmemcached-1.0/parse.h similarity index 100% rename from libmemcached-1.0/parse.h rename to include/libmemcached-1.0/parse.h diff --git a/libmemcached-1.0/platform.h b/include/libmemcached-1.0/platform.h similarity index 100% rename from libmemcached-1.0/platform.h rename to include/libmemcached-1.0/platform.h diff --git a/libmemcached-1.0/quit.h b/include/libmemcached-1.0/quit.h similarity index 100% rename from libmemcached-1.0/quit.h rename to include/libmemcached-1.0/quit.h diff --git a/libmemcached-1.0/result.h b/include/libmemcached-1.0/result.h similarity index 100% rename from libmemcached-1.0/result.h rename to include/libmemcached-1.0/result.h diff --git a/libmemcached-1.0/return.h b/include/libmemcached-1.0/return.h similarity index 100% rename from libmemcached-1.0/return.h rename to include/libmemcached-1.0/return.h diff --git a/libmemcached-1.0/sasl.h b/include/libmemcached-1.0/sasl.h similarity index 100% rename from libmemcached-1.0/sasl.h rename to include/libmemcached-1.0/sasl.h diff --git a/libmemcached-1.0/server.h b/include/libmemcached-1.0/server.h similarity index 100% rename from libmemcached-1.0/server.h rename to include/libmemcached-1.0/server.h diff --git a/libmemcached-1.0/server_list.h b/include/libmemcached-1.0/server_list.h similarity index 100% rename from libmemcached-1.0/server_list.h rename to include/libmemcached-1.0/server_list.h diff --git a/libmemcached-1.0/stats.h b/include/libmemcached-1.0/stats.h similarity index 100% rename from libmemcached-1.0/stats.h rename to include/libmemcached-1.0/stats.h diff --git a/libmemcached-1.0/storage.h b/include/libmemcached-1.0/storage.h similarity index 100% rename from libmemcached-1.0/storage.h rename to include/libmemcached-1.0/storage.h diff --git a/libmemcached-1.0/strerror.h b/include/libmemcached-1.0/strerror.h similarity index 100% rename from libmemcached-1.0/strerror.h rename to include/libmemcached-1.0/strerror.h diff --git a/libmemcached-1.0/struct/allocator.h b/include/libmemcached-1.0/struct/allocator.h similarity index 100% rename from libmemcached-1.0/struct/allocator.h rename to include/libmemcached-1.0/struct/allocator.h diff --git a/libmemcached-1.0/struct/analysis.h b/include/libmemcached-1.0/struct/analysis.h similarity index 100% rename from libmemcached-1.0/struct/analysis.h rename to include/libmemcached-1.0/struct/analysis.h diff --git a/libmemcached-1.0/struct/callback.h b/include/libmemcached-1.0/struct/callback.h similarity index 100% rename from libmemcached-1.0/struct/callback.h rename to include/libmemcached-1.0/struct/callback.h diff --git a/libmemcached-1.0/struct/memcached.h b/include/libmemcached-1.0/struct/memcached.h similarity index 100% rename from libmemcached-1.0/struct/memcached.h rename to include/libmemcached-1.0/struct/memcached.h diff --git a/libmemcached-1.0/struct/result.h b/include/libmemcached-1.0/struct/result.h similarity index 100% rename from libmemcached-1.0/struct/result.h rename to include/libmemcached-1.0/struct/result.h diff --git a/libmemcached-1.0/struct/sasl.h b/include/libmemcached-1.0/struct/sasl.h similarity index 100% rename from libmemcached-1.0/struct/sasl.h rename to include/libmemcached-1.0/struct/sasl.h diff --git a/libmemcached-1.0/struct/server.h b/include/libmemcached-1.0/struct/server.h similarity index 100% rename from libmemcached-1.0/struct/server.h rename to include/libmemcached-1.0/struct/server.h diff --git a/libmemcached-1.0/struct/stat.h b/include/libmemcached-1.0/struct/stat.h similarity index 100% rename from libmemcached-1.0/struct/stat.h rename to include/libmemcached-1.0/struct/stat.h diff --git a/libmemcached-1.0/struct/string.h b/include/libmemcached-1.0/struct/string.h similarity index 100% rename from libmemcached-1.0/struct/string.h rename to include/libmemcached-1.0/struct/string.h diff --git a/libmemcached-1.0/t/c_sasl_test.c b/include/libmemcached-1.0/t/c_sasl_test.c similarity index 100% rename from libmemcached-1.0/t/c_sasl_test.c rename to include/libmemcached-1.0/t/c_sasl_test.c diff --git a/libmemcached-1.0/t/c_test.c b/include/libmemcached-1.0/t/c_test.c similarity index 100% rename from libmemcached-1.0/t/c_test.c rename to include/libmemcached-1.0/t/c_test.c diff --git a/libmemcached-1.0/t/cc_test.cc b/include/libmemcached-1.0/t/cc_test.cc similarity index 100% rename from libmemcached-1.0/t/cc_test.cc rename to include/libmemcached-1.0/t/cc_test.cc diff --git a/libmemcached-1.0/touch.h b/include/libmemcached-1.0/touch.h similarity index 100% rename from libmemcached-1.0/touch.h rename to include/libmemcached-1.0/touch.h diff --git a/libmemcached-1.0/triggers.h b/include/libmemcached-1.0/triggers.h similarity index 100% rename from libmemcached-1.0/triggers.h rename to include/libmemcached-1.0/triggers.h diff --git a/libmemcached-1.0/types.h b/include/libmemcached-1.0/types.h similarity index 100% rename from libmemcached-1.0/types.h rename to include/libmemcached-1.0/types.h diff --git a/libmemcached-1.0/types/behavior.h b/include/libmemcached-1.0/types/behavior.h similarity index 100% rename from libmemcached-1.0/types/behavior.h rename to include/libmemcached-1.0/types/behavior.h diff --git a/libmemcached-1.0/types/callback.h b/include/libmemcached-1.0/types/callback.h similarity index 100% rename from libmemcached-1.0/types/callback.h rename to include/libmemcached-1.0/types/callback.h diff --git a/libmemcached-1.0/types/connection.h b/include/libmemcached-1.0/types/connection.h similarity index 100% rename from libmemcached-1.0/types/connection.h rename to include/libmemcached-1.0/types/connection.h diff --git a/libmemcached-1.0/types/hash.h b/include/libmemcached-1.0/types/hash.h similarity index 100% rename from libmemcached-1.0/types/hash.h rename to include/libmemcached-1.0/types/hash.h diff --git a/libmemcached-1.0/types/return.h b/include/libmemcached-1.0/types/return.h similarity index 100% rename from libmemcached-1.0/types/return.h rename to include/libmemcached-1.0/types/return.h diff --git a/libmemcached-1.0/types/server_distribution.h b/include/libmemcached-1.0/types/server_distribution.h similarity index 100% rename from libmemcached-1.0/types/server_distribution.h rename to include/libmemcached-1.0/types/server_distribution.h diff --git a/libmemcached-1.0/verbosity.h b/include/libmemcached-1.0/verbosity.h similarity index 100% rename from libmemcached-1.0/verbosity.h rename to include/libmemcached-1.0/verbosity.h diff --git a/libmemcached-1.0/version.h b/include/libmemcached-1.0/version.h similarity index 100% rename from libmemcached-1.0/version.h rename to include/libmemcached-1.0/version.h diff --git a/libmemcached-1.0/visibility.h b/include/libmemcached-1.0/visibility.h similarity index 100% rename from libmemcached-1.0/visibility.h rename to include/libmemcached-1.0/visibility.h diff --git a/libmemcachedprotocol-0.0/binary.h b/include/libmemcachedprotocol-0.0/binary.h similarity index 100% rename from libmemcachedprotocol-0.0/binary.h rename to include/libmemcachedprotocol-0.0/binary.h diff --git a/libmemcachedprotocol-0.0/callback.h b/include/libmemcachedprotocol-0.0/callback.h similarity index 100% rename from libmemcachedprotocol-0.0/callback.h rename to include/libmemcachedprotocol-0.0/callback.h diff --git a/libmemcachedprotocol-0.0/handler.h b/include/libmemcachedprotocol-0.0/handler.h similarity index 100% rename from libmemcachedprotocol-0.0/handler.h rename to include/libmemcachedprotocol-0.0/handler.h diff --git a/libmemcached/memcached/vbucket.h b/include/libmemcachedprotocol-0.0/vbucket.h similarity index 100% rename from libmemcached/memcached/vbucket.h rename to include/libmemcachedprotocol-0.0/vbucket.h diff --git a/libmemcachedutil-1.0/CMakeLists.txt b/include/libmemcachedutil-1.0/CMakeLists.txt similarity index 100% rename from libmemcachedutil-1.0/CMakeLists.txt rename to include/libmemcachedutil-1.0/CMakeLists.txt diff --git a/libmemcachedutil-1.0/flush.h b/include/libmemcachedutil-1.0/flush.h similarity index 100% rename from libmemcachedutil-1.0/flush.h rename to include/libmemcachedutil-1.0/flush.h diff --git a/libmemcachedutil-1.0/ostream.hpp b/include/libmemcachedutil-1.0/ostream.hpp similarity index 100% rename from libmemcachedutil-1.0/ostream.hpp rename to include/libmemcachedutil-1.0/ostream.hpp diff --git a/libmemcachedutil-1.0/pid.h b/include/libmemcachedutil-1.0/pid.h similarity index 100% rename from libmemcachedutil-1.0/pid.h rename to include/libmemcachedutil-1.0/pid.h diff --git a/libmemcachedutil-1.0/ping.h b/include/libmemcachedutil-1.0/ping.h similarity index 100% rename from libmemcachedutil-1.0/ping.h rename to include/libmemcachedutil-1.0/ping.h diff --git a/libmemcachedutil-1.0/pool.h b/include/libmemcachedutil-1.0/pool.h similarity index 100% rename from libmemcachedutil-1.0/pool.h rename to include/libmemcachedutil-1.0/pool.h diff --git a/libmemcachedutil-1.0/util.h b/include/libmemcachedutil-1.0/util.h similarity index 100% rename from libmemcachedutil-1.0/util.h rename to include/libmemcachedutil-1.0/util.h diff --git a/libmemcachedutil-1.0/version.h b/include/libmemcachedutil-1.0/version.h similarity index 100% rename from libmemcachedutil-1.0/version.h rename to include/libmemcachedutil-1.0/version.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..10699115 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,9 @@ + +add_subdirectory(bin) +add_subdirectory(libhashkit) +add_subdirectory(libmemcached) +add_subdirectory(libmemcachedutil) + +if(BUILD_TESTING) + add_subdirectory(libtest) +endif() diff --git a/clients/CMakeLists.txt b/src/bin/CMakeLists.txt similarity index 89% rename from clients/CMakeLists.txt rename to src/bin/CMakeLists.txt index b7815db1..8cd42462 100644 --- a/clients/CMakeLists.txt +++ b/src/bin/CMakeLists.txt @@ -1,7 +1,6 @@ add_library(libclient_utilities STATIC utilities.cc generator.cc execute.cc) add_library(client_utilities ALIAS libclient_utilities) -target_include_directories(libclient_utilities PRIVATE ..) target_link_libraries(libclient_utilities libmemcachedinternal) foreach(CLIENT IN LISTS CLIENTS) @@ -28,7 +27,7 @@ if(ENABLE_MEMASLAP) if(LIBEVENT AND HAVE_C_STDATOMIC) add_executable(memaslap memaslap.c ms_conn.c ms_setting.c ms_sigsegv.c ms_stats.c ms_task.c ms_thread.c) - target_include_directories(memaslap PRIVATE .. ${LIBEVENT_INCLUDEDIR}) + target_include_directories(memaslap PRIVATE ${LIBEVENT_INCLUDEDIR}) target_link_libraries(memaslap libclient_utilities ${LIBEVENT_LIBRARIES} Threads::Threads) install(TARGETS memaslap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/clients/client_options.h b/src/bin/client_options.h similarity index 100% rename from clients/client_options.h rename to src/bin/client_options.h diff --git a/clients/execute.cc b/src/bin/execute.cc similarity index 99% rename from clients/execute.cc rename to src/bin/execute.cc index 47319778..37148404 100644 --- a/clients/execute.cc +++ b/src/bin/execute.cc @@ -16,7 +16,7 @@ */ #include -#include "clients/execute.h" +#include "execute.h" unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of) { diff --git a/clients/execute.h b/src/bin/execute.h similarity index 95% rename from clients/execute.h rename to src/bin/execute.h index ebf92f62..e66b0c5a 100644 --- a/clients/execute.h +++ b/src/bin/execute.h @@ -14,7 +14,7 @@ #include #include -#include "clients/generator.h" +#include "generator.h" #ifdef __cplusplus extern "C" { diff --git a/clients/generator.cc b/src/bin/generator.cc similarity index 98% rename from clients/generator.cc rename to src/bin/generator.cc index 1f40daed..e418fd7e 100644 --- a/clients/generator.cc +++ b/src/bin/generator.cc @@ -20,7 +20,7 @@ #include #include -#include "clients/generator.h" +#include "generator.h" #define KEY_BYTES 20 diff --git a/clients/generator.h b/src/bin/generator.h similarity index 100% rename from clients/generator.h rename to src/bin/generator.h diff --git a/clients/memaslap.c b/src/bin/memaslap.c similarity index 100% rename from clients/memaslap.c rename to src/bin/memaslap.c diff --git a/clients/memcapable.cc b/src/bin/memcapable.cc similarity index 99% rename from clients/memcapable.cc rename to src/bin/memcapable.cc index c52b3c46..81e619f6 100644 --- a/clients/memcapable.cc +++ b/src/bin/memcapable.cc @@ -39,7 +39,7 @@ #include "libmemcached/socket.hpp" #include "libmemcachedprotocol-0.0/binary.h" #include "libmemcached/byteorder.h" -#include "clients/utilities.h" +#include "utilities.h" #include diff --git a/src/bin/memcapable.sh b/src/bin/memcapable.sh new file mode 100755 index 00000000..78fe1b4d --- /dev/null +++ b/src/bin/memcapable.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memcapable -vh localhost diff --git a/clients/memcat.cc b/src/bin/memcat.cc similarity index 100% rename from clients/memcat.cc rename to src/bin/memcat.cc diff --git a/src/bin/memcat.sh b/src/bin/memcat.sh new file mode 100755 index 00000000..fbdc2122 --- /dev/null +++ b/src/bin/memcat.sh @@ -0,0 +1,3 @@ +#!/bin/sh +src/bin/memcp.sh +src/bin/memcat --servers=localhost -v mem.testdata diff --git a/clients/memcp.cc b/src/bin/memcp.cc similarity index 100% rename from clients/memcp.cc rename to src/bin/memcp.cc diff --git a/src/bin/memcp.sh b/src/bin/memcp.sh new file mode 100755 index 00000000..c173d46a --- /dev/null +++ b/src/bin/memcp.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memcp -v --servers localhost mem.testdata diff --git a/clients/memdump.cc b/src/bin/memdump.cc similarity index 100% rename from clients/memdump.cc rename to src/bin/memdump.cc diff --git a/src/bin/memdump.sh b/src/bin/memdump.sh new file mode 100755 index 00000000..ee71c555 --- /dev/null +++ b/src/bin/memdump.sh @@ -0,0 +1,2 @@ +#!/bin/bash +src/bin/memdump -v --servers localhost diff --git a/clients/memerror.cc b/src/bin/memerror.cc similarity index 100% rename from clients/memerror.cc rename to src/bin/memerror.cc diff --git a/src/bin/memerror.sh b/src/bin/memerror.sh new file mode 100755 index 00000000..70bf7cea --- /dev/null +++ b/src/bin/memerror.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memerror 0 1 2 3 diff --git a/clients/memexist.cc b/src/bin/memexist.cc similarity index 100% rename from clients/memexist.cc rename to src/bin/memexist.cc diff --git a/src/bin/memexist.sh b/src/bin/memexist.sh new file mode 100755 index 00000000..9cbaf75b --- /dev/null +++ b/src/bin/memexist.sh @@ -0,0 +1,3 @@ +#!/bin/bash +src/bin/memcp.sh +src/bin/memexist -v --servers localhost mem.testdata diff --git a/clients/memflush.cc b/src/bin/memflush.cc similarity index 100% rename from clients/memflush.cc rename to src/bin/memflush.cc diff --git a/src/bin/memflush.sh b/src/bin/memflush.sh new file mode 100755 index 00000000..770d8442 --- /dev/null +++ b/src/bin/memflush.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memflush -v --servers localhost diff --git a/clients/memparse.cc b/src/bin/memparse.cc similarity index 100% rename from clients/memparse.cc rename to src/bin/memparse.cc diff --git a/src/bin/memparse.sh b/src/bin/memparse.sh new file mode 100755 index 00000000..8d7433e5 --- /dev/null +++ b/src/bin/memparse.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memparse --server=localhost:11211/?1 --server=127.0.0.1:11211/?2 diff --git a/clients/memping.cc b/src/bin/memping.cc similarity index 100% rename from clients/memping.cc rename to src/bin/memping.cc diff --git a/src/bin/memping.sh b/src/bin/memping.sh new file mode 100755 index 00000000..09f09b8c --- /dev/null +++ b/src/bin/memping.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memping -v --servers localhost diff --git a/clients/memrm.cc b/src/bin/memrm.cc similarity index 100% rename from clients/memrm.cc rename to src/bin/memrm.cc diff --git a/src/bin/memrm.sh b/src/bin/memrm.sh new file mode 100755 index 00000000..40b63d96 --- /dev/null +++ b/src/bin/memrm.sh @@ -0,0 +1,3 @@ +#!/bin/sh +src/bin/memcp.sh +src/bin/memrm -v --servers localhost mem.testdata diff --git a/clients/memslap.cc b/src/bin/memslap.cc similarity index 100% rename from clients/memslap.cc rename to src/bin/memslap.cc diff --git a/src/bin/memslap.sh b/src/bin/memslap.sh new file mode 100755 index 00000000..e80cc111 --- /dev/null +++ b/src/bin/memslap.sh @@ -0,0 +1,2 @@ +#!/bin/sh +src/bin/memslap -v --servers localhost diff --git a/clients/memstat.cc b/src/bin/memstat.cc similarity index 100% rename from clients/memstat.cc rename to src/bin/memstat.cc diff --git a/src/bin/memstat.sh b/src/bin/memstat.sh new file mode 100755 index 00000000..cadaf362 --- /dev/null +++ b/src/bin/memstat.sh @@ -0,0 +1,2 @@ +#!/bin/bash +src/bin/memstat -v --servers localhost diff --git a/clients/memtouch.cc b/src/bin/memtouch.cc similarity index 100% rename from clients/memtouch.cc rename to src/bin/memtouch.cc diff --git a/src/bin/memtouch.sh b/src/bin/memtouch.sh new file mode 100755 index 00000000..a082eb52 --- /dev/null +++ b/src/bin/memtouch.sh @@ -0,0 +1,3 @@ +#!/bin/sh +src/bin/memcp.sh +src/bin/memtouch -v --servers localhost mem.testdata diff --git a/clients/ms_atomic.h b/src/bin/ms_atomic.h similarity index 100% rename from clients/ms_atomic.h rename to src/bin/ms_atomic.h diff --git a/clients/ms_conn.c b/src/bin/ms_conn.c similarity index 100% rename from clients/ms_conn.c rename to src/bin/ms_conn.c diff --git a/clients/ms_conn.h b/src/bin/ms_conn.h similarity index 100% rename from clients/ms_conn.h rename to src/bin/ms_conn.h diff --git a/clients/ms_memslap.h b/src/bin/ms_memslap.h similarity index 100% rename from clients/ms_memslap.h rename to src/bin/ms_memslap.h diff --git a/clients/ms_setting.c b/src/bin/ms_setting.c similarity index 100% rename from clients/ms_setting.c rename to src/bin/ms_setting.c diff --git a/clients/ms_setting.h b/src/bin/ms_setting.h similarity index 100% rename from clients/ms_setting.h rename to src/bin/ms_setting.h diff --git a/clients/ms_sigsegv.c b/src/bin/ms_sigsegv.c similarity index 100% rename from clients/ms_sigsegv.c rename to src/bin/ms_sigsegv.c diff --git a/clients/ms_sigsegv.h b/src/bin/ms_sigsegv.h similarity index 100% rename from clients/ms_sigsegv.h rename to src/bin/ms_sigsegv.h diff --git a/clients/ms_stats.c b/src/bin/ms_stats.c similarity index 100% rename from clients/ms_stats.c rename to src/bin/ms_stats.c diff --git a/clients/ms_stats.h b/src/bin/ms_stats.h similarity index 100% rename from clients/ms_stats.h rename to src/bin/ms_stats.h diff --git a/clients/ms_task.c b/src/bin/ms_task.c similarity index 100% rename from clients/ms_task.c rename to src/bin/ms_task.c diff --git a/clients/ms_task.h b/src/bin/ms_task.h similarity index 100% rename from clients/ms_task.h rename to src/bin/ms_task.h diff --git a/clients/ms_thread.c b/src/bin/ms_thread.c similarity index 100% rename from clients/ms_thread.c rename to src/bin/ms_thread.c diff --git a/clients/ms_thread.h b/src/bin/ms_thread.h similarity index 100% rename from clients/ms_thread.h rename to src/bin/ms_thread.h diff --git a/clients/utilities.cc b/src/bin/utilities.cc similarity index 99% rename from clients/utilities.cc rename to src/bin/utilities.cc index 268b7904..fe8f501c 100644 --- a/clients/utilities.cc +++ b/src/bin/utilities.cc @@ -11,7 +11,7 @@ */ #include -#include +#include "utilities.h" #include #include diff --git a/clients/utilities.h b/src/bin/utilities.h similarity index 97% rename from clients/utilities.h rename to src/bin/utilities.h index a9f199d5..e275fa85 100644 --- a/clients/utilities.h +++ b/src/bin/utilities.h @@ -13,7 +13,7 @@ #include #include -#include "clients/client_options.h" +#include "client_options.h" #if defined(HAVE_SYS_TIME_H) # include diff --git a/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt similarity index 96% rename from libhashkit/CMakeLists.txt rename to src/libhashkit/CMakeLists.txt index 646ffd3f..08c48351 100644 --- a/libhashkit/CMakeLists.txt +++ b/src/libhashkit/CMakeLists.txt @@ -32,7 +32,6 @@ add_library(libhashkit SHARED ) add_library(hashkit ALIAS libhashkit) set_target_properties(libhashkit PROPERTIES LIBRARY_OUTPUT_NAME hashkit) -target_include_directories(libhashkit PRIVATE ..) target_compile_options(libhashkit PRIVATE -DBUILDING_HASHKIT) configure_file(hashkitcon.h.in hashkitcon.h @ONLY) diff --git a/libhashkit/aes.cc b/src/libhashkit/aes.cc similarity index 100% rename from libhashkit/aes.cc rename to src/libhashkit/aes.cc diff --git a/libhashkit/aes.h b/src/libhashkit/aes.h similarity index 100% rename from libhashkit/aes.h rename to src/libhashkit/aes.h diff --git a/libhashkit/algorithm.cc b/src/libhashkit/algorithm.cc similarity index 100% rename from libhashkit/algorithm.cc rename to src/libhashkit/algorithm.cc diff --git a/libhashkit/algorithm.h b/src/libhashkit/algorithm.h similarity index 100% rename from libhashkit/algorithm.h rename to src/libhashkit/algorithm.h diff --git a/libhashkit/behavior.cc b/src/libhashkit/behavior.cc similarity index 100% rename from libhashkit/behavior.cc rename to src/libhashkit/behavior.cc diff --git a/libhashkit/common.h b/src/libhashkit/common.h similarity index 100% rename from libhashkit/common.h rename to src/libhashkit/common.h diff --git a/libhashkit/crc32.cc b/src/libhashkit/crc32.cc similarity index 100% rename from libhashkit/crc32.cc rename to src/libhashkit/crc32.cc diff --git a/libhashkit/digest.cc b/src/libhashkit/digest.cc similarity index 100% rename from libhashkit/digest.cc rename to src/libhashkit/digest.cc diff --git a/libhashkit/encrypt.cc b/src/libhashkit/encrypt.cc similarity index 100% rename from libhashkit/encrypt.cc rename to src/libhashkit/encrypt.cc diff --git a/libhashkit/fnv_32.cc b/src/libhashkit/fnv_32.cc similarity index 100% rename from libhashkit/fnv_32.cc rename to src/libhashkit/fnv_32.cc diff --git a/libhashkit/fnv_64.cc b/src/libhashkit/fnv_64.cc similarity index 100% rename from libhashkit/fnv_64.cc rename to src/libhashkit/fnv_64.cc diff --git a/libhashkit/function.cc b/src/libhashkit/function.cc similarity index 100% rename from libhashkit/function.cc rename to src/libhashkit/function.cc diff --git a/libhashkit/has.cc b/src/libhashkit/has.cc similarity index 100% rename from libhashkit/has.cc rename to src/libhashkit/has.cc diff --git a/libhashkit/hashkit.cc b/src/libhashkit/hashkit.cc similarity index 100% rename from libhashkit/hashkit.cc rename to src/libhashkit/hashkit.cc diff --git a/libhashkit/hashkit.h b/src/libhashkit/hashkit.h similarity index 100% rename from libhashkit/hashkit.h rename to src/libhashkit/hashkit.h diff --git a/libhashkit/hashkitcon.h.in b/src/libhashkit/hashkitcon.h.in similarity index 100% rename from libhashkit/hashkitcon.h.in rename to src/libhashkit/hashkitcon.h.in diff --git a/libhashkit/hsieh.cc b/src/libhashkit/hsieh.cc similarity index 100% rename from libhashkit/hsieh.cc rename to src/libhashkit/hsieh.cc diff --git a/libhashkit/is.h b/src/libhashkit/is.h similarity index 100% rename from libhashkit/is.h rename to src/libhashkit/is.h diff --git a/libhashkit/jenkins.cc b/src/libhashkit/jenkins.cc similarity index 100% rename from libhashkit/jenkins.cc rename to src/libhashkit/jenkins.cc diff --git a/libhashkit/ketama.cc b/src/libhashkit/ketama.cc similarity index 100% rename from libhashkit/ketama.cc rename to src/libhashkit/ketama.cc diff --git a/libhashkit/md5.cc b/src/libhashkit/md5.cc similarity index 100% rename from libhashkit/md5.cc rename to src/libhashkit/md5.cc diff --git a/libhashkit/murmur.cc b/src/libhashkit/murmur.cc similarity index 100% rename from libhashkit/murmur.cc rename to src/libhashkit/murmur.cc diff --git a/libhashkit/murmur3.cc b/src/libhashkit/murmur3.cc similarity index 100% rename from libhashkit/murmur3.cc rename to src/libhashkit/murmur3.cc diff --git a/libhashkit/murmur3.h b/src/libhashkit/murmur3.h similarity index 100% rename from libhashkit/murmur3.h rename to src/libhashkit/murmur3.h diff --git a/libhashkit/murmur3_api.cc b/src/libhashkit/murmur3_api.cc similarity index 100% rename from libhashkit/murmur3_api.cc rename to src/libhashkit/murmur3_api.cc diff --git a/libhashkit/nohsieh.cc b/src/libhashkit/nohsieh.cc similarity index 100% rename from libhashkit/nohsieh.cc rename to src/libhashkit/nohsieh.cc diff --git a/libhashkit/one_at_a_time.cc b/src/libhashkit/one_at_a_time.cc similarity index 100% rename from libhashkit/one_at_a_time.cc rename to src/libhashkit/one_at_a_time.cc diff --git a/libhashkit/rijndael.cc b/src/libhashkit/rijndael.cc similarity index 100% rename from libhashkit/rijndael.cc rename to src/libhashkit/rijndael.cc diff --git a/libhashkit/rijndael.hpp b/src/libhashkit/rijndael.hpp similarity index 100% rename from libhashkit/rijndael.hpp rename to src/libhashkit/rijndael.hpp diff --git a/libhashkit/str_algorithm.cc b/src/libhashkit/str_algorithm.cc similarity index 100% rename from libhashkit/str_algorithm.cc rename to src/libhashkit/str_algorithm.cc diff --git a/libhashkit/strerror.cc b/src/libhashkit/strerror.cc similarity index 100% rename from libhashkit/strerror.cc rename to src/libhashkit/strerror.cc diff --git a/libhashkit/string.cc b/src/libhashkit/string.cc similarity index 100% rename from libhashkit/string.cc rename to src/libhashkit/string.cc diff --git a/libhashkit/string.h b/src/libhashkit/string.h similarity index 100% rename from libhashkit/string.h rename to src/libhashkit/string.h diff --git a/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt similarity index 94% rename from libmemcached/CMakeLists.txt rename to src/libmemcached/CMakeLists.txt index 2f8b0183..e39c2f69 100644 --- a/libmemcached/CMakeLists.txt +++ b/src/libmemcached/CMakeLists.txt @@ -68,7 +68,7 @@ add_library(libmemcached SHARED add_library(memcached ALIAS libmemcached) set_target_properties(libmemcached PROPERTIES LIBRARY_OUTPUT_NAME memcached) target_link_libraries(libmemcached libhashkit Threads::Threads ${LIBSASL_LIBRARIES} ${CMAKE_DL_LIBS}) -target_include_directories(libmemcached PRIVATE .. ${LIBSASL_INCLUDEDIR}) +target_include_directories(libmemcached PRIVATE ${LIBSASL_INCLUDEDIR}) target_compile_definitions(libmemcached PRIVATE -DBUILDING_LIBMEMCACHED) set_target_properties(libmemcached PROPERTIES SOVERSION ${LIBMEMCACHED_SO_VERSION}) @@ -92,5 +92,5 @@ add_library(libmemcachedinternal STATIC add_library(memcachedinternal ALIAS libmemcachedinternal) set_target_properties(libmemcachedinternal PROPERTIES LIBRARY_OUTPUT_NAME memcachedinternal) target_link_libraries(libmemcachedinternal libhashkit Threads::Threads ${LIBSASL_LIBRARIES} ${CMAKE_DL_LIBS}) -target_include_directories(libmemcachedinternal PRIVATE .. ${LIBSASL_INCLUDEDIR}) +target_include_directories(libmemcachedinternal PRIVATE ${LIBSASL_INCLUDEDIR}) target_compile_definitions(libmemcachedinternal PRIVATE -DBUILDING_LIBMEMCACHEDINTERNAL) diff --git a/libmemcached/allocators.cc b/src/libmemcached/allocators.cc similarity index 100% rename from libmemcached/allocators.cc rename to src/libmemcached/allocators.cc diff --git a/libmemcached/allocators.hpp b/src/libmemcached/allocators.hpp similarity index 100% rename from libmemcached/allocators.hpp rename to src/libmemcached/allocators.hpp diff --git a/libmemcached/analyze.cc b/src/libmemcached/analyze.cc similarity index 100% rename from libmemcached/analyze.cc rename to src/libmemcached/analyze.cc diff --git a/libmemcached/array.c b/src/libmemcached/array.c similarity index 100% rename from libmemcached/array.c rename to src/libmemcached/array.c diff --git a/libmemcached/array.h b/src/libmemcached/array.h similarity index 100% rename from libmemcached/array.h rename to src/libmemcached/array.h diff --git a/libmemcached/assert.hpp b/src/libmemcached/assert.hpp similarity index 100% rename from libmemcached/assert.hpp rename to src/libmemcached/assert.hpp diff --git a/libmemcached/auto.cc b/src/libmemcached/auto.cc similarity index 100% rename from libmemcached/auto.cc rename to src/libmemcached/auto.cc diff --git a/libmemcached/backtrace.cc b/src/libmemcached/backtrace.cc similarity index 100% rename from libmemcached/backtrace.cc rename to src/libmemcached/backtrace.cc diff --git a/libmemcached/backtrace.hpp b/src/libmemcached/backtrace.hpp similarity index 100% rename from libmemcached/backtrace.hpp rename to src/libmemcached/backtrace.hpp diff --git a/libmemcached/behavior.cc b/src/libmemcached/behavior.cc similarity index 100% rename from libmemcached/behavior.cc rename to src/libmemcached/behavior.cc diff --git a/libmemcached/behavior.hpp b/src/libmemcached/behavior.hpp similarity index 100% rename from libmemcached/behavior.hpp rename to src/libmemcached/behavior.hpp diff --git a/libmemcached/byteorder.cc b/src/libmemcached/byteorder.cc similarity index 100% rename from libmemcached/byteorder.cc rename to src/libmemcached/byteorder.cc diff --git a/libmemcached/byteorder.h b/src/libmemcached/byteorder.h similarity index 100% rename from libmemcached/byteorder.h rename to src/libmemcached/byteorder.h diff --git a/libmemcached/callback.cc b/src/libmemcached/callback.cc similarity index 100% rename from libmemcached/callback.cc rename to src/libmemcached/callback.cc diff --git a/libmemcached/callback.h b/src/libmemcached/callback.h similarity index 100% rename from libmemcached/callback.h rename to src/libmemcached/callback.h diff --git a/libmemcached/common.h b/src/libmemcached/common.h similarity index 100% rename from libmemcached/common.h rename to src/libmemcached/common.h diff --git a/libmemcached/connect.cc b/src/libmemcached/connect.cc similarity index 100% rename from libmemcached/connect.cc rename to src/libmemcached/connect.cc diff --git a/libmemcached/connect.hpp b/src/libmemcached/connect.hpp similarity index 100% rename from libmemcached/connect.hpp rename to src/libmemcached/connect.hpp diff --git a/libmemcached/continuum.hpp b/src/libmemcached/continuum.hpp similarity index 100% rename from libmemcached/continuum.hpp rename to src/libmemcached/continuum.hpp diff --git a/libmemcached/csl/common.h b/src/libmemcached/csl/common.h similarity index 100% rename from libmemcached/csl/common.h rename to src/libmemcached/csl/common.h diff --git a/libmemcached/csl/context.cc b/src/libmemcached/csl/context.cc similarity index 100% rename from libmemcached/csl/context.cc rename to src/libmemcached/csl/context.cc diff --git a/libmemcached/csl/context.h b/src/libmemcached/csl/context.h similarity index 100% rename from libmemcached/csl/context.h rename to src/libmemcached/csl/context.h diff --git a/libmemcached/csl/parser.yy b/src/libmemcached/csl/parser.yy similarity index 100% rename from libmemcached/csl/parser.yy rename to src/libmemcached/csl/parser.yy diff --git a/libmemcached/csl/scanner.l b/src/libmemcached/csl/scanner.l similarity index 100% rename from libmemcached/csl/scanner.l rename to src/libmemcached/csl/scanner.l diff --git a/libmemcached/csl/server.h b/src/libmemcached/csl/server.h similarity index 100% rename from libmemcached/csl/server.h rename to src/libmemcached/csl/server.h diff --git a/libmemcached/csl/symbol.h b/src/libmemcached/csl/symbol.h similarity index 100% rename from libmemcached/csl/symbol.h rename to src/libmemcached/csl/symbol.h diff --git a/libmemcached/delete.cc b/src/libmemcached/delete.cc similarity index 100% rename from libmemcached/delete.cc rename to src/libmemcached/delete.cc diff --git a/libmemcached/do.cc b/src/libmemcached/do.cc similarity index 100% rename from libmemcached/do.cc rename to src/libmemcached/do.cc diff --git a/libmemcached/do.hpp b/src/libmemcached/do.hpp similarity index 100% rename from libmemcached/do.hpp rename to src/libmemcached/do.hpp diff --git a/libmemcached/dump.cc b/src/libmemcached/dump.cc similarity index 100% rename from libmemcached/dump.cc rename to src/libmemcached/dump.cc diff --git a/libmemcached/encoding_key.cc b/src/libmemcached/encoding_key.cc similarity index 100% rename from libmemcached/encoding_key.cc rename to src/libmemcached/encoding_key.cc diff --git a/libmemcached/encoding_key.h b/src/libmemcached/encoding_key.h similarity index 100% rename from libmemcached/encoding_key.h rename to src/libmemcached/encoding_key.h diff --git a/libmemcached/error.cc b/src/libmemcached/error.cc similarity index 100% rename from libmemcached/error.cc rename to src/libmemcached/error.cc diff --git a/libmemcached/error.hpp b/src/libmemcached/error.hpp similarity index 100% rename from libmemcached/error.hpp rename to src/libmemcached/error.hpp diff --git a/libmemcached/exist.cc b/src/libmemcached/exist.cc similarity index 100% rename from libmemcached/exist.cc rename to src/libmemcached/exist.cc diff --git a/libmemcached/fetch.cc b/src/libmemcached/fetch.cc similarity index 100% rename from libmemcached/fetch.cc rename to src/libmemcached/fetch.cc diff --git a/libmemcached/flag.cc b/src/libmemcached/flag.cc similarity index 100% rename from libmemcached/flag.cc rename to src/libmemcached/flag.cc diff --git a/libmemcached/flag.hpp b/src/libmemcached/flag.hpp similarity index 100% rename from libmemcached/flag.hpp rename to src/libmemcached/flag.hpp diff --git a/libmemcached/flush.cc b/src/libmemcached/flush.cc similarity index 100% rename from libmemcached/flush.cc rename to src/libmemcached/flush.cc diff --git a/libmemcached/flush_buffers.cc b/src/libmemcached/flush_buffers.cc similarity index 100% rename from libmemcached/flush_buffers.cc rename to src/libmemcached/flush_buffers.cc diff --git a/libmemcached/get.cc b/src/libmemcached/get.cc similarity index 100% rename from libmemcached/get.cc rename to src/libmemcached/get.cc diff --git a/libmemcached/hash.cc b/src/libmemcached/hash.cc similarity index 100% rename from libmemcached/hash.cc rename to src/libmemcached/hash.cc diff --git a/libmemcached/hash.hpp b/src/libmemcached/hash.hpp similarity index 100% rename from libmemcached/hash.hpp rename to src/libmemcached/hash.hpp diff --git a/libmemcached/hosts.cc b/src/libmemcached/hosts.cc similarity index 100% rename from libmemcached/hosts.cc rename to src/libmemcached/hosts.cc diff --git a/libmemcached/initialize_query.cc b/src/libmemcached/initialize_query.cc similarity index 100% rename from libmemcached/initialize_query.cc rename to src/libmemcached/initialize_query.cc diff --git a/libmemcached/initialize_query.h b/src/libmemcached/initialize_query.h similarity index 100% rename from libmemcached/initialize_query.h rename to src/libmemcached/initialize_query.h diff --git a/libmemcached/instance.cc b/src/libmemcached/instance.cc similarity index 100% rename from libmemcached/instance.cc rename to src/libmemcached/instance.cc diff --git a/libmemcached/instance.hpp b/src/libmemcached/instance.hpp similarity index 100% rename from libmemcached/instance.hpp rename to src/libmemcached/instance.hpp diff --git a/libmemcached/internal.h b/src/libmemcached/internal.h similarity index 100% rename from libmemcached/internal.h rename to src/libmemcached/internal.h diff --git a/libmemcached/io.cc b/src/libmemcached/io.cc similarity index 100% rename from libmemcached/io.cc rename to src/libmemcached/io.cc diff --git a/libmemcached/io.h b/src/libmemcached/io.h similarity index 100% rename from libmemcached/io.h rename to src/libmemcached/io.h diff --git a/libmemcached/io.hpp b/src/libmemcached/io.hpp similarity index 100% rename from libmemcached/io.hpp rename to src/libmemcached/io.hpp diff --git a/libmemcached/is.h b/src/libmemcached/is.h similarity index 100% rename from libmemcached/is.h rename to src/libmemcached/is.h diff --git a/libmemcached/key.cc b/src/libmemcached/key.cc similarity index 100% rename from libmemcached/key.cc rename to src/libmemcached/key.cc diff --git a/libmemcached/key.hpp b/src/libmemcached/key.hpp similarity index 100% rename from libmemcached/key.hpp rename to src/libmemcached/key.hpp diff --git a/libmemcached/libmemcached_probes.d b/src/libmemcached/libmemcached_probes.d similarity index 100% rename from libmemcached/libmemcached_probes.d rename to src/libmemcached/libmemcached_probes.d diff --git a/libmemcached/libmemcached_probes.h b/src/libmemcached/libmemcached_probes.h similarity index 100% rename from libmemcached/libmemcached_probes.h rename to src/libmemcached/libmemcached_probes.h diff --git a/libmemcached/memcached.cc b/src/libmemcached/memcached.cc similarity index 100% rename from libmemcached/memcached.cc rename to src/libmemcached/memcached.cc diff --git a/libmemcached/memcached.h b/src/libmemcached/memcached.h similarity index 100% rename from libmemcached/memcached.h rename to src/libmemcached/memcached.h diff --git a/libmemcached/memcached.hpp b/src/libmemcached/memcached.hpp similarity index 100% rename from libmemcached/memcached.hpp rename to src/libmemcached/memcached.hpp diff --git a/libmemcached/memcached/README.txt b/src/libmemcached/memcached/README.txt similarity index 100% rename from libmemcached/memcached/README.txt rename to src/libmemcached/memcached/README.txt diff --git a/libmemcached/memcached/protocol_binary.h b/src/libmemcached/memcached/protocol_binary.h similarity index 100% rename from libmemcached/memcached/protocol_binary.h rename to src/libmemcached/memcached/protocol_binary.h diff --git a/libmemcachedprotocol-0.0/vbucket.h b/src/libmemcached/memcached/vbucket.h similarity index 100% rename from libmemcachedprotocol-0.0/vbucket.h rename to src/libmemcached/memcached/vbucket.h diff --git a/libmemcached/memory.h b/src/libmemcached/memory.h similarity index 100% rename from libmemcached/memory.h rename to src/libmemcached/memory.h diff --git a/libmemcached/namespace.cc b/src/libmemcached/namespace.cc similarity index 100% rename from libmemcached/namespace.cc rename to src/libmemcached/namespace.cc diff --git a/libmemcached/namespace.h b/src/libmemcached/namespace.h similarity index 100% rename from libmemcached/namespace.h rename to src/libmemcached/namespace.h diff --git a/libmemcached/options.cc b/src/libmemcached/options.cc similarity index 100% rename from libmemcached/options.cc rename to src/libmemcached/options.cc diff --git a/libmemcached/options.hpp b/src/libmemcached/options.hpp similarity index 100% rename from libmemcached/options.hpp rename to src/libmemcached/options.hpp diff --git a/libmemcached/parse.cc b/src/libmemcached/parse.cc similarity index 100% rename from libmemcached/parse.cc rename to src/libmemcached/parse.cc diff --git a/libmemcached/poll.cc b/src/libmemcached/poll.cc similarity index 100% rename from libmemcached/poll.cc rename to src/libmemcached/poll.cc diff --git a/libmemcached/poll.h b/src/libmemcached/poll.h similarity index 100% rename from libmemcached/poll.h rename to src/libmemcached/poll.h diff --git a/libmemcached/purge.cc b/src/libmemcached/purge.cc similarity index 100% rename from libmemcached/purge.cc rename to src/libmemcached/purge.cc diff --git a/libmemcached/quit.cc b/src/libmemcached/quit.cc similarity index 100% rename from libmemcached/quit.cc rename to src/libmemcached/quit.cc diff --git a/libmemcached/quit.hpp b/src/libmemcached/quit.hpp similarity index 100% rename from libmemcached/quit.hpp rename to src/libmemcached/quit.hpp diff --git a/libmemcached/response.cc b/src/libmemcached/response.cc similarity index 100% rename from libmemcached/response.cc rename to src/libmemcached/response.cc diff --git a/libmemcached/response.h b/src/libmemcached/response.h similarity index 100% rename from libmemcached/response.h rename to src/libmemcached/response.h diff --git a/libmemcached/result.cc b/src/libmemcached/result.cc similarity index 100% rename from libmemcached/result.cc rename to src/libmemcached/result.cc diff --git a/libmemcached/result.h b/src/libmemcached/result.h similarity index 100% rename from libmemcached/result.h rename to src/libmemcached/result.h diff --git a/libmemcached/sasl.cc b/src/libmemcached/sasl.cc similarity index 100% rename from libmemcached/sasl.cc rename to src/libmemcached/sasl.cc diff --git a/libmemcached/sasl.hpp b/src/libmemcached/sasl.hpp similarity index 100% rename from libmemcached/sasl.hpp rename to src/libmemcached/sasl.hpp diff --git a/libmemcached/server.cc b/src/libmemcached/server.cc similarity index 100% rename from libmemcached/server.cc rename to src/libmemcached/server.cc diff --git a/libmemcached/server.hpp b/src/libmemcached/server.hpp similarity index 100% rename from libmemcached/server.hpp rename to src/libmemcached/server.hpp diff --git a/libmemcached/server_instance.h b/src/libmemcached/server_instance.h similarity index 100% rename from libmemcached/server_instance.h rename to src/libmemcached/server_instance.h diff --git a/libmemcached/server_list.cc b/src/libmemcached/server_list.cc similarity index 100% rename from libmemcached/server_list.cc rename to src/libmemcached/server_list.cc diff --git a/libmemcached/server_list.hpp b/src/libmemcached/server_list.hpp similarity index 100% rename from libmemcached/server_list.hpp rename to src/libmemcached/server_list.hpp diff --git a/libmemcached/socket.hpp b/src/libmemcached/socket.hpp similarity index 100% rename from libmemcached/socket.hpp rename to src/libmemcached/socket.hpp diff --git a/libmemcached/stats.cc b/src/libmemcached/stats.cc similarity index 100% rename from libmemcached/stats.cc rename to src/libmemcached/stats.cc diff --git a/libmemcached/storage.cc b/src/libmemcached/storage.cc similarity index 100% rename from libmemcached/storage.cc rename to src/libmemcached/storage.cc diff --git a/libmemcached/strerror.cc b/src/libmemcached/strerror.cc similarity index 100% rename from libmemcached/strerror.cc rename to src/libmemcached/strerror.cc diff --git a/libmemcached/string.cc b/src/libmemcached/string.cc similarity index 100% rename from libmemcached/string.cc rename to src/libmemcached/string.cc diff --git a/libmemcached/string.hpp b/src/libmemcached/string.hpp similarity index 100% rename from libmemcached/string.hpp rename to src/libmemcached/string.hpp diff --git a/libmemcached/touch.cc b/src/libmemcached/touch.cc similarity index 100% rename from libmemcached/touch.cc rename to src/libmemcached/touch.cc diff --git a/libmemcached/udp.cc b/src/libmemcached/udp.cc similarity index 100% rename from libmemcached/udp.cc rename to src/libmemcached/udp.cc diff --git a/libmemcached/udp.hpp b/src/libmemcached/udp.hpp similarity index 100% rename from libmemcached/udp.hpp rename to src/libmemcached/udp.hpp diff --git a/libmemcached/util.h b/src/libmemcached/util.h similarity index 100% rename from libmemcached/util.h rename to src/libmemcached/util.h diff --git a/libmemcached/util/Makefile.am b/src/libmemcached/util/Makefile.am similarity index 100% rename from libmemcached/util/Makefile.am rename to src/libmemcached/util/Makefile.am diff --git a/libmemcached/verbosity.cc b/src/libmemcached/verbosity.cc similarity index 100% rename from libmemcached/verbosity.cc rename to src/libmemcached/verbosity.cc diff --git a/libmemcached/version.cc b/src/libmemcached/version.cc similarity index 100% rename from libmemcached/version.cc rename to src/libmemcached/version.cc diff --git a/libmemcached/version.hpp b/src/libmemcached/version.hpp similarity index 100% rename from libmemcached/version.hpp rename to src/libmemcached/version.hpp diff --git a/libmemcached/virtual_bucket.c b/src/libmemcached/virtual_bucket.c similarity index 100% rename from libmemcached/virtual_bucket.c rename to src/libmemcached/virtual_bucket.c diff --git a/libmemcached/virtual_bucket.h b/src/libmemcached/virtual_bucket.h similarity index 100% rename from libmemcached/virtual_bucket.h rename to src/libmemcached/virtual_bucket.h diff --git a/libmemcached/watchpoint.h b/src/libmemcached/watchpoint.h similarity index 100% rename from libmemcached/watchpoint.h rename to src/libmemcached/watchpoint.h diff --git a/libmemcached/windows.hpp b/src/libmemcached/windows.hpp similarity index 100% rename from libmemcached/windows.hpp rename to src/libmemcached/windows.hpp diff --git a/libmemcachedprotocol/ascii_handler.c b/src/libmemcachedprotocol/ascii_handler.c similarity index 100% rename from libmemcachedprotocol/ascii_handler.c rename to src/libmemcachedprotocol/ascii_handler.c diff --git a/libmemcachedprotocol/ascii_handler.h b/src/libmemcachedprotocol/ascii_handler.h similarity index 100% rename from libmemcachedprotocol/ascii_handler.h rename to src/libmemcachedprotocol/ascii_handler.h diff --git a/libmemcachedprotocol/binary_handler.c b/src/libmemcachedprotocol/binary_handler.c similarity index 100% rename from libmemcachedprotocol/binary_handler.c rename to src/libmemcachedprotocol/binary_handler.c diff --git a/libmemcachedprotocol/binary_handler.h b/src/libmemcachedprotocol/binary_handler.h similarity index 100% rename from libmemcachedprotocol/binary_handler.h rename to src/libmemcachedprotocol/binary_handler.h diff --git a/libmemcachedprotocol/cache.c b/src/libmemcachedprotocol/cache.c similarity index 100% rename from libmemcachedprotocol/cache.c rename to src/libmemcachedprotocol/cache.c diff --git a/libmemcachedprotocol/cache.h b/src/libmemcachedprotocol/cache.h similarity index 100% rename from libmemcachedprotocol/cache.h rename to src/libmemcachedprotocol/cache.h diff --git a/libmemcachedprotocol/common.h b/src/libmemcachedprotocol/common.h similarity index 100% rename from libmemcachedprotocol/common.h rename to src/libmemcachedprotocol/common.h diff --git a/libmemcachedprotocol/handler.c b/src/libmemcachedprotocol/handler.c similarity index 100% rename from libmemcachedprotocol/handler.c rename to src/libmemcachedprotocol/handler.c diff --git a/libmemcachedprotocol/pedantic.c b/src/libmemcachedprotocol/pedantic.c similarity index 100% rename from libmemcachedprotocol/pedantic.c rename to src/libmemcachedprotocol/pedantic.c diff --git a/libmemcachedutil/CMakeLists.txt b/src/libmemcachedutil/CMakeLists.txt similarity index 93% rename from libmemcachedutil/CMakeLists.txt rename to src/libmemcachedutil/CMakeLists.txt index 6ef3a756..f09b2a2d 100644 --- a/libmemcachedutil/CMakeLists.txt +++ b/src/libmemcachedutil/CMakeLists.txt @@ -9,7 +9,6 @@ add_library(libmemcachedutil SHARED ) add_library(memcachedutil ALIAS libmemcachedutil) set_target_properties(libmemcachedutil PROPERTIES LIBRARY_OUTPUT_NAME memcachedutil) -target_include_directories(libmemcachedutil PRIVATE ..) target_compile_definitions(libmemcachedutil PRIVATE -DBUILDING_LIBMEMCACHED) target_link_libraries(libmemcachedutil libmemcached Threads::Threads) diff --git a/libmemcachedutil/common.h b/src/libmemcachedutil/common.h similarity index 100% rename from libmemcachedutil/common.h rename to src/libmemcachedutil/common.h diff --git a/libmemcachedutil/flush.cc b/src/libmemcachedutil/flush.cc similarity index 100% rename from libmemcachedutil/flush.cc rename to src/libmemcachedutil/flush.cc diff --git a/libmemcachedutil/pid.cc b/src/libmemcachedutil/pid.cc similarity index 100% rename from libmemcachedutil/pid.cc rename to src/libmemcachedutil/pid.cc diff --git a/libmemcachedutil/ping.cc b/src/libmemcachedutil/ping.cc similarity index 100% rename from libmemcachedutil/ping.cc rename to src/libmemcachedutil/ping.cc diff --git a/libmemcachedutil/pool.cc b/src/libmemcachedutil/pool.cc similarity index 100% rename from libmemcachedutil/pool.cc rename to src/libmemcachedutil/pool.cc diff --git a/libmemcachedutil/version.cc b/src/libmemcachedutil/version.cc similarity index 100% rename from libmemcachedutil/version.cc rename to src/libmemcachedutil/version.cc diff --git a/libtest/CMakeLists.txt b/src/libtest/CMakeLists.txt similarity index 89% rename from libtest/CMakeLists.txt rename to src/libtest/CMakeLists.txt index 492465fd..794d7bd0 100644 --- a/libtest/CMakeLists.txt +++ b/src/libtest/CMakeLists.txt @@ -58,17 +58,13 @@ target_compile_definitions(libtest PRIVATE HAVE_MEMCACHED_BINARY=1 ) target_link_libraries(libtest PRIVATE Threads::Threads ${CMAKE_DL_LIBS}) -target_include_directories(libtest PRIVATE ..) add_executable(wait wait.cc dream.cc) -target_include_directories(wait PRIVATE ..) add_executable(core_count core_count.cc cpu.cc) -target_include_directories(core_count PRIVATE ..) add_executable(backtrace backtrace_test.cc ../libmemcached/backtrace.cc) target_link_libraries(backtrace PRIVATE ${CMAKE_DL_LIBS}) -target_include_directories(backtrace PRIVATE ..) configure_file(yatlcon.h.in yatlcon.h @ONLY) configure_file(version.h.in version.h @ONLY) diff --git a/libtest/alarm.cc b/src/libtest/alarm.cc similarity index 100% rename from libtest/alarm.cc rename to src/libtest/alarm.cc diff --git a/libtest/alarm.h b/src/libtest/alarm.h similarity index 100% rename from libtest/alarm.h rename to src/libtest/alarm.h diff --git a/libtest/backtrace_test.cc b/src/libtest/backtrace_test.cc similarity index 100% rename from libtest/backtrace_test.cc rename to src/libtest/backtrace_test.cc diff --git a/libtest/binaries.cc b/src/libtest/binaries.cc similarity index 100% rename from libtest/binaries.cc rename to src/libtest/binaries.cc diff --git a/libtest/binaries.h b/src/libtest/binaries.h similarity index 100% rename from libtest/binaries.h rename to src/libtest/binaries.h diff --git a/libtest/blobslap_worker.cc b/src/libtest/blobslap_worker.cc similarity index 100% rename from libtest/blobslap_worker.cc rename to src/libtest/blobslap_worker.cc diff --git a/libtest/blobslap_worker.h b/src/libtest/blobslap_worker.h similarity index 100% rename from libtest/blobslap_worker.h rename to src/libtest/blobslap_worker.h diff --git a/libtest/callbacks.h b/src/libtest/callbacks.h similarity index 100% rename from libtest/callbacks.h rename to src/libtest/callbacks.h diff --git a/libtest/client.cc b/src/libtest/client.cc similarity index 100% rename from libtest/client.cc rename to src/libtest/client.cc diff --git a/libtest/client.hpp b/src/libtest/client.hpp similarity index 100% rename from libtest/client.hpp rename to src/libtest/client.hpp diff --git a/libtest/cmdline.cc b/src/libtest/cmdline.cc similarity index 100% rename from libtest/cmdline.cc rename to src/libtest/cmdline.cc diff --git a/libtest/cmdline.h b/src/libtest/cmdline.h similarity index 100% rename from libtest/cmdline.h rename to src/libtest/cmdline.h diff --git a/libtest/collection.cc b/src/libtest/collection.cc similarity index 100% rename from libtest/collection.cc rename to src/libtest/collection.cc diff --git a/libtest/collection.h b/src/libtest/collection.h similarity index 100% rename from libtest/collection.h rename to src/libtest/collection.h diff --git a/libtest/common.h b/src/libtest/common.h similarity index 100% rename from libtest/common.h rename to src/libtest/common.h diff --git a/libtest/comparison.cc b/src/libtest/comparison.cc similarity index 100% rename from libtest/comparison.cc rename to src/libtest/comparison.cc diff --git a/libtest/comparison.hpp b/src/libtest/comparison.hpp similarity index 100% rename from libtest/comparison.hpp rename to src/libtest/comparison.hpp diff --git a/libtest/core.cc b/src/libtest/core.cc similarity index 100% rename from libtest/core.cc rename to src/libtest/core.cc diff --git a/libtest/core.h b/src/libtest/core.h similarity index 100% rename from libtest/core.h rename to src/libtest/core.h diff --git a/libtest/core_count.cc b/src/libtest/core_count.cc similarity index 100% rename from libtest/core_count.cc rename to src/libtest/core_count.cc diff --git a/libtest/cpu.cc b/src/libtest/cpu.cc similarity index 100% rename from libtest/cpu.cc rename to src/libtest/cpu.cc diff --git a/libtest/cpu.hpp b/src/libtest/cpu.hpp similarity index 100% rename from libtest/cpu.hpp rename to src/libtest/cpu.hpp diff --git a/libtest/dns.cc b/src/libtest/dns.cc similarity index 100% rename from libtest/dns.cc rename to src/libtest/dns.cc diff --git a/libtest/dns.hpp b/src/libtest/dns.hpp similarity index 100% rename from libtest/dns.hpp rename to src/libtest/dns.hpp diff --git a/libtest/dream.cc b/src/libtest/dream.cc similarity index 100% rename from libtest/dream.cc rename to src/libtest/dream.cc diff --git a/libtest/dream.h b/src/libtest/dream.h similarity index 100% rename from libtest/dream.h rename to src/libtest/dream.h diff --git a/libtest/drizzled.cc b/src/libtest/drizzled.cc similarity index 100% rename from libtest/drizzled.cc rename to src/libtest/drizzled.cc diff --git a/libtest/drizzled.h b/src/libtest/drizzled.h similarity index 100% rename from libtest/drizzled.h rename to src/libtest/drizzled.h diff --git a/libtest/error.h b/src/libtest/error.h similarity index 100% rename from libtest/error.h rename to src/libtest/error.h diff --git a/libtest/exception.cc b/src/libtest/exception.cc similarity index 100% rename from libtest/exception.cc rename to src/libtest/exception.cc diff --git a/libtest/exception.hpp b/src/libtest/exception.hpp similarity index 100% rename from libtest/exception.hpp rename to src/libtest/exception.hpp diff --git a/libtest/exception/disconnected.hpp b/src/libtest/exception/disconnected.hpp similarity index 100% rename from libtest/exception/disconnected.hpp rename to src/libtest/exception/disconnected.hpp diff --git a/libtest/exception/fatal.cc b/src/libtest/exception/fatal.cc similarity index 100% rename from libtest/exception/fatal.cc rename to src/libtest/exception/fatal.cc diff --git a/libtest/exception/fatal.hpp b/src/libtest/exception/fatal.hpp similarity index 100% rename from libtest/exception/fatal.hpp rename to src/libtest/exception/fatal.hpp diff --git a/libtest/failed.cc b/src/libtest/failed.cc similarity index 100% rename from libtest/failed.cc rename to src/libtest/failed.cc diff --git a/libtest/formatter.cc b/src/libtest/formatter.cc similarity index 100% rename from libtest/formatter.cc rename to src/libtest/formatter.cc diff --git a/libtest/formatter.hpp b/src/libtest/formatter.hpp similarity index 100% rename from libtest/formatter.hpp rename to src/libtest/formatter.hpp diff --git a/libtest/framework.cc b/src/libtest/framework.cc similarity index 100% rename from libtest/framework.cc rename to src/libtest/framework.cc diff --git a/libtest/framework.h b/src/libtest/framework.h similarity index 100% rename from libtest/framework.h rename to src/libtest/framework.h diff --git a/libtest/gearmand.cc b/src/libtest/gearmand.cc similarity index 100% rename from libtest/gearmand.cc rename to src/libtest/gearmand.cc diff --git a/libtest/gearmand.h b/src/libtest/gearmand.h similarity index 100% rename from libtest/gearmand.h rename to src/libtest/gearmand.h diff --git a/libtest/get.h b/src/libtest/get.h similarity index 100% rename from libtest/get.h rename to src/libtest/get.h diff --git a/libtest/has.cc b/src/libtest/has.cc similarity index 100% rename from libtest/has.cc rename to src/libtest/has.cc diff --git a/libtest/has.hpp b/src/libtest/has.hpp similarity index 100% rename from libtest/has.hpp rename to src/libtest/has.hpp diff --git a/libtest/http.cc b/src/libtest/http.cc similarity index 100% rename from libtest/http.cc rename to src/libtest/http.cc diff --git a/libtest/http.hpp b/src/libtest/http.hpp similarity index 100% rename from libtest/http.hpp rename to src/libtest/http.hpp diff --git a/libtest/is_local.cc b/src/libtest/is_local.cc similarity index 100% rename from libtest/is_local.cc rename to src/libtest/is_local.cc diff --git a/libtest/is_local.hpp b/src/libtest/is_local.hpp similarity index 100% rename from libtest/is_local.hpp rename to src/libtest/is_local.hpp diff --git a/libtest/is_pid.hpp b/src/libtest/is_pid.hpp similarity index 100% rename from libtest/is_pid.hpp rename to src/libtest/is_pid.hpp diff --git a/libtest/killpid.cc b/src/libtest/killpid.cc similarity index 100% rename from libtest/killpid.cc rename to src/libtest/killpid.cc diff --git a/libtest/killpid.h b/src/libtest/killpid.h similarity index 100% rename from libtest/killpid.h rename to src/libtest/killpid.h diff --git a/libtest/libtool.cc b/src/libtest/libtool.cc similarity index 100% rename from libtest/libtool.cc rename to src/libtest/libtool.cc diff --git a/libtest/libtool.hpp b/src/libtest/libtool.hpp similarity index 100% rename from libtest/libtool.hpp rename to src/libtest/libtool.hpp diff --git a/libtest/lite.h b/src/libtest/lite.h similarity index 100% rename from libtest/lite.h rename to src/libtest/lite.h diff --git a/libtest/main.cc b/src/libtest/main.cc similarity index 100% rename from libtest/main.cc rename to src/libtest/main.cc diff --git a/libtest/memcached.cc b/src/libtest/memcached.cc similarity index 100% rename from libtest/memcached.cc rename to src/libtest/memcached.cc diff --git a/libtest/memcached.h b/src/libtest/memcached.h similarity index 100% rename from libtest/memcached.h rename to src/libtest/memcached.h diff --git a/libtest/memcached.hpp b/src/libtest/memcached.hpp similarity index 100% rename from libtest/memcached.hpp rename to src/libtest/memcached.hpp diff --git a/libtest/poll_error.hpp b/src/libtest/poll_error.hpp similarity index 100% rename from libtest/poll_error.hpp rename to src/libtest/poll_error.hpp diff --git a/libtest/port.cc b/src/libtest/port.cc similarity index 100% rename from libtest/port.cc rename to src/libtest/port.cc diff --git a/libtest/port.h b/src/libtest/port.h similarity index 100% rename from libtest/port.h rename to src/libtest/port.h diff --git a/libtest/result.cc b/src/libtest/result.cc similarity index 100% rename from libtest/result.cc rename to src/libtest/result.cc diff --git a/libtest/result.hpp b/src/libtest/result.hpp similarity index 100% rename from libtest/result.hpp rename to src/libtest/result.hpp diff --git a/libtest/result/base.hpp b/src/libtest/result/base.hpp similarity index 100% rename from libtest/result/base.hpp rename to src/libtest/result/base.hpp diff --git a/libtest/result/fail.hpp b/src/libtest/result/fail.hpp similarity index 100% rename from libtest/result/fail.hpp rename to src/libtest/result/fail.hpp diff --git a/libtest/result/skip.hpp b/src/libtest/result/skip.hpp similarity index 100% rename from libtest/result/skip.hpp rename to src/libtest/result/skip.hpp diff --git a/libtest/result/success.hpp b/src/libtest/result/success.hpp similarity index 100% rename from libtest/result/success.hpp rename to src/libtest/result/success.hpp diff --git a/libtest/run-ci.gdb b/src/libtest/run-ci.gdb similarity index 100% rename from libtest/run-ci.gdb rename to src/libtest/run-ci.gdb diff --git a/libtest/run.gdb b/src/libtest/run.gdb similarity index 100% rename from libtest/run.gdb rename to src/libtest/run.gdb diff --git a/libtest/runner.cc b/src/libtest/runner.cc similarity index 100% rename from libtest/runner.cc rename to src/libtest/runner.cc diff --git a/libtest/runner.h b/src/libtest/runner.h similarity index 100% rename from libtest/runner.h rename to src/libtest/runner.h diff --git a/libtest/server.cc b/src/libtest/server.cc similarity index 100% rename from libtest/server.cc rename to src/libtest/server.cc diff --git a/libtest/server.h b/src/libtest/server.h similarity index 100% rename from libtest/server.h rename to src/libtest/server.h diff --git a/libtest/server_container.cc b/src/libtest/server_container.cc similarity index 100% rename from libtest/server_container.cc rename to src/libtest/server_container.cc diff --git a/libtest/server_container.h b/src/libtest/server_container.h similarity index 100% rename from libtest/server_container.h rename to src/libtest/server_container.h diff --git a/libtest/signal.cc b/src/libtest/signal.cc similarity index 100% rename from libtest/signal.cc rename to src/libtest/signal.cc diff --git a/libtest/signal.h b/src/libtest/signal.h similarity index 100% rename from libtest/signal.h rename to src/libtest/signal.h diff --git a/libtest/skiptest.cc b/src/libtest/skiptest.cc similarity index 100% rename from libtest/skiptest.cc rename to src/libtest/skiptest.cc diff --git a/libtest/socket.cc b/src/libtest/socket.cc similarity index 100% rename from libtest/socket.cc rename to src/libtest/socket.cc diff --git a/libtest/socket.hpp b/src/libtest/socket.hpp similarity index 100% rename from libtest/socket.hpp rename to src/libtest/socket.hpp diff --git a/libtest/stream.h b/src/libtest/stream.h similarity index 100% rename from libtest/stream.h rename to src/libtest/stream.h diff --git a/libtest/strerror.cc b/src/libtest/strerror.cc similarity index 100% rename from libtest/strerror.cc rename to src/libtest/strerror.cc diff --git a/libtest/strerror.h b/src/libtest/strerror.h similarity index 100% rename from libtest/strerror.h rename to src/libtest/strerror.h diff --git a/libtest/string.hpp b/src/libtest/string.hpp similarity index 100% rename from libtest/string.hpp rename to src/libtest/string.hpp diff --git a/libtest/test.h b/src/libtest/test.h similarity index 100% rename from libtest/test.h rename to src/libtest/test.h diff --git a/libtest/test.hpp b/src/libtest/test.hpp similarity index 100% rename from libtest/test.hpp rename to src/libtest/test.hpp diff --git a/libtest/thread.hpp b/src/libtest/thread.hpp similarity index 100% rename from libtest/thread.hpp rename to src/libtest/thread.hpp diff --git a/libtest/timer.cc b/src/libtest/timer.cc similarity index 100% rename from libtest/timer.cc rename to src/libtest/timer.cc diff --git a/libtest/timer.hpp b/src/libtest/timer.hpp similarity index 100% rename from libtest/timer.hpp rename to src/libtest/timer.hpp diff --git a/libtest/tmpfile.cc b/src/libtest/tmpfile.cc similarity index 100% rename from libtest/tmpfile.cc rename to src/libtest/tmpfile.cc diff --git a/libtest/tmpfile.hpp b/src/libtest/tmpfile.hpp similarity index 100% rename from libtest/tmpfile.hpp rename to src/libtest/tmpfile.hpp diff --git a/libtest/unittest.cc b/src/libtest/unittest.cc similarity index 100% rename from libtest/unittest.cc rename to src/libtest/unittest.cc diff --git a/libtest/valgrind.h b/src/libtest/valgrind.h similarity index 100% rename from libtest/valgrind.h rename to src/libtest/valgrind.h diff --git a/libtest/vchar.cc b/src/libtest/vchar.cc similarity index 100% rename from libtest/vchar.cc rename to src/libtest/vchar.cc diff --git a/libtest/vchar.hpp b/src/libtest/vchar.hpp similarity index 100% rename from libtest/vchar.hpp rename to src/libtest/vchar.hpp diff --git a/libtest/version.h.in b/src/libtest/version.h.in similarity index 100% rename from libtest/version.h.in rename to src/libtest/version.h.in diff --git a/libtest/visibility.h b/src/libtest/visibility.h similarity index 100% rename from libtest/visibility.h rename to src/libtest/visibility.h diff --git a/libtest/wait.cc b/src/libtest/wait.cc similarity index 100% rename from libtest/wait.cc rename to src/libtest/wait.cc diff --git a/libtest/wait.h b/src/libtest/wait.h similarity index 100% rename from libtest/wait.h rename to src/libtest/wait.h diff --git a/libtest/yatl.h b/src/libtest/yatl.h similarity index 100% rename from libtest/yatl.h rename to src/libtest/yatl.h diff --git a/libtest/yatlcon.h.in b/src/libtest/yatlcon.h.in similarity index 100% rename from libtest/yatlcon.h.in rename to src/libtest/yatlcon.h.in diff --git a/mem_config.h.in b/src/mem_config.h.in similarity index 100% rename from mem_config.h.in rename to src/mem_config.h.in diff --git a/util/daemon.cc b/src/util/daemon.cc similarity index 100% rename from util/daemon.cc rename to src/util/daemon.cc diff --git a/util/daemon.hpp b/src/util/daemon.hpp similarity index 100% rename from util/daemon.hpp rename to src/util/daemon.hpp diff --git a/util/instance.cc b/src/util/instance.cc similarity index 100% rename from util/instance.cc rename to src/util/instance.cc diff --git a/util/instance.hpp b/src/util/instance.hpp similarity index 100% rename from util/instance.hpp rename to src/util/instance.hpp diff --git a/util/log.hpp b/src/util/log.hpp similarity index 100% rename from util/log.hpp rename to src/util/log.hpp diff --git a/util/logfile.cc b/src/util/logfile.cc similarity index 100% rename from util/logfile.cc rename to src/util/logfile.cc diff --git a/util/logfile.hpp b/src/util/logfile.hpp similarity index 100% rename from util/logfile.hpp rename to src/util/logfile.hpp diff --git a/util/operation.cc b/src/util/operation.cc similarity index 100% rename from util/operation.cc rename to src/util/operation.cc diff --git a/util/operation.hpp b/src/util/operation.hpp similarity index 100% rename from util/operation.hpp rename to src/util/operation.hpp diff --git a/util/pidfile.cc b/src/util/pidfile.cc similarity index 100% rename from util/pidfile.cc rename to src/util/pidfile.cc diff --git a/util/pidfile.hpp b/src/util/pidfile.hpp similarity index 100% rename from util/pidfile.hpp rename to src/util/pidfile.hpp diff --git a/util/signal.cc b/src/util/signal.cc similarity index 100% rename from util/signal.cc rename to src/util/signal.cc diff --git a/util/signal.hpp b/src/util/signal.hpp similarity index 100% rename from util/signal.hpp rename to src/util/signal.hpp diff --git a/util/string.hpp b/src/util/string.hpp similarity index 100% rename from util/string.hpp rename to src/util/string.hpp diff --git a/win32/wrappers.h b/src/win32/wrappers.h similarity index 100% rename from win32/wrappers.h rename to src/win32/wrappers.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f73dacdb..bfb02143 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,12 +3,10 @@ add_subdirectory(libmemcached-1.0) add_executable(cycle cycle.cc) target_link_libraries(cycle PRIVATE libtest Threads::Threads) -target_include_directories(cycle PRIVATE ..) add_test(cycle cycle) add_executable(parser parser.cc) target_link_libraries(parser PRIVATE libtest libmemcached) -target_include_directories(parser PRIVATE ..) add_test(parser parser) add_executable(failure failure.cc) @@ -33,12 +31,10 @@ endforeach() add_executable(testhashkit hashkit_functions.cc) target_link_libraries(testhashkit PRIVATE libtest libhashkit) -target_include_directories(testhashkit PRIVATE ..) add_test(testhashkit testhashkit) add_executable(hash_plus hash_plus.cc) target_link_libraries(hash_plus PRIVATE libtest libhashkit) -target_include_directories(hash_plus PRIVATE ..) add_test(testhashplus hash_plus) foreach(CLIENT IN LISTS CLIENTS) @@ -49,7 +45,6 @@ foreach(CLIENT IN LISTS CLIENTS) libmemcachedutil libtest ) - target_include_directories(test${CLIENT} PRIVATE ..) add_test(test${CLIENT} test${CLIENT}) endif() endforeach() diff --git a/tests/cli.am b/tests/cli.am deleted file mode 100644 index 1bb9a6a9..00000000 --- a/tests/cli.am +++ /dev/null @@ -1,133 +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 - - -tests_memcapable_SOURCES= tests/memcapable.cc -tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -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) -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) -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) -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) -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) -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) -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) -EXTRA_tests_memcat_DEPENDENCIES= clients/memcat -tests_memcat_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memcat -noinst_PROGRAMS+= tests/memcat - -tests_memping_SOURCES= tests/memping.cc -tests_memping_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -EXTRA_tests_memping_DEPENDENCIES= clients/memping -tests_memping_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memping -noinst_PROGRAMS+= tests/memping - -tests_memerror_SOURCES= tests/memerror.cc -tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -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) -EXTRA_tests_memslap_DEPENDENCIES= clients/memslap -tests_memslap_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memslap -noinst_PROGRAMS+= tests/memslap - -test-memslap: tests/memslap - @tests/memslap - -gdb-memslap: tests/memslap - @$(GDB_COMMAND) tests/memslap - -tests_memdump_SOURCES= tests/memdump.cc -tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -EXTRA_tests_memdump_DEPENDENCIES= clients/memdump -tests_memdump_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memdump -noinst_PROGRAMS+= tests/memdump - -test-memcp: tests/memcp - tests/memcp - -gdb-memcp: tests/memcp - @$(GDB_COMMAND) tests/memcp - -test-memstat: tests/memstat - tests/memstat - -test-memerror: tests/memerror - tests/memerror - -test-memtouch: tests/memtouch - tests/memtouch - -test-memping: tests/memping - tests/memping - -valgrind-memerror: tests/memerror - @$(VALGRIND_COMMAND) tests/memerror - -valgrind-memtouch: tests/memtouch - @$(VALGRIND_COMMAND) tests/memtouch - -test-memdump: tests/memdump - tests/memdump - -gdb-memdump: tests/memdump - @$(GDB_COMMAND) tests/memdump - -valgrind-memdump: tests/memdump - @$(VALGRIND_COMMAND) tests/memdump diff --git a/tests/libmemcached-1.0/CMakeLists.txt b/tests/libmemcached-1.0/CMakeLists.txt index 11e7b309..a92b50fe 100644 --- a/tests/libmemcached-1.0/CMakeLists.txt +++ b/tests/libmemcached-1.0/CMakeLists.txt @@ -1,7 +1,6 @@ add_executable(internals internals.cc string.cc) target_link_libraries(internals PRIVATE libtest libmemcachedinternal Threads::Threads) -target_include_directories(internals PRIVATE ../..) add_test(internals internals) add_executable(testsasl @@ -29,7 +28,6 @@ target_link_libraries(testsasl PRIVATE libtest Threads::Threads ) -target_include_directories(testsasl PRIVATE ../..) add_test(testsasl testsasl) add_executable(atomsmasher atomsmasher.cc) @@ -50,7 +48,6 @@ foreach(TEST IN ITEMS atomsmasher testplus) libmemcachedutil libtest ) - target_include_directories(${TEST} PRIVATE ../..) add_test(${TEST} ${TEST}) endforeach() @@ -95,6 +92,6 @@ foreach(TEST IN ITEMS testapp testsocket) Threads::Threads ${LIBUUID_LIBRARIES} ) - target_include_directories(${TEST} PRIVATE ../.. ${LIBUUID_INCLUDEDIR}) + target_include_directories(${TEST} PRIVATE ${LIBUUID_INCLUDEDIR}) add_test(${TEST} ${TEST}) endforeach() diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index 6dbd6d8c..3a87bd23 100644 --- a/tests/libmemcached-1.0/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/tests/libmemcached-1.0/generate.cc b/tests/libmemcached-1.0/generate.cc index 4ebaa98b..8af302b0 100644 --- a/tests/libmemcached-1.0/generate.cc +++ b/tests/libmemcached-1.0/generate.cc @@ -45,8 +45,8 @@ #include #include "tests/libmemcached-1.0/callback_counter.h" -#include "clients/generator.h" -#include "clients/execute.h" +#include "bin/generator.h" +#include "bin/execute.h" #include "tests/memc.hpp" diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index 8290e268..74921f70 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -68,7 +68,7 @@ #include -#include "clients/generator.h" +#include "bin/generator.h" #define SMALL_STRING_LEN 1024 diff --git a/tests/memcapable.cc b/tests/memcapable.cc index 4e7c957d..6a903439 100644 --- a/tests/memcapable.cc +++ b/tests/memcapable.cc @@ -119,7 +119,7 @@ static void *world_create(server_startup_st& servers, test_return_t&) void get_world(libtest::Framework* world) { - executable= "./clients/memcapable"; + executable= "./src/bin/memcapable"; world->collections(collection); world->create(world_create); } diff --git a/tests/memcat.cc b/tests/memcat.cc index 3b3b021f..1108b92f 100644 --- a/tests/memcat.cc +++ b/tests/memcat.cc @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("clients/memcat"); +static std::string executable("src/bin/memcat"); static test_return_t help_test(void *) { diff --git a/tests/memcp.cc b/tests/memcp.cc index 7ce5a493..547d568c 100644 --- a/tests/memcp.cc +++ b/tests/memcp.cc @@ -52,7 +52,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("./clients/memcp"); +static std::string executable("./src/bin/memcp"); static test_return_t help_test(void *) { diff --git a/tests/memdump.cc b/tests/memdump.cc index ab59c3ce..2d9937b3 100644 --- a/tests/memdump.cc +++ b/tests/memdump.cc @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("./clients/memdump"); +static std::string executable("./src/bin/memdump"); static test_return_t help_test(void *) { diff --git a/tests/memerror.cc b/tests/memerror.cc index 42334017..6920a169 100644 --- a/tests/memerror.cc +++ b/tests/memerror.cc @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("./clients/memerror"); +static std::string executable("./src/bin/memerror"); static test_return_t help_TEST(void *) { diff --git a/tests/memexist.cc b/tests/memexist.cc index 41a4648d..f2dd2f7a 100644 --- a/tests/memexist.cc +++ b/tests/memexist.cc @@ -51,7 +51,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("./clients/memexist"); +static std::string executable("./src/bin/memexist"); static test_return_t help_test(void *) { diff --git a/tests/memflush.cc b/tests/memflush.cc index c197b490..e7caf606 100644 --- a/tests/memflush.cc +++ b/tests/memflush.cc @@ -112,7 +112,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) void get_world(libtest::Framework* world) { - executable= "./clients/memflush"; + executable= "./src/bin/memflush"; world->collections(collection); world->create(world_create); } diff --git a/tests/memping.cc b/tests/memping.cc index af057def..75c7687f 100644 --- a/tests/memping.cc +++ b/tests/memping.cc @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("clients/memping"); +static std::string executable("src/bin/memping"); static test_return_t help_test(void *) { diff --git a/tests/memrm.cc b/tests/memrm.cc index 6955f1fa..bc342b1a 100644 --- a/tests/memrm.cc +++ b/tests/memrm.cc @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("./clients/memrm"); +static std::string executable("./src/bin/memrm"); static test_return_t quiet_test(void *) { diff --git a/tests/memslap.cc b/tests/memslap.cc index 8a1a5cba..352c43bb 100644 --- a/tests/memslap.cc +++ b/tests/memslap.cc @@ -185,7 +185,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) void get_world(libtest::Framework* world) { - executable= "./clients/memslap"; + executable= "./src/bin/memslap"; world->collections(collection); world->create(world_create); } diff --git a/tests/memstat.cc b/tests/memstat.cc index 7bbab363..168b5cd1 100644 --- a/tests/memstat.cc +++ b/tests/memstat.cc @@ -50,7 +50,7 @@ using namespace libtest; #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static std::string executable("./clients/memstat"); +static std::string executable("./src/bin/memstat"); static test_return_t help_test(void *) { diff --git a/tests/memtouch.cc b/tests/memtouch.cc index 761a7072..d7c798cd 100644 --- a/tests/memtouch.cc +++ b/tests/memtouch.cc @@ -156,7 +156,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) void get_world(libtest::Framework* world) { - executable= "./clients/memtouch"; + executable= "./src/bin/memtouch"; world->collections(collection); world->create(world_create); } -- 2.30.2