diff options
Diffstat (limited to 'src/test')
52 files changed, 225 insertions, 218 deletions
diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h index baed9de28e0..fae52a6e37a 100644 --- a/src/test/ObjectMap/KeyValueDBMemory.h +++ b/src/test/ObjectMap/KeyValueDBMemory.h @@ -5,9 +5,9 @@ #include <string> #include <tr1/memory> -#include "os/KeyValueDB.h" #include "include/buffer.h" #include "include/Context.h" +#include "os/KeyValueDB.h" using std::string; diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc index 82ac3a979f1..9c3a59454a7 100644 --- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc +++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc @@ -10,20 +10,17 @@ * License version 2.1, as published by the Free Software * Foundation. See file COPYING. */ -#include <tr1/memory> -#include <map> -#include <set> #include <deque> +#include <sys/types.h> #include <boost/scoped_ptr.hpp> +#include "gtest/gtest.h" -#include "test/ObjectMap/KeyValueDBMemory.h" -#include "os/KeyValueDB.h" +#include "common/ceph_argparse.h" #include "os/LevelDBStore.h" -#include <sys/types.h> #include "global/global_context.h" #include "global/global_init.h" -#include "common/ceph_argparse.h" -#include "gtest/gtest.h" + +#include "KeyValueDBMemory.h" using namespace std; diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc index c33d85d7c2d..a91c58d4872 100644 --- a/src/test/ObjectMap/test_object_map.cc +++ b/src/test/ObjectMap/test_object_map.cc @@ -1,23 +1,18 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -#include <tr1/memory> -#include <map> -#include <set> +#include <sys/types.h> #include <boost/scoped_ptr.hpp> +#include "stdlib.h" +#include <dirent.h> +#include "gtest/gtest.h" -#include "include/buffer.h" -#include "test/ObjectMap/KeyValueDBMemory.h" -#include "os/KeyValueDB.h" +#include "common/ceph_argparse.h" #include "os/DBObjectMap.h" #include "os/HashIndex.h" #include "os/LevelDBStore.h" -#include <sys/types.h> #include "global/global_context.h" #include "global/global_init.h" -#include "common/ceph_argparse.h" -#include <dirent.h> -#include "gtest/gtest.h" -#include "stdlib.h" +#include "KeyValueDBMemory.h" using namespace std; diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc index 5856a3275f6..0d5ff46f848 100644 --- a/src/test/TestSignalHandlers.cc +++ b/src/test/TestSignalHandlers.cc @@ -17,17 +17,18 @@ * * Test the Ceph signal handlers */ -#include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "global/debug.h" -#include "common/errno.h" -#include "common/config.h" - #include <errno.h> #include <iostream> #include <sstream> #include <string> +#include "common/ceph_argparse.h" +#include "common/errno.h" +#include "common/config.h" +#include "global/global_init.h" +#include "global/global_context.h" +#include "global/debug.h" + using std::string; // avoid compiler warning about dereferencing NULL pointer diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc index ffb4920d55b..57fd3298697 100644 --- a/src/test/TestTimers.cc +++ b/src/test/TestTimers.cc @@ -1,11 +1,11 @@ +#include <iostream> + #include "common/ceph_argparse.h" #include "common/Mutex.h" #include "common/Timer.h" #include "global/global_context.h" #include "global/global_init.h" -#include <iostream> - /* * TestTimers * diff --git a/src/test/admin_socket.cc b/src/test/admin_socket.cc index ff064955bed..17cbeefbe85 100644 --- a/src/test/admin_socket.cc +++ b/src/test/admin_socket.cc @@ -11,17 +11,16 @@ * Foundation. See file COPYING. * */ +#include <stdint.h> +#include <string.h> +#include <string> +#include <sys/un.h> #include "common/Mutex.h" #include "common/admin_socket.h" #include "common/admin_socket_client.h" -#include "common/ceph_context.h" -#include "test/unit.h" -#include <stdint.h> -#include <string.h> -#include <string> -#include <sys/un.h> +#include "unit.h" class AdminSocketTest { diff --git a/src/test/bench/bencher.h b/src/test/bench/bencher.h index 9f48835a5d3..817980b6aae 100644 --- a/src/test/bench/bencher.h +++ b/src/test/bench/bencher.h @@ -4,14 +4,16 @@ #define BENCHERH #include <utility> -#include "distribution.h" -#include "stat_collector.h" -#include "backend.h" #include <boost/scoped_ptr.hpp> + #include "common/Mutex.h" #include "common/Cond.h" #include "common/Thread.h" +#include "distribution.h" +#include "stat_collector.h" +#include "backend.h" + class OnWriteApplied; class OnWriteCommit; class OnReadComplete; diff --git a/src/test/bench/detailed_stat_collector.h b/src/test/bench/detailed_stat_collector.h index 60b7cab3cdc..6db8a4d9431 100644 --- a/src/test/bench/detailed_stat_collector.h +++ b/src/test/bench/detailed_stat_collector.h @@ -3,16 +3,18 @@ #ifndef DETAILEDSTATCOLLECTERH #define DETAILEDSTATCOLLECTERH -#include "stat_collector.h" -#include "common/Formatter.h" -#include <boost/scoped_ptr.hpp> -#include "common/Mutex.h" -#include "common/Cond.h" -#include "include/utime.h" #include <list> #include <map> #include <boost/tuple/tuple.hpp> #include <ostream> +#include <boost/scoped_ptr.hpp> + +#include "include/utime.h" +#include "common/Formatter.h" +#include "common/Mutex.h" +#include "common/Cond.h" + +#include "stat_collector.h" class DetailedStatCollector : public StatCollector { public: diff --git a/src/test/bench/dumb_backend.h b/src/test/bench/dumb_backend.h index bbf8650add9..ae89967c072 100644 --- a/src/test/bench/dumb_backend.h +++ b/src/test/bench/dumb_backend.h @@ -3,13 +3,13 @@ #ifndef DUMBBACKEND #define DUMBBACKEND -#include "backend.h" -#include "include/Context.h" -#include "os/ObjectStore.h" +#include <deque> + #include "common/WorkQueue.h" #include "common/Semaphore.h" +#include "os/ObjectStore.h" -#include <deque> +#include "backend.h" class DumbBackend : public Backend { const string path; diff --git a/src/test/bench/filestore_backend.cc b/src/test/bench/filestore_backend.cc index 2f6ee744872..f49cb255df2 100644 --- a/src/test/bench/filestore_backend.cc +++ b/src/test/bench/filestore_backend.cc @@ -1,9 +1,9 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -#include "filestore_backend.h" #include "global/global_context.h" #include "global/global_init.h" -#include "os/ObjectStore.h" + +#include "filestore_backend.h" struct C_DeleteTransWrapper : public Context { Context *c; diff --git a/src/test/bench/filestore_backend.h b/src/test/bench/filestore_backend.h index 71429933860..b778ca0c8cb 100644 --- a/src/test/bench/filestore_backend.h +++ b/src/test/bench/filestore_backend.h @@ -4,10 +4,10 @@ #define FILESTOREBACKENDH #include "common/Finisher.h" -#include "backend.h" -#include "include/Context.h" #include "os/ObjectStore.h" +#include "backend.h" + class FileStoreBackend : public Backend { ObjectStore *os; Finisher finisher; diff --git a/src/test/bench/rados_backend.h b/src/test/bench/rados_backend.h index 911d6c7d487..6c32c4e84e4 100644 --- a/src/test/bench/rados_backend.h +++ b/src/test/bench/rados_backend.h @@ -3,10 +3,10 @@ #ifndef RADOSBACKENDH #define RADOSBACKENDH -#include "backend.h" -#include "include/Context.h" #include "include/rados/librados.hpp" +#include "backend.h" + class RadosBackend : public Backend { librados::IoCtx *ioctx; public: diff --git a/src/test/bench/small_io_bench_dumb.cc b/src/test/bench/small_io_bench_dumb.cc index 46bdd0f75ca..5c265218fd0 100644 --- a/src/test/bench/small_io_bench_dumb.cc +++ b/src/test/bench/small_io_bench_dumb.cc @@ -15,14 +15,14 @@ #include <iostream> #include "common/Formatter.h" +#include "global/global_init.h" +#include "global/global_context.h" +#include "dumb_backend.h" #include "bencher.h" #include "rados_backend.h" #include "detailed_stat_collector.h" #include "distribution.h" -#include "global/global_init.h" -#include "os/FileStore.h" -#include "dumb_backend.h" namespace po = boost::program_options; using namespace std; diff --git a/src/test/bench/small_io_bench_fs.cc b/src/test/bench/small_io_bench_fs.cc index 6ce1394298c..0fd538b4a54 100644 --- a/src/test/bench/small_io_bench_fs.cc +++ b/src/test/bench/small_io_bench_fs.cc @@ -15,15 +15,16 @@ #include <iostream> #include "common/Formatter.h" +#include "common/perf_counters.h" +#include "os/FileStore.h" +#include "global/global_init.h" +#include "global/global_context.h" -#include "bencher.h" #include "rados_backend.h" +#include "filestore_backend.h" +#include "bencher.h" #include "detailed_stat_collector.h" #include "distribution.h" -#include "global/global_init.h" -#include "os/FileStore.h" -#include "filestore_backend.h" -#include "common/perf_counters.h" namespace po = boost::program_options; using namespace std; diff --git a/src/test/bench/tp_bench.cc b/src/test/bench/tp_bench.cc index cc503a6e11e..c14953286b6 100644 --- a/src/test/bench/tp_bench.cc +++ b/src/test/bench/tp_bench.cc @@ -15,16 +15,16 @@ #include <iostream> #include "common/Formatter.h" +#include "common/WorkQueue.h" +#include "common/Semaphore.h" +#include "common/Finisher.h" +#include "global/global_context.h" +#include "global/global_init.h" #include "bencher.h" #include "rados_backend.h" #include "detailed_stat_collector.h" #include "distribution.h" -#include "global/global_context.h" -#include "global/global_init.h" -#include "common/WorkQueue.h" -#include "common/Semaphore.h" -#include "common/Finisher.h" namespace po = boost::program_options; using namespace std; diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc index 38bbd077737..4e437a5de3f 100644 --- a/src/test/bench_log.cc +++ b/src/test/bench_log.cc @@ -2,6 +2,7 @@ // vim: ts=8 sw=2 smarttab #include "include/types.h" + #include "common/Thread.h" #include "common/Clock.h" #include "common/config.h" diff --git a/src/test/ceph_crypto.cc b/src/test/ceph_crypto.cc index 2c934fa848c..7b3a401f7dc 100644 --- a/src/test/ceph_crypto.cc +++ b/src/test/ceph_crypto.cc @@ -1,6 +1,6 @@ #include "common/ceph_crypto.h" -#include "test/unit.h" +#include "unit.h" class CryptoEnvironment: public ::testing::Environment { public: diff --git a/src/test/common/ObjectContents.h b/src/test/common/ObjectContents.h index 8ca410bd335..099d7b24c24 100644 --- a/src/test/common/ObjectContents.h +++ b/src/test/common/ObjectContents.h @@ -1,7 +1,8 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +#include <map> + #include "include/interval_set.h" #include "include/buffer.h" -#include <map> #ifndef COMMON_OBJECT_H #define COMMON_OBJECT_H diff --git a/src/test/crypto.cc b/src/test/crypto.cc index 80a5495001d..fd63a9c4112 100644 --- a/src/test/crypto.cc +++ b/src/test/crypto.cc @@ -1,11 +1,12 @@ +#include "include/types.h" + #include <errno.h> #include <time.h> -#include "include/types.h" -#include "auth/Crypto.h" #include "common/ceph_crypto.h" +#include "auth/Crypto.h" -#include "test/unit.h" +#include "unit.h" class CryptoEnvironment: public ::testing::Environment { public: diff --git a/src/test/daemon_config.cc b/src/test/daemon_config.cc index d643a6f4967..00bea8dae61 100644 --- a/src/test/daemon_config.cc +++ b/src/test/daemon_config.cc @@ -12,17 +12,18 @@ * */ -#include "common/ceph_argparse.h" -#include "common/config.h" -#include "include/cephfs/libcephfs.h" -#include "include/rados/librados.h" -#include "test/unit.h" - #include <errno.h> #include <sstream> #include <string> #include <string.h> +#include "include/cephfs/libcephfs.h" +#include "include/rados/librados.h" +#include "common/ceph_argparse.h" +#include "common/config.h" + +#include "unit.h" + using std::string; TEST(DaemonConfig, SimpleSet) { diff --git a/src/test/encoding/ceph_dencoder.cc b/src/test/encoding/ceph_dencoder.cc index 5955ef6d0ad..a2493748823 100644 --- a/src/test/encoding/ceph_dencoder.cc +++ b/src/test/encoding/ceph_dencoder.cc @@ -1,13 +1,16 @@ -#include <errno.h> #include "include/types.h" #include "ceph_ver.h" + +#include <errno.h> + #include "include/encoding.h" #include "include/ceph_features.h" +#include "include/assert.h" #include "common/ceph_argparse.h" #include "common/Formatter.h" #include "common/errno.h" #include "msg/Message.h" -#include "include/assert.h" +#include "global/global_context.h" #define TYPE(t) #define TYPEWITHSTRAYDATA(t) diff --git a/src/test/filestore/DeterministicOpSequence.cc b/src/test/filestore/DeterministicOpSequence.cc index 855ff7d47b3..ae8e92f1494 100644 --- a/src/test/filestore/DeterministicOpSequence.cc +++ b/src/test/filestore/DeterministicOpSequence.cc @@ -12,24 +12,21 @@ */ #include <stdio.h> #include <string.h> -#include <iostream> -#include <fstream> #include <time.h> #include <stdlib.h> #include <signal.h> #include <sstream> -#include "os/FileStore.h" +#include <boost/scoped_ptr.hpp> +#include <boost/lexical_cast.hpp> + +#include "include/assert.h" #include "common/ceph_argparse.h" +#include "common/config.h" #include "global/global_init.h" #include "global/debug.h" -#include <boost/scoped_ptr.hpp> -#include <boost/lexical_cast.hpp> #include "DeterministicOpSequence.h" -#include "common/config.h" -#include "include/assert.h" - #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "deterministic_seq " diff --git a/src/test/filestore/DeterministicOpSequence.h b/src/test/filestore/DeterministicOpSequence.h index 44e632ab5c0..b171c161e23 100644 --- a/src/test/filestore/DeterministicOpSequence.h +++ b/src/test/filestore/DeterministicOpSequence.h @@ -16,11 +16,12 @@ #include <iostream> #include <fstream> #include <set> -#include "os/FileStore.h" #include <boost/scoped_ptr.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> +#include "os/FileStore.h" + #include "TestFileStoreState.h" typedef boost::mt11213b rngen_t; diff --git a/src/test/filestore/FileStoreDiff.cc b/src/test/filestore/FileStoreDiff.cc index e2df7f8d708..6fe92fc2212 100644 --- a/src/test/filestore/FileStoreDiff.cc +++ b/src/test/filestore/FileStoreDiff.cc @@ -12,11 +12,10 @@ */ #include <stdio.h> #include <stdlib.h> -#include <map> -#include <boost/scoped_ptr.hpp> -#include "global/debug.h" -#include "os/FileStore.h" + #include "common/config.h" +#include "os/FileStore.h" +#include "global/debug.h" #include "FileStoreDiff.h" diff --git a/src/test/filestore/FileStoreDiff.h b/src/test/filestore/FileStoreDiff.h index cacd3ce8474..92d5c624b34 100644 --- a/src/test/filestore/FileStoreDiff.h +++ b/src/test/filestore/FileStoreDiff.h @@ -17,9 +17,8 @@ #include <stdlib.h> #include <map> #include <boost/scoped_ptr.hpp> -#include "common/debug.h" + #include "os/FileStore.h" -#include "common/config.h" class FileStoreDiff { diff --git a/src/test/filestore/FileStoreTracker.h b/src/test/filestore/FileStoreTracker.h index d70e54a1123..42da3eda1d0 100644 --- a/src/test/filestore/FileStoreTracker.h +++ b/src/test/filestore/FileStoreTracker.h @@ -2,13 +2,16 @@ #ifndef FILESTORE_TRACKER_H #define FILESTORE_TRACKER_H -#include "test/common/ObjectContents.h" -#include "os/FileStore.h" -#include "os/KeyValueDB.h" + #include <boost/scoped_ptr.hpp> #include <list> #include <map> + #include "common/Mutex.h" +#include "os/FileStore.h" +#include "os/KeyValueDB.h" + +#include "../common/ObjectContents.h" class FileStoreTracker { const static uint64_t SIZE = 4 * 1024; diff --git a/src/test/filestore/TestFileStoreState.cc b/src/test/filestore/TestFileStoreState.cc index 238833097b3..8e4c979a2ac 100644 --- a/src/test/filestore/TestFileStoreState.cc +++ b/src/test/filestore/TestFileStoreState.cc @@ -16,14 +16,14 @@ #include <time.h> #include <stdlib.h> #include <signal.h> -#include "os/FileStore.h" +#include <boost/lexical_cast.hpp> + +#include "include/assert.h" #include "common/ceph_argparse.h" #include "global/global_init.h" #include "global/debug.h" -#include <boost/scoped_ptr.hpp> -#include <boost/lexical_cast.hpp> + #include "TestFileStoreState.h" -#include "include/assert.h" #define dout_subsys ceph_subsys_filestore #undef dout_prefix diff --git a/src/test/filestore/TestFileStoreState.h b/src/test/filestore/TestFileStoreState.h index 74276b03f70..15498a64054 100644 --- a/src/test/filestore/TestFileStoreState.h +++ b/src/test/filestore/TestFileStoreState.h @@ -13,13 +13,14 @@ #ifndef TEST_FILESTORE_STATE_H_ #define TEST_FILESTORE_STATE_H_ -#include "os/FileStore.h" #include <boost/scoped_ptr.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> #include <map> #include <vector> +#include "os/FileStore.h" + class TestFileStoreState { public: struct coll_entry_t { diff --git a/src/test/filestore/store_test.cc b/src/test/filestore/store_test.cc index c98ffb047ac..79a7a2618c8 100644 --- a/src/test/filestore/store_test.cc +++ b/src/test/filestore/store_test.cc @@ -16,20 +16,23 @@ #include <string.h> #include <iostream> #include <time.h> -#include "os/FileStore.h" -#include "include/Context.h" -#include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "common/Mutex.h" -#include "common/Cond.h" #include <boost/scoped_ptr.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> #include <boost/random/binomial_distribution.hpp> #include <gtest/gtest.h> - #include <ext/hash_map> + +#include "include/Context.h" +#include "common/ceph_argparse.h" +#include "common/Mutex.h" +#include "common/Cond.h" +#include "os/FileStore.h" +#include "global/global_init.h" +#include "global/global_context.h" + using __gnu_cxx::hash_map; + typedef boost::mt11213b gen_type; class StoreTest : public ::testing::Test { diff --git a/src/test/filestore/test_idempotent.cc b/src/test/filestore/test_idempotent.cc index 9e2d83b5f99..753984d3008 100644 --- a/src/test/filestore/test_idempotent.cc +++ b/src/test/filestore/test_idempotent.cc @@ -15,16 +15,19 @@ #include <iostream> #include <sstream> #include <boost/scoped_ptr.hpp> -#include "os/FileStore.h" -#include "global/global_init.h" -#include "global/debug.h" + #include "common/ceph_argparse.h" -#include "test/common/ObjectContents.h" -#include "FileStoreTracker.h" +#include "os/FileStore.h" #include "os/LevelDBStore.h" #include "os/KeyValueDB.h" #include "os/ObjectStore.h" #include "os/FileStore.h" +#include "global/global_init.h" +#include "global/global_context.h" +#include "global/debug.h" + +#include "../common/ObjectContents.h" +#include "FileStoreTracker.h" void usage(const string &name) { std::cerr << "Usage: " << name << " [new|continue] store_path store_journal db_path" diff --git a/src/test/filestore/test_idempotent_sequence.cc b/src/test/filestore/test_idempotent_sequence.cc index 94d4d858d1e..669bc747813 100644 --- a/src/test/filestore/test_idempotent_sequence.cc +++ b/src/test/filestore/test_idempotent_sequence.cc @@ -16,16 +16,18 @@ #include <sstream> #include <time.h> #include <stdlib.h> + #include "common/ceph_argparse.h" +#include "common/config.h" +#include "os/FileStore.h" +#include "global/global_context.h" #include "global/global_init.h" #include "global/debug.h" -#include "os/FileStore.h" #include "DeterministicOpSequence.h" #include "FileStoreDiff.h" -#include "common/config.h" -#include "include/assert.h" +#include "include/assert.h" // boost in DeterministicOpSequence.h clobbers it #define dout_subsys ceph_subsys_ #undef dout_prefix diff --git a/src/test/filestore/workload_generator.cc b/src/test/filestore/workload_generator.cc index 9f8a4692d88..b2ee1e07210 100644 --- a/src/test/filestore/workload_generator.cc +++ b/src/test/filestore/workload_generator.cc @@ -19,17 +19,14 @@ #include <signal.h> #include <cctype> #include <errno.h> -#include <sys/time.h> -#include "os/FileStore.h" +#include <boost/lexical_cast.hpp> + +#include "include/assert.h" #include "common/ceph_argparse.h" #include "global/global_init.h" #include "global/debug.h" -#include <boost/scoped_ptr.hpp> -#include <boost/lexical_cast.hpp> -#include "workload_generator.h" -#include "include/assert.h" -#include "TestFileStoreState.h" +#include "workload_generator.h" static const char *our_name = NULL; void usage(); diff --git a/src/test/filestore/workload_generator.h b/src/test/filestore/workload_generator.h index 6a63b353c61..963b577373d 100644 --- a/src/test/filestore/workload_generator.h +++ b/src/test/filestore/workload_generator.h @@ -13,7 +13,6 @@ #ifndef WORKLOAD_GENERATOR_H_ #define WORKLOAD_GENERATOR_H_ -#include "os/FileStore.h" #include <boost/scoped_ptr.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> diff --git a/src/test/gather.cc b/src/test/gather.cc index 92bec7650c6..81cbb7651ba 100644 --- a/src/test/gather.cc +++ b/src/test/gather.cc @@ -12,7 +12,8 @@ * */ #include "include/Context.h" -#include "test/unit.h" + +#include "unit.h" class C_Checker : public Context { public: diff --git a/src/test/heartbeat_map.cc b/src/test/heartbeat_map.cc index 9ba134afa22..ea11c0ff99f 100644 --- a/src/test/heartbeat_map.cc +++ b/src/test/heartbeat_map.cc @@ -15,9 +15,10 @@ #include "common/Mutex.h" #include "common/HeartbeatMap.h" #include "common/ceph_context.h" -#include "test/unit.h" #include "common/config.h" +#include "unit.h" + using namespace ceph; TEST(HeartbeatMap, Healthy) { diff --git a/src/test/kv_store_bench.cc b/src/test/kv_store_bench.cc index ba5b795d95b..4042addf85d 100644 --- a/src/test/kv_store_bench.cc +++ b/src/test/kv_store_bench.cc @@ -5,19 +5,14 @@ * Author: eleanor */ -#include "test/kv_store_bench.h" -#include "key_value_store/key_value_structure.h" -#include "key_value_store/kv_flat_btree_async.h" -#include "include/rados/librados.hpp" -#include "test/omap_bench.h" +#include <sstream> +#include <cmath> + #include "common/ceph_argparse.h" +#include "omap_bench.h" -#include <string> -#include <climits> -#include <iostream> -#include <sstream> -#include <cmath> +#include "kv_store_bench.h" KvStoreBench::KvStoreBench() : entries(30), diff --git a/src/test/kv_store_bench.h b/src/test/kv_store_bench.h index 3ebb15fd9ef..c859c6320d8 100644 --- a/src/test/kv_store_bench.h +++ b/src/test/kv_store_bench.h @@ -14,18 +14,18 @@ #ifndef KVSTOREBENCH_H_ #define KVSTOREBENCH_H_ -#include "key_value_store/key_value_structure.h" -#include "key_value_store/kv_flat_btree_async.h" -#include "common/Clock.h" -#include "global/global_context.h" -#include "common/Mutex.h" -#include "common/Cond.h" - #include <string> #include <climits> #include <cfloat> #include <iostream> +#include "common/Clock.h" +#include "common/Mutex.h" +#include "common/Cond.h" +#include "key_value_store/key_value_structure.h" +#include "key_value_store/kv_flat_btree_async.h" +#include "global/global_context.h" + using namespace std; using ceph::bufferlist; diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc index f3d558281b5..596a89bc866 100644 --- a/src/test/librados/misc.cc +++ b/src/test/librados/misc.cc @@ -1,15 +1,17 @@ -#include "mds/mdstypes.h" -#include "include/buffer.h" -#include "include/rbd_types.h" -#include "include/rados/librados.h" -#include "include/rados/librados.hpp" -#include "test/librados/test.h" +#include "mds/mds_types.h" -#include "gtest/gtest.h" #include <errno.h> #include <map> #include <sstream> #include <string> +#include <gtest/gtest.h> + +#include "include/buffer.h" +#include "include/rbd_types.h" +#include "include/rados/librados.h" +#include "include/rados/librados.hpp" + +#include "test.h" using namespace librados; using ceph::buffer; diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 8c7cd482ed0..40313b23738 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -11,27 +11,19 @@ * Foundation. See file COPYING. * */ +#include "osd/osd_types.h" + #include <iostream> #include <string> #include <map> - #include <boost/scoped_ptr.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> - -#include "osd/osd_types.h" -#include "osd/OSD.h" -#include "osd/OSDMap.h" -#include "osdc/Objecter.h" -#include "mon/MonClient.h" -#include "msg/Dispatcher.h" -#include "msg/Messenger.h" +#include "include/uuid.h" +#include "include/assert.h" #include "common/Timer.h" #include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "global/signal_handler.h" -#include "global/debug.h" #include "common/config.h" #include "common/errno.h" #include "common/Cond.h" @@ -40,8 +32,15 @@ #include "common/LogEntry.h" #include "auth/KeyRing.h" #include "auth/AuthAuthorizeHandler.h" -#include "include/uuid.h" -#include "include/assert.h" +#include "osd/OSD.h" +#include "osd/OSDMap.h" +#include "osdc/Objecter.h" +#include "mon/MonClient.h" +#include "msg/Messenger.h" +#include "global/global_init.h" +#include "global/global_context.h" +#include "global/signal_handler.h" +#include "global/debug.h" #include "messages/MOSDBoot.h" #include "messages/MOSDAlive.h" diff --git a/src/test/old/test_disk_bw.cc b/src/test/old/test_disk_bw.cc index 40d0df3fe8b..40e722acade 100644 --- a/src/test/old/test_disk_bw.cc +++ b/src/test/old/test_disk_bw.cc @@ -1,4 +1,3 @@ - #include <sys/time.h> #include <sys/types.h> #include <sys/stat.h> @@ -9,11 +8,12 @@ #include <unistd.h> #include <errno.h> #include <sys/uio.h> +#include <iostream> #include "common/Clock.h" #include "common/safe_io.h" +#include "global/global_context.h" -#include <iostream> using namespace std; int main(int argc, char **argv) diff --git a/src/test/old/testcounter.cc b/src/test/old/testcounter.cc index 2d42eba864b..14780051325 100644 --- a/src/test/old/testcounter.cc +++ b/src/test/old/testcounter.cc @@ -1,7 +1,8 @@ +#include <list> #include "common/DecayCounter.h" +#include "global/global_context.h" -#include <list> using namespace std; struct RealCounter { diff --git a/src/test/omap_bench.cc b/src/test/omap_bench.cc index f24af491577..c08e31194ae 100644 --- a/src/test/omap_bench.cc +++ b/src/test/omap_bench.cc @@ -11,22 +11,19 @@ * Foundation. See file COPYING. */ -#include "include/rados/librados.hpp" -#include "include/Context.h" -#include "common/ceph_context.h" -#include "common/Mutex.h" -#include "common/Cond.h" -#include "include/utime.h" -#include "global/global_context.h" -#include "common/ceph_argparse.h" -#include "test/omap_bench.h" - -#include <string> #include <iostream> #include <cassert> #include <climits> #include <cmath> +#include "include/Context.h" +#include "include/utime.h" +#include "common/ceph_context.h" +#include "common/ceph_argparse.h" +#include "global/global_context.h" + +#include "omap_bench.h" + using namespace std; using ceph::bufferlist; diff --git a/src/test/omap_bench.h b/src/test/omap_bench.h index 12b34f902ae..462bfc41bcc 100644 --- a/src/test/omap_bench.h +++ b/src/test/omap_bench.h @@ -14,13 +14,14 @@ #ifndef OMAP_BENCH_HPP_ #define OMAP_BENCH_HPP_ -#include "common/Mutex.h" -#include "common/Cond.h" -#include "include/rados/librados.hpp" #include <string> #include <map> #include <cfloat> +#include "include/rados/librados.hpp" +#include "common/Mutex.h" +#include "common/Cond.h" + using ceph::bufferlist; struct o_bench_data { diff --git a/src/test/osdc/FakeWriteback.h b/src/test/osdc/FakeWriteback.h index ff48592d728..e1540e33968 100644 --- a/src/test/osdc/FakeWriteback.h +++ b/src/test/osdc/FakeWriteback.h @@ -3,10 +3,11 @@ #ifndef CEPH_TEST_OSDC_FAKEWRITEBACK_H #define CEPH_TEST_OSDC_FAKEWRITEBACK_H -#include "include/atomic.h" -#include "include/Context.h" #include "include/types.h" #include "osd/osd_types.h" + +#include "include/atomic.h" +#include "include/Context.h" #include "osdc/WritebackHandler.h" class Finisher; diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc index 30b71acbc9e..21b4e1ff989 100644 --- a/src/test/osdc/object_cacher_stress.cc +++ b/src/test/osdc/object_cacher_stress.cc @@ -8,18 +8,18 @@ #include <vector> #include <boost/scoped_ptr.hpp> +#include "include/atomic.h" +#include "include/buffer.h" +#include "include/Context.h" +#include "include/stringify.h" #include "common/ceph_argparse.h" #include "common/common_init.h" #include "common/config.h" #include "common/Mutex.h" #include "common/snap_types.h" +#include "osdc/ObjectCacher.h" #include "global/global_context.h" #include "global/global_init.h" -#include "include/atomic.h" -#include "include/buffer.h" -#include "include/Context.h" -#include "include/stringify.h" -#include "osdc/ObjectCacher.h" #include "FakeWriteback.h" diff --git a/src/test/perf_counters.cc b/src/test/perf_counters.cc index e5090d2c5b0..4ffda864448 100644 --- a/src/test/perf_counters.cc +++ b/src/test/perf_counters.cc @@ -43,9 +43,9 @@ #include <time.h> #include <unistd.h> -#include "global/global_init.h" #include "common/common_init.h" -#include "common/ceph_context.h" +#include "global/global_init.h" +#include "global/global_context.h" int main(int argc, char **argv) { std::vector<const char *> preargs; diff --git a/src/test/test_filejournal.cc b/src/test/test_filejournal.cc index 1131333d8e2..1f8cc4610dc 100644 --- a/src/test/test_filejournal.cc +++ b/src/test/test_filejournal.cc @@ -1,16 +1,16 @@ -#include <gtest/gtest.h> #include <stdlib.h> +#include <gtest/gtest.h> +#include "include/Context.h" #include "common/ceph_argparse.h" #include "common/common_init.h" -#include "global/global_context.h" -#include "global/global_init.h" #include "common/config.h" #include "common/Finisher.h" -#include "os/FileJournal.h" -#include "include/Context.h" #include "common/Mutex.h" #include "common/safe_io.h" +#include "os/FileJournal.h" +#include "global/global_context.h" +#include "global/global_init.h" Finisher *finisher; Cond sync_cond; diff --git a/src/test/test_mutate.cc b/src/test/test_mutate.cc index a9dd891233e..54c4689e5dd 100644 --- a/src/test/test_mutate.cc +++ b/src/test/test_mutate.cc @@ -15,18 +15,18 @@ /* * Test Ioctx::operate */ +#include "include/types.h" + +#include <errno.h> +#include <iostream> +#include <string> +#include "include/rados/librados.hpp" #include "common/ceph_argparse.h" #include "common/debug.h" #include "common/config.h" #include "global/global_context.h" #include "global/global_init.h" -#include "include/rados/librados.hpp" -#include "include/types.h" - -#include <errno.h> -#include <iostream> -#include <string> using std::cerr; using std::string; diff --git a/src/test/test_striper.cc b/src/test/test_striper.cc index d3e92851aa1..6901c98940c 100644 --- a/src/test/test_striper.cc +++ b/src/test/test_striper.cc @@ -1,10 +1,10 @@ #include "gtest/gtest.h" -#include "global/global_context.h" + #include "common/ceph_argparse.h" -#include "global/global_init.h" #include "common/common_init.h" - #include "osdc/Striper.h" +#include "global/global_context.h" +#include "global/global_init.h" TEST(Striper, Stripe1) { diff --git a/src/test/test_workqueue.cc b/src/test/test_workqueue.cc index 602a0ec1eae..a203fc98095 100644 --- a/src/test/test_workqueue.cc +++ b/src/test/test_workqueue.cc @@ -1,10 +1,10 @@ #include "gtest/gtest.h" #include "common/WorkQueue.h" -#include "global/global_context.h" #include "common/ceph_argparse.h" -#include "global/global_init.h" #include "common/common_init.h" +#include "global/global_context.h" +#include "global/global_init.h" TEST(WorkQueue, StartStop) { diff --git a/src/test/unit.h b/src/test/unit.h index b1fb373ed43..f17f4053ae8 100644 --- a/src/test/unit.h +++ b/src/test/unit.h @@ -18,13 +18,13 @@ #include "include/types.h" // FIXME: ordering shouldn't be important, but right // now, this include has to come before the others. +#include <vector> +#include <gtest/gtest.h> + +#include "include/msgr.h" // for CEPH_ENTITY_TYPE_CLIENT #include "common/code_environment.h" #include "global/global_context.h" #include "global/global_init.h" -#include "include/msgr.h" // for CEPH_ENTITY_TYPE_CLIENT -#include "gtest/gtest.h" - -#include <vector> /* * You only need to include this file if you are testing Ceph internal code. If diff --git a/src/test/xattr_bench.cc b/src/test/xattr_bench.cc index 3a4b4236dad..69132da676e 100644 --- a/src/test/xattr_bench.cc +++ b/src/test/xattr_bench.cc @@ -18,20 +18,21 @@ #include <iostream> #include <sstream> #include <time.h> -#include "os/FileStore.h" -#include "include/Context.h" -#include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "common/Mutex.h" -#include "common/Cond.h" #include <boost/scoped_ptr.hpp> #include <boost/random/mersenne_twister.hpp> #include <boost/random/uniform_int.hpp> #include <boost/random/binomial_distribution.hpp> #include <gtest/gtest.h> - #include <ext/hash_map> +#include "include/Context.h" +#include "common/ceph_argparse.h" +#include "common/Mutex.h" +#include "common/Cond.h" +#include "os/FileStore.h" +#include "global/global_context.h" +#include "global/global_init.h" + void usage(const string &name) { std::cerr << "Usage: " << name << " [xattr|omap] store_path store_journal" << std::endl; |