diff options
| author | Roald J. van Loon <roaldvanloon@gmail.com> | 2012-12-24 13:10:57 +0100 |
|---|---|---|
| committer | Roald van Loon <roaldvanloon@gmail.com> | 2012-12-24 22:26:56 +0000 |
| commit | 17ae36a5420eb4568f93ba3d9f185dfbc0a42918 (patch) | |
| tree | ae06815a5638dea51b98466d81b6b0c5a46f987d | |
| parent | 18001d059656224abbf7d92c1c54befd33ec8d6e (diff) | |
| download | ceph-wip-dout.tar.gz | |
cleanup: changed order of #includes, global_context.h, debug.hwip-dout
- lots of rewriting of #include ordering (see below)
- renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h
- included global/global_context.h and global/debug.h where used
- fixed lots of duplicate includes
The order of #includes is now;
1. types include (include/types.h, mds/mds_types.h, etc)
2. system includes (like stl, boost, etc)
3. ceph includes (include/..)
4. ceph common (common/..)
5. ceph other (auth/.., os/.., global/.., etc)
6. list of messages/.., if used
7. local includes (headers from same module)
8. own header (<basename>.h)
"using namespace" stuff is always directly below #include, not intermixed with them
(WIP notice: most files have this implemented, but some not yet)
Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
489 files changed, 2153 insertions, 2502 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index aea336d6633..d3b2f31e155 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1683,7 +1683,7 @@ noinst_HEADERS = \ mds/events/ETableServer.h\ mds/events/EUpdate.h\ mds/mds_table_types.h\ - mds/mdstypes.h\ + mds/mds_types.h\ mds/snap.h\ messages/MAuth.h\ messages/MAuthReply.h\ diff --git a/src/auth/Auth.h b/src/auth/Auth.h index 4dc1d63c93d..2fff82c14d1 100644 --- a/src/auth/Auth.h +++ b/src/auth/Auth.h @@ -15,12 +15,14 @@ #ifndef CEPH_AUTHTYPES_H #define CEPH_AUTHTYPES_H -#include "Crypto.h" +#include "include/types.h" #include "msg/msg_types.h" #include "common/config.h" #include "common/entity_name.h" +#include "Crypto.h" + class Cond; struct EntityAuth { diff --git a/src/auth/AuthAuthorizeHandler.cc b/src/auth/AuthAuthorizeHandler.cc index c9c25900894..12dc236c343 100644 --- a/src/auth/AuthAuthorizeHandler.cc +++ b/src/auth/AuthAuthorizeHandler.cc @@ -13,12 +13,12 @@ */ #include "common/debug.h" -#include "Auth.h" -#include "AuthAuthorizeHandler.h" +#include "common/Mutex.h" + #include "cephx/CephxAuthorizeHandler.h" #include "none/AuthNoneAuthorizeHandler.h" -#include "AuthMethodList.h" -#include "common/Mutex.h" + +#include "AuthAuthorizeHandler.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/AuthAuthorizeHandler.h b/src/auth/AuthAuthorizeHandler.h index 10803d0d7a0..b2abb1b6fe7 100644 --- a/src/auth/AuthAuthorizeHandler.h +++ b/src/auth/AuthAuthorizeHandler.h @@ -17,7 +17,6 @@ #include "Auth.h" #include "AuthMethodList.h" -#include "include/types.h" // Different classes of session crypto handling diff --git a/src/auth/AuthClientHandler.cc b/src/auth/AuthClientHandler.cc index 5b02a258469..906df78f02a 100644 --- a/src/auth/AuthClientHandler.cc +++ b/src/auth/AuthClientHandler.cc @@ -15,14 +15,14 @@ #include <errno.h> -#include "AuthClientHandler.h" -#include "KeyRing.h" - #include "messages/MAuth.h" #include "messages/MAuthReply.h" #include "cephx/CephxClientHandler.h" #include "none/AuthNoneClientHandler.h" +#include "KeyRing.h" + +#include "AuthClientHandler.h" AuthClientHandler *get_auth_client_handler(CephContext *cct, int proto, RotatingKeyRing *rkeys) diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h index 24df969994a..e2701f2f583 100644 --- a/src/auth/AuthClientHandler.h +++ b/src/auth/AuthClientHandler.h @@ -15,14 +15,12 @@ #ifndef CEPH_AUTHCLIENTHANDLER_H #define CEPH_AUTHCLIENTHANDLER_H - -#include "auth/Auth.h" - #include "common/Mutex.h" #include "common/Cond.h" - #include "common/Timer.h" +#include "Auth.h" + class CephContext; class MAuthReply; class AuthClientHandler; diff --git a/src/auth/AuthMethodList.cc b/src/auth/AuthMethodList.cc index dc181f92041..804f2fac774 100644 --- a/src/auth/AuthMethodList.cc +++ b/src/auth/AuthMethodList.cc @@ -12,16 +12,15 @@ * */ +#include "include/str_list.h" #include "common/Mutex.h" #include "common/config.h" #include "common/debug.h" -#include "include/str_list.h" #include "AuthMethodList.h" const static int dout_subsys = ceph_subsys_auth; - AuthMethodList::AuthMethodList(CephContext *cct, string str) { list<string> sup_list; diff --git a/src/auth/AuthMethodList.h b/src/auth/AuthMethodList.h index 82bc5b54e01..04633cad85d 100644 --- a/src/auth/AuthMethodList.h +++ b/src/auth/AuthMethodList.h @@ -16,6 +16,7 @@ #define CEPH_AUTHMETHODLIST_H #include "include/inttypes.h" + #include <list> #include <set> #include <string> diff --git a/src/auth/AuthServiceHandler.cc b/src/auth/AuthServiceHandler.cc index 8e2d96618ba..f3d0cd79437 100644 --- a/src/auth/AuthServiceHandler.cc +++ b/src/auth/AuthServiceHandler.cc @@ -12,11 +12,11 @@ * */ -#include "AuthServiceHandler.h" #include "cephx/CephxServiceHandler.h" #include "none/AuthNoneServiceHandler.h" #include "AuthMethodList.h" -#include "common/config.h" + +#include "AuthServiceHandler.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h index 429a5501be5..b2a751d57d4 100644 --- a/src/auth/AuthServiceHandler.h +++ b/src/auth/AuthServiceHandler.h @@ -15,8 +15,6 @@ #ifndef CEPH_AUTHSERVICEHANDLER_H #define CEPH_AUTHSERVICEHANDLER_H -#include "include/types.h" -#include "common/config.h" #include "Auth.h" class CephContext; diff --git a/src/auth/AuthSessionHandler.cc b/src/auth/AuthSessionHandler.cc index e928cf74fe2..17407123e88 100644 --- a/src/auth/AuthSessionHandler.cc +++ b/src/auth/AuthSessionHandler.cc @@ -13,11 +13,11 @@ */ #include "common/debug.h" -#include "AuthSessionHandler.h" #include "cephx/CephxSessionHandler.h" #include "none/AuthNoneSessionHandler.h" #include "unknown/AuthUnknownSessionHandler.h" -#include "common/config.h" + +#include "AuthSessionHandler.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/AuthSessionHandler.h b/src/auth/AuthSessionHandler.h index 684b83a2868..de8599435f8 100644 --- a/src/auth/AuthSessionHandler.h +++ b/src/auth/AuthSessionHandler.h @@ -16,9 +16,8 @@ #ifndef CEPH_AUTHSESSIONHANDLER_H #define CEPH_AUTHSESSIONHANDLER_H -#include "include/types.h" -#include "common/config.h" #include "msg/Message.h" + #include "Auth.h" #define SESSION_SIGNATURE_FAILURE -1 diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc index 821995a2910..9d9b653eddc 100644 --- a/src/auth/Crypto.cc +++ b/src/auth/Crypto.cc @@ -10,9 +10,11 @@ * Foundation. See file COPYING. * */ +#include "include/types.h" #include <sstream> -#include "Crypto.h" +#include <errno.h> + #ifdef USE_CRYPTOPP # include <cryptopp/modes.h> # include <cryptopp/aes.h> @@ -24,6 +26,8 @@ #endif #include "include/assert.h" +#include "include/ceph_fs.h" +#include "include/compat.h" #include "common/Clock.h" #include "common/armor.h" #include "common/ceph_crypto.h" @@ -31,10 +35,8 @@ #include "common/debug.h" #include "common/hex.h" #include "common/safe_io.h" -#include "include/ceph_fs.h" -#include "include/compat.h" -#include <errno.h> +#include "Crypto.h" int get_random_bytes(char *buf, int len) { diff --git a/src/auth/Crypto.h b/src/auth/Crypto.h index d984d6a0898..a1d73858a63 100644 --- a/src/auth/Crypto.h +++ b/src/auth/Crypto.h @@ -16,10 +16,11 @@ #define CEPH_AUTH_CRYPTO_H #include "include/types.h" -#include "include/utime.h" #include <string> +#include "include/utime.h" + class CephContext; class CryptoHandler; diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc index 96dba74a043..7f1b3e100c0 100644 --- a/src/auth/KeyRing.cc +++ b/src/auth/KeyRing.cc @@ -17,14 +17,16 @@ #include <memory> #include <sstream> -#include "auth/AuthMethodList.h" -#include "auth/Crypto.h" -#include "auth/KeyRing.h" +#include "include/str_list.h" #include "common/ConfUtils.h" #include "common/config.h" #include "common/debug.h" #include "common/errno.h" -#include "include/str_list.h" + +#include "AuthMethodList.h" +#include "Crypto.h" + +#include "KeyRing.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h index fe1d2de7f1e..b1e90fbe274 100644 --- a/src/auth/KeyRing.h +++ b/src/auth/KeyRing.h @@ -15,10 +15,8 @@ #ifndef CEPH_KEYRING_H #define CEPH_KEYRING_H -#include "common/config.h" - -#include "auth/Crypto.h" -#include "auth/Auth.h" +#include "Crypto.h" +#include "Auth.h" class md_config_t; diff --git a/src/auth/RotatingKeyRing.cc b/src/auth/RotatingKeyRing.cc index 9470801ff7d..3d2081e7eaa 100644 --- a/src/auth/RotatingKeyRing.cc +++ b/src/auth/RotatingKeyRing.cc @@ -1,13 +1,13 @@ #include <errno.h> #include <map> -#include "common/config.h" -#include "common/debug.h" #include "include/str_list.h" +#include "common/debug.h" #include "Crypto.h" -#include "auth/RotatingKeyRing.h" -#include "auth/KeyRing.h" +#include "KeyRing.h" + +#include "RotatingKeyRing.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix diff --git a/src/auth/RotatingKeyRing.h b/src/auth/RotatingKeyRing.h index efcb6382c7f..43b6f84d9eb 100644 --- a/src/auth/RotatingKeyRing.h +++ b/src/auth/RotatingKeyRing.h @@ -15,11 +15,10 @@ #ifndef CEPH_ROTATINGKEYRING_H #define CEPH_ROTATINGKEYRING_H -#include "common/config.h" #include "common/Mutex.h" -#include "auth/Crypto.h" -#include "auth/Auth.h" +#include "Crypto.h" +#include "Auth.h" /* * mediate access to a service's keyring and rotating secrets diff --git a/src/auth/cephx/CephxAuthorizeHandler.cc b/src/auth/cephx/CephxAuthorizeHandler.cc index 5b28b9e5ade..ac935cdb876 100644 --- a/src/auth/cephx/CephxAuthorizeHandler.cc +++ b/src/auth/cephx/CephxAuthorizeHandler.cc @@ -1,7 +1,7 @@ #include "../KeyRing.h" - #include "CephxProtocol.h" + #include "CephxAuthorizeHandler.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/cephx/CephxClientHandler.cc b/src/auth/cephx/CephxClientHandler.cc index 2818b7a679a..c51d53af63d 100644 --- a/src/auth/cephx/CephxClientHandler.cc +++ b/src/auth/cephx/CephxClientHandler.cc @@ -15,12 +15,11 @@ #include <errno.h> -#include "CephxClientHandler.h" -#include "CephxProtocol.h" +#include "common/config.h" #include "../KeyRing.h" -#include "common/config.h" +#include "CephxClientHandler.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc index 03f3bdf9669..c9958a39df6 100644 --- a/src/auth/cephx/CephxKeyServer.cc +++ b/src/auth/cephx/CephxKeyServer.cc @@ -12,14 +12,13 @@ * */ -#include "common/config.h" +#include <sstream> -#include "CephxKeyServer.h" +#include "common/config.h" #include "common/Timer.h" - #include "global/global_context.h" -#include <sstream> +#include "CephxKeyServer.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h index 60b424b0bd5..05d9494928b 100644 --- a/src/auth/cephx/CephxKeyServer.h +++ b/src/auth/cephx/CephxKeyServer.h @@ -16,11 +16,11 @@ #define CEPH_KEYSSERVER_H #include "common/config.h" +#include "common/Timer.h" -#include "auth/KeyRing.h" -#include "CephxProtocol.h" +#include "../KeyRing.h" -#include "common/Timer.h" +#include "CephxProtocol.h" class CephContext; diff --git a/src/auth/cephx/CephxProtocol.cc b/src/auth/cephx/CephxProtocol.cc index 34f31f70c72..c4c9be09349 100644 --- a/src/auth/cephx/CephxProtocol.cc +++ b/src/auth/cephx/CephxProtocol.cc @@ -12,18 +12,17 @@ * */ -#include "CephxProtocol.h" +#include "include/buffer.h" #include "common/Clock.h" #include "common/config.h" #include "common/debug.h" -#include "include/buffer.h" + +#include "CephxProtocol.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix #define dout_prefix *_dout << "cephx: " - - void cephx_calc_client_server_challenge(CephContext *cct, CryptoKey& secret, uint64_t server_challenge, uint64_t client_challenge, uint64_t *key, std::string &ret) { diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc index c5d91d98bca..281b1ef35cd 100644 --- a/src/auth/cephx/CephxServiceHandler.cc +++ b/src/auth/cephx/CephxServiceHandler.cc @@ -12,19 +12,16 @@ * */ - -#include "CephxServiceHandler.h" -#include "CephxProtocol.h" - -#include "../Auth.h" - -#include "mon/Monitor.h" - #include <errno.h> #include <sstream> -#include "common/config.h" #include "include/assert.h" +#include "common/config.h" +#include "mon/Monitor.h" + +#include "CephxProtocol.h" + +#include "CephxServiceHandler.h" #define dout_subsys ceph_subsys_auth #undef dout_prefix diff --git a/src/auth/cephx/CephxSessionHandler.cc b/src/auth/cephx/CephxSessionHandler.cc index 460e2526e10..92228a39f8c 100644 --- a/src/auth/cephx/CephxSessionHandler.cc +++ b/src/auth/cephx/CephxSessionHandler.cc @@ -12,15 +12,16 @@ * */ -#include "CephxSessionHandler.h" -#include "CephxProtocol.h" - #include <errno.h> #include <sstream> -#include "common/config.h" #include "include/assert.h" #include "include/ceph_features.h" +#include "common/config.h" + +#include "CephxProtocol.h" + +#include "CephxSessionHandler.h" #define dout_subsys ceph_subsys_auth diff --git a/src/auth/none/AuthNoneAuthorizeHandler.cc b/src/auth/none/AuthNoneAuthorizeHandler.cc index 8b55e9e9ba8..52652368100 100644 --- a/src/auth/none/AuthNoneAuthorizeHandler.cc +++ b/src/auth/none/AuthNoneAuthorizeHandler.cc @@ -12,9 +12,10 @@ * */ -#include "AuthNoneAuthorizeHandler.h" #include "common/debug.h" +#include "AuthNoneAuthorizeHandler.h" + #define dout_subsys ceph_subsys_auth bool AuthNoneAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *keys, diff --git a/src/auth/unknown/AuthUnknownAuthorizeHandler.cc b/src/auth/unknown/AuthUnknownAuthorizeHandler.cc index de66058c489..a50cde30d9e 100644 --- a/src/auth/unknown/AuthUnknownAuthorizeHandler.cc +++ b/src/auth/unknown/AuthUnknownAuthorizeHandler.cc @@ -12,9 +12,10 @@ * */ -#include "AuthUnknownAuthorizeHandler.h" #include "common/debug.h" +#include "AuthUnknownAuthorizeHandler.h" + #define dout_subsys ceph_subsys_auth bool AuthUnknownAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *keys, diff --git a/src/ceph_authtool.cc b/src/ceph_authtool.cc index c0a06ca1e53..b9a5e983a39 100644 --- a/src/ceph_authtool.cc +++ b/src/ceph_authtool.cc @@ -12,20 +12,19 @@ * */ -using namespace std; +#include <sstream> #include "common/config.h" #include "common/strtol.h" - #include "common/ConfUtils.h" #include "common/ceph_argparse.h" -#include "global/global_context.h" -#include "global/global_init.h" #include "auth/Crypto.h" #include "auth/Auth.h" #include "auth/KeyRing.h" +#include "global/global_context.h" +#include "global/global_init.h" -#include <sstream> +using namespace std; void usage() { diff --git a/src/ceph_conf.cc b/src/ceph_conf.cc index 608c0852122..57d202dda7a 100644 --- a/src/ceph_conf.cc +++ b/src/ceph_conf.cc @@ -18,13 +18,13 @@ #include <sys/stat.h> #include <sys/types.h> -#include "mon/AuthMonitor.h" +#include "include/str_list.h" #include "common/ConfUtils.h" -#include "global/global_init.h" #include "common/entity_name.h" #include "common/ceph_argparse.h" #include "common/config.h" -#include "include/str_list.h" +#include "mon/AuthMonitor.h" +#include "global/global_init.h" using std::deque; using std::string; diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc index 09aadb4c761..53e566cf32b 100644 --- a/src/ceph_fuse.cc +++ b/src/ceph_fuse.cc @@ -15,29 +15,26 @@ #include <sys/stat.h> #include <iostream> #include <string> -using namespace std; +#include <sys/types.h> +#include <fcntl.h> + +#ifndef DARWIN +#include <envz.h> +#endif // DARWIN #include "common/config.h" #include "common/errno.h" - +#include "common/Timer.h" +#include "common/safe_io.h" +#include "common/ceph_argparse.h" #include "client/Client.h" #include "client/fuse_ll.h" - #include "msg/Messenger.h" - #include "mon/MonClient.h" - -#include "common/Timer.h" -#include "common/ceph_argparse.h" #include "global/global_init.h" -#include "common/safe_io.h" - -#ifndef DARWIN -#include <envz.h> -#endif // DARWIN +#include "global/global_context.h" -#include <sys/types.h> -#include <fcntl.h> +using namespace std; void usage() { diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 36aa58bd579..0c1a7358746 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -15,36 +15,30 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> - #include <iostream> #include <string> -using namespace std; #include "include/ceph_features.h" - +#include "include/assert.h" +#include "common/Timer.h" +#include "common/ceph_argparse.h" +#include "common/pick_address.h" #include "common/config.h" #include "common/strtol.h" - +#include "auth/KeyRing.h" #include "mon/MonMap.h" +#include "mon/MonClient.h" +#include "msg/Messenger.h" #include "mds/MDS.h" #include "mds/Dumper.h" #include "mds/Resetter.h" - -#include "msg/Messenger.h" - -#include "common/Timer.h" -#include "common/ceph_argparse.h" -#include "common/pick_address.h" - #include "global/global_init.h" +#include "global/global_context.h" #include "global/signal_handler.h" +#include "global/debug.h" #include "global/pidfile.h" -#include "mon/MonClient.h" - -#include "auth/KeyRing.h" - -#include "include/assert.h" +using namespace std; #define dout_subsys ceph_subsys_mds diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 3a8429f94c3..aa704066192 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -15,33 +15,28 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> - #include <iostream> #include <string> -using namespace std; -#include "common/config.h" +#include "include/CompatSet.h" +#include "include/assert.h" #include "include/ceph_features.h" - +#include "common/config.h" +#include "common/ceph_argparse.h" +#include "common/pick_address.h" +#include "common/Timer.h" +#include "common/errno.h" #include "mon/MonMap.h" #include "mon/Monitor.h" #include "mon/MonitorStore.h" #include "mon/MonClient.h" - #include "msg/Messenger.h" - -#include "include/CompatSet.h" - -#include "common/ceph_argparse.h" -#include "common/pick_address.h" -#include "common/Timer.h" -#include "common/errno.h" - #include "global/global_init.h" +#include "global/global_context.h" #include "global/signal_handler.h" #include "global/debug.h" -#include "include/assert.h" +using namespace std; #define dout_subsys ceph_subsys_mon diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index c515b9a10ea..93bca66fc19 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -16,37 +16,28 @@ #include <sys/stat.h> #include <fcntl.h> #include <uuid/uuid.h> - #include <iostream> #include <string> -using namespace std; -#include "osd/OSD.h" -#include "os/FileStore.h" -#include "mon/MonClient.h" #include "include/ceph_features.h" - +#include "include/color.h" +#include "include/assert.h" +#include "common/errno.h" +#include "common/pick_address.h" +#include "common/Timer.h" +#include "common/ceph_argparse.h" #include "common/config.h" - #include "mon/MonMap.h" - - +#include "mon/MonClient.h" #include "msg/Messenger.h" - -#include "common/Timer.h" -#include "common/ceph_argparse.h" - +#include "os/FileStore.h" +#include "osd/OSD.h" +#include "perfglue/heap_profiler.h" #include "global/global_init.h" #include "global/signal_handler.h" #include "global/debug.h" -#include "include/color.h" -#include "common/errno.h" -#include "common/pick_address.h" - -#include "perfglue/heap_profiler.h" - -#include "include/assert.h" +using namespace std; #define dout_subsys ceph_subsys_osd diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc index 8ffe40aec7b..8935b52218b 100644 --- a/src/ceph_syn.cc +++ b/src/ceph_syn.cc @@ -15,28 +15,24 @@ #include <sys/stat.h> #include <iostream> #include <string> -using namespace std; +#include <sys/types.h> +#include <fcntl.h> -#include "common/config.h" +#if !defined(DARWIN) && !defined(__FreeBSD__) +#include <envz.h> +#endif // DARWIN || __FreeBSD__ +#include "common/config.h" +#include "common/Timer.h" +#include "common/ceph_argparse.h" +#include "common/pick_address.h" #include "client/SyntheticClient.h" -#include "client/Client.h" - #include "msg/Messenger.h" - #include "mon/MonClient.h" - -#include "common/Timer.h" #include "global/global_init.h" -#include "common/ceph_argparse.h" -#include "common/pick_address.h" - -#if !defined(DARWIN) && !defined(__FreeBSD__) -#include <envz.h> -#endif // DARWIN || __FreeBSD__ +#include "global/global_context.h" -#include <sys/types.h> -#include <fcntl.h> +using namespace std; extern int syn_filer_flags; diff --git a/src/client/Client.cc b/src/client/Client.cc index d876454f0f4..73d8b086c4c 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -12,9 +12,6 @@ * */ - - -// unix-ey fs stuff #include <unistd.h> #include <sys/types.h> #include <time.h> @@ -22,18 +19,24 @@ #include <sys/stat.h> #include <sys/param.h> #include <fcntl.h> - #include <sys/statvfs.h> - #include <iostream> -using namespace std; +#include "include/assert.h" +#include "include/compat.h" +#include "common/Cond.h" +#include "common/perf_counters.h" #include "common/config.h" - -// ceph stuff +#include "common/admin_socket.h" +#include "common/errno.h" +#include "mon/MonClient.h" +#include "mon/MonMap.h" +#include "mds/MDSMap.h" +#include "osd/OSDMap.h" +#include "osdc/Filer.h" +#include "osdc/WritebackHandler.h" #include "messages/MMonMap.h" - #include "messages/MClientSession.h" #include "messages/MClientReconnect.h" #include "messages/MClientRequest.h" @@ -43,33 +46,9 @@ using namespace std; #include "messages/MClientCapRelease.h" #include "messages/MClientLease.h" #include "messages/MClientSnap.h" - #include "messages/MGenericMessage.h" - #include "messages/MMDSMap.h" -#include "mon/MonClient.h" - -#include "mds/MDSMap.h" -#include "osd/OSDMap.h" -#include "mon/MonMap.h" - -#include "osdc/Filer.h" -#include "osdc/WritebackHandler.h" - -#include "common/Cond.h" -#include "common/Mutex.h" -#include "common/perf_counters.h" -#include "common/admin_socket.h" -#include "common/errno.h" - -#define dout_subsys ceph_subsys_client - -#include "include/lru.h" - -#include "include/compat.h" - -#include "Client.h" #include "Inode.h" #include "Dentry.h" #include "Dir.h" @@ -79,8 +58,11 @@ using namespace std; #include "MetaRequest.h" #include "ObjecterWriteback.h" -#include "include/assert.h" +#include "Client.h" +using namespace std; + +#define dout_subsys ceph_subsys_client #undef dout_prefix #define dout_prefix *_dout << "client." << whoami << " " diff --git a/src/client/Client.h b/src/client/Client.h index 9512a2d8861..1e906c8017d 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -17,36 +17,28 @@ #define CEPH_CLIENT_H #include "include/types.h" +#include "mds/mds_types.h" -// stl #include <string> #include <set> #include <map> #include <fstream> -using std::set; -using std::map; -using std::fstream; - #include <ext/hash_map> -using namespace __gnu_cxx; #include "include/filepath.h" #include "include/interval_set.h" #include "include/lru.h" - -#include "mds/mdstypes.h" - -#include "msg/Message.h" -#include "msg/Dispatcher.h" -#include "msg/Messenger.h" - #include "common/Mutex.h" #include "common/Timer.h" #include "common/Finisher.h" - #include "common/compiler_extensions.h" - #include "osdc/ObjectCacher.h" +#include "msg/Messenger.h" + +using std::set; +using std::map; +using std::fstream; +using namespace __gnu_cxx; class MDSMap; class OSDMap; diff --git a/src/client/Dentry.cc b/src/client/Dentry.cc index 8bb21ace2e3..2e4b0f31f50 100644 --- a/src/client/Dentry.cc +++ b/src/client/Dentry.cc @@ -3,12 +3,12 @@ #include "include/types.h" #include "include/utime.h" +#include "common/Formatter.h" -#include "Dentry.h" #include "Dir.h" #include "Inode.h" -#include "common/Formatter.h" +#include "Dentry.h" void Dentry::dump(Formatter *f) const { diff --git a/src/client/Dir.h b/src/client/Dir.h index 7e05d375f2f..67efc7ee16c 100644 --- a/src/client/Dir.h +++ b/src/client/Dir.h @@ -2,6 +2,7 @@ #define CEPH_CLIENT_DIR_H class Inode; +class Dentry; class Dir { public: diff --git a/src/client/Inode.cc b/src/client/Inode.cc index 0dfd1ebdce8..76c5def4acc 100644 --- a/src/client/Inode.cc +++ b/src/client/Inode.cc @@ -2,11 +2,12 @@ // vim: ts=8 sw=2 smarttab #include "MetaSession.h" -#include "Inode.h" #include "Dentry.h" #include "Dir.h" #include "SnapRealm.h" +#include "Inode.h" + ostream& operator<<(ostream &out, Inode &in) { out << in.vino() << "(" diff --git a/src/client/Inode.h b/src/client/Inode.h index d1387a85894..dc59f919d9a 100644 --- a/src/client/Inode.h +++ b/src/client/Inode.h @@ -5,13 +5,12 @@ #define CEPH_CLIENT_INODE_H #include "include/types.h" +#include "mds/mds_types.h" // hrm + +#include "include/assert.h" #include "include/xlist.h" #include "include/filepath.h" - -#include "mds/mdstypes.h" // hrm - #include "osdc/ObjectCacher.h" -#include "include/assert.h" class MetaSession; class Dentry; diff --git a/src/client/MetaRequest.cc b/src/client/MetaRequest.cc index 2c50f065576..01682d8808d 100644 --- a/src/client/MetaRequest.cc +++ b/src/client/MetaRequest.cc @@ -2,12 +2,15 @@ // vim: ts=8 sw=2 smarttab #include "include/types.h" -#include "client/MetaRequest.h" -#include "client/Dentry.h" -#include "client/Inode.h" -#include "messages/MClientReply.h" #include "common/Formatter.h" +#include "messages/MClientReply.h" + +#include "Dentry.h" +#include "Inode.h" + +#include "MetaRequest.h" + void MetaRequest::dump(Formatter *f) const { f->dump_unsigned("tid", tid); diff --git a/src/client/MetaRequest.h b/src/client/MetaRequest.h index 9c97c966fd1..695717d6fb0 100644 --- a/src/client/MetaRequest.h +++ b/src/client/MetaRequest.h @@ -7,10 +7,10 @@ #include "include/types.h" #include "msg/msg_types.h" +#include "mds/mds_types.h" + #include "include/xlist.h" #include "include/filepath.h" -#include "mds/mdstypes.h" - #include "common/Mutex.h" #include "messages/MClientRequest.h" diff --git a/src/client/MetaSession.cc b/src/client/MetaSession.cc index 36338c0bd60..f2c17d4f9d0 100644 --- a/src/client/MetaSession.cc +++ b/src/client/MetaSession.cc @@ -3,10 +3,10 @@ #include "include/types.h" -#include "MetaSession.h" - #include "common/Formatter.h" +#include "MetaSession.h" + void MetaSession::dump(Formatter *f) const { f->dump_int("mds", mds_num); diff --git a/src/client/MetaSession.h b/src/client/MetaSession.h index 20a7a588d73..3044edc4670 100644 --- a/src/client/MetaSession.h +++ b/src/client/MetaSession.h @@ -5,8 +5,9 @@ #define CEPH_CLIENT_METASESSION_H #include "include/types.h" -#include "include/utime.h" #include "msg/msg_types.h" + +#include "include/utime.h" #include "include/xlist.h" #include "messages/MClientCapRelease.h" diff --git a/src/client/SnapRealm.cc b/src/client/SnapRealm.cc index 6a5918a0589..1180e2f6882 100644 --- a/src/client/SnapRealm.cc +++ b/src/client/SnapRealm.cc @@ -1,9 +1,10 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "SnapRealm.h" #include "common/Formatter.h" +#include "SnapRealm.h" + void SnapRealm::dump(Formatter *f) const { f->dump_stream("ino") << ino; diff --git a/src/client/SnapRealm.h b/src/client/SnapRealm.h index 34d89568300..ecaead64c18 100644 --- a/src/client/SnapRealm.h +++ b/src/client/SnapRealm.h @@ -5,8 +5,8 @@ #define CEPH_CLIENT_SNAPREALM_H #include "include/types.h" -#include "common/snap_types.h" #include "include/xlist.h" +#include "common/snap_types.h" class Inode; diff --git a/src/client/SyntheticClient.cc b/src/client/SyntheticClient.cc index fae48111abc..6b9c58ceee1 100644 --- a/src/client/SyntheticClient.cc +++ b/src/client/SyntheticClient.cc @@ -14,18 +14,6 @@ #include <iostream> #include <sstream> -using namespace std; - - -#include "common/config.h" -#include "SyntheticClient.h" -#include "osdc/Objecter.h" -#include "osdc/Filer.h" - - -#include "include/filepath.h" -#include "common/perf_counters.h" - #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -33,9 +21,18 @@ using namespace std; #include <math.h> #include <sys/statvfs.h> + #include "include/assert.h" +#include "common/config.h" +#include "common/perf_counters.h" +#include "osdc/Objecter.h" +#include "osdc/Filer.h" #include "global/debug.h" +#include "SyntheticClient.h" + +using namespace std; + #define dout_subsys ceph_subsys_client #undef dout_prefix #define dout_prefix *_dout << "client." << (whoami >= 0 ? whoami:client->get_nodeid()) << " " diff --git a/src/client/SyntheticClient.h b/src/client/SyntheticClient.h index 484ef6f04d0..d7de6f3a49e 100644 --- a/src/client/SyntheticClient.h +++ b/src/client/SyntheticClient.h @@ -18,9 +18,10 @@ #include <pthread.h> -#include "Client.h" #include "include/Distribution.h" +#include "global/global_context.h" +#include "Client.h" #include "Trace.h" #define SYNCLIENT_MODE_RANDOMWALK 1 diff --git a/src/client/Trace.cc b/src/client/Trace.cc index f718595d00e..bdf0fdbc882 100644 --- a/src/client/Trace.cc +++ b/src/client/Trace.cc @@ -12,27 +12,20 @@ * */ - - -#include "Trace.h" -#include "common/debug.h" - #include <iostream> #include <map> #include <ext/rope> -using namespace __gnu_cxx; - -#include "common/Mutex.h" - -#include "common/config.h" - #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include "common/Mutex.h" +#include "common/config.h" +#include "common/debug.h" +#include "Trace.h" - +using namespace __gnu_cxx; void Trace::start() { diff --git a/src/client/Trace.h b/src/client/Trace.h index c4a0f9e1532..b461b2c8c1e 100644 --- a/src/client/Trace.h +++ b/src/client/Trace.h @@ -17,10 +17,10 @@ #define CEPH_CLIENT_TRACE_H #include <stdlib.h> - #include <list> #include <string> #include <fstream> + using std::list; using std::string; using std::ifstream; diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc index 159b1356a78..a536d19cfc1 100644 --- a/src/client/fuse_ll.cc +++ b/src/client/fuse_ll.cc @@ -23,13 +23,14 @@ #include <fcntl.h> #include <unistd.h> -// ceph +#include "include/types.h" +#include "include/assert.h" #include "common/errno.h" #include "common/safe_io.h" -#include "include/types.h" -#include "Client.h" #include "common/config.h" -#include "include/assert.h" +#include "global/debug.h" + +#include "Client.h" static Client *client; diff --git a/src/client/test_ioctls.c b/src/client/test_ioctls.c index f510cd26ee6..6b9c7fbd465 100644 --- a/src/client/test_ioctls.c +++ b/src/client/test_ioctls.c @@ -1,4 +1,3 @@ - #include <stdlib.h> #include <stdio.h> #include <unistd.h> @@ -6,7 +5,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <limits.h> - #include <sys/ioctl.h> #include <netinet/in.h> #include <sys/socket.h> diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc index 1405d87a1f2..cba23629cc5 100644 --- a/src/cls/lock/cls_lock.cc +++ b/src/cls/lock/cls_lock.cc @@ -8,6 +8,8 @@ * */ +#include "include/types.h" + #include <algorithm> #include <cstring> #include <cstdlib> @@ -17,21 +19,16 @@ #include <sstream> #include <vector> -#include "include/types.h" #include "include/utime.h" -#include "objclass/objclass.h" - #include "common/Clock.h" - -#include "cls/lock/cls_lock_types.h" -#include "cls/lock/cls_lock_ops.h" - +#include "objclass/objclass.h" #include "global/global_context.h" +#include "cls_lock_types.h" +#include "cls_lock_ops.h" using namespace rados::cls::lock; - CLS_VER(1,0) CLS_NAME(lock) diff --git a/src/cls/lock/cls_lock_client.cc b/src/cls/lock/cls_lock_client.cc index 54af41cd049..a5f82b32ecb 100644 --- a/src/cls/lock/cls_lock_client.cc +++ b/src/cls/lock/cls_lock_client.cc @@ -14,19 +14,17 @@ #include "include/types.h" #include "msg/msg_types.h" -#include "include/rados/librados.hpp" - -using namespace librados; #include <iostream> - #include <errno.h> #include <stdlib.h> #include <time.h> -#include "cls/lock/cls_lock_types.h" -#include "cls/lock/cls_lock_ops.h" -#include "cls/lock/cls_lock_client.h" +#include "cls_lock_ops.h" + +#include "cls_lock_client.h" + +using namespace librados; namespace rados { namespace cls { diff --git a/src/cls/lock/cls_lock_client.h b/src/cls/lock/cls_lock_client.h index 4e2144c79b4..04260cda8ab 100644 --- a/src/cls/lock/cls_lock_client.h +++ b/src/cls/lock/cls_lock_client.h @@ -4,12 +4,10 @@ #ifndef CEPH_CLS_LOCK_CLIENT_H #define CEPH_CLS_LOCK_CLIENT_H - #include "include/types.h" #include "include/rados/librados.hpp" -#include "cls/lock/cls_lock_types.h" - +#include "cls_lock_types.h" namespace rados { namespace cls { diff --git a/src/cls/lock/cls_lock_ops.cc b/src/cls/lock/cls_lock_ops.cc index 2775e78aec6..3080e743fbb 100644 --- a/src/cls/lock/cls_lock_ops.cc +++ b/src/cls/lock/cls_lock_ops.cc @@ -14,10 +14,10 @@ #include "include/types.h" #include "msg/msg_types.h" + #include "common/Formatter.h" -#include "cls/lock/cls_lock_types.h" -#include "cls/lock/cls_lock_ops.h" +#include "cls_lock_ops.h" using namespace rados::cls::lock; diff --git a/src/cls/lock/cls_lock_ops.h b/src/cls/lock/cls_lock_ops.h index 95f745e5c4b..2a9ba94a280 100644 --- a/src/cls/lock/cls_lock_ops.h +++ b/src/cls/lock/cls_lock_ops.h @@ -3,7 +3,8 @@ #include "include/types.h" #include "include/utime.h" -#include "cls/lock/cls_lock_types.h" + +#include "cls_lock_types.h" struct cls_lock_lock_op { diff --git a/src/cls/lock/cls_lock_types.cc b/src/cls/lock/cls_lock_types.cc index d60ee51d9fb..758c77bd098 100644 --- a/src/cls/lock/cls_lock_types.cc +++ b/src/cls/lock/cls_lock_types.cc @@ -14,9 +14,10 @@ #include "include/types.h" #include "msg/msg_types.h" + #include "common/Formatter.h" -#include "cls/lock/cls_lock_types.h" +#include "cls_lock_types.h" using namespace rados::cls::lock; diff --git a/src/cls/lock/cls_lock_types.h b/src/cls/lock/cls_lock_types.h index aa60ed142c7..08ca3b412ea 100644 --- a/src/cls/lock/cls_lock_types.h +++ b/src/cls/lock/cls_lock_types.h @@ -1,10 +1,11 @@ #ifndef CEPH_CLS_LOCK_TYPES_H #define CEPH_CLS_LOCK_TYPES_H +#include "msg/msg_types.h" + #include "include/encoding.h" #include "include/types.h" #include "include/utime.h" -#include "msg/msg_types.h" /* lock flags */ #define LOCK_FLAG_RENEW 0x1 /* idempotent lock acquire */ diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc index 7664744f364..b5de365aac0 100644 --- a/src/cls/rbd/cls_rbd.cc +++ b/src/cls/rbd/cls_rbd.cc @@ -26,6 +26,8 @@ * in each one that they take an input and an output bufferlist. */ +#include "include/types.h" + #include <algorithm> #include <cstring> #include <cstdlib> @@ -35,11 +37,10 @@ #include <sstream> #include <vector> -#include "include/types.h" -#include "objclass/objclass.h" #include "include/rbd_types.h" +#include "objclass/objclass.h" -#include "cls/rbd/cls_rbd.h" +#include "cls_rbd.h" /* diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc index 060f8a855db..fe9c7ace05f 100644 --- a/src/cls/rbd/cls_rbd_client.cc +++ b/src/cls/rbd/cls_rbd_client.cc @@ -1,14 +1,16 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "cls/lock/cls_lock_client.h" +#include "include/rbd_types.h" + +#include <errno.h> + #include "include/buffer.h" #include "include/encoding.h" -#include "include/rbd_types.h" -#include "cls_rbd_client.h" +#include "../lock/cls_lock_client.h" -#include <errno.h> +#include "cls_rbd_client.h" namespace librbd { namespace cls_client { diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h index c1d421a43a8..f32d9d90b83 100644 --- a/src/cls/rbd/cls_rbd_client.h +++ b/src/cls/rbd/cls_rbd_client.h @@ -4,15 +4,16 @@ #ifndef CEPH_LIBRBD_CLS_RBD_CLIENT_H #define CEPH_LIBRBD_CLS_RBD_CLIENT_H -#include "cls/lock/cls_lock_types.h" -#include "common/snap_types.h" +#include <string> +#include <vector> + #include "include/rados.h" #include "include/rados/librados.hpp" #include "include/types.h" #include "librbd/parent_types.h" +#include "common/snap_types.h" -#include <string> -#include <vector> +#include "../lock/cls_lock_types.h" namespace librbd { namespace cls_client { diff --git a/src/cls/refcount/cls_refcount_client.cc b/src/cls/refcount/cls_refcount_client.cc index f88ff5edd4b..c009a5ccabd 100644 --- a/src/cls/refcount/cls_refcount_client.cc +++ b/src/cls/refcount/cls_refcount_client.cc @@ -1,11 +1,12 @@ +#include "include/types.h" + #include <errno.h> -#include "include/types.h" -#include "cls/refcount/cls_refcount_ops.h" #include "include/rados/librados.hpp" -using namespace librados; +#include "cls_refcount_ops.h" +using namespace librados; void cls_refcount_get(librados::ObjectWriteOperation& op, const string& tag, bool implicit_ref) { diff --git a/src/cls/refcount/cls_refcount_ops.h b/src/cls/refcount/cls_refcount_ops.h index 6126b8db466..7819bca2b8a 100644 --- a/src/cls/refcount/cls_refcount_ops.h +++ b/src/cls/refcount/cls_refcount_ops.h @@ -4,10 +4,10 @@ #ifndef CEPH_CLS_REFCOUNT_OPS_H #define CEPH_CLS_REFCOUNT_OPS_H -#include <map> - #include "include/types.h" +#include <map> + struct cls_refcount_get_op { string tag; bool implicit_ref; diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc index 577d6637b31..afd38ef2f09 100644 --- a/src/cls/rgw/cls_rgw.cc +++ b/src/cls/rgw/cls_rgw.cc @@ -1,20 +1,20 @@ // -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include <iostream> +#include "include/types.h" +#include <iostream> #include <string.h> #include <stdlib.h> #include <errno.h> -#include "include/types.h" #include "include/utime.h" -#include "objclass/objclass.h" -#include "cls/rgw/cls_rgw_ops.h" #include "common/Clock.h" - +#include "objclass/objclass.h" #include "global/global_context.h" +#include "cls_rgw_ops.h" + CLS_VER(1,0) CLS_NAME(rgw) diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc index aa140bd49b8..2bb1e45c6db 100644 --- a/src/cls/rgw/cls_rgw_client.cc +++ b/src/cls/rgw/cls_rgw_client.cc @@ -1,9 +1,11 @@ +#include "include/types.h" + #include <errno.h> -#include "include/types.h" -#include "cls/rgw/cls_rgw_ops.h" #include "include/rados/librados.hpp" +#include "cls_rgw_ops.h" + using namespace librados; void cls_rgw_bucket_init(ObjectWriteOperation& o) diff --git a/src/cls/rgw/cls_rgw_client.h b/src/cls/rgw/cls_rgw_client.h index 4ab8e902d4f..5dbeaff4bd4 100644 --- a/src/cls/rgw/cls_rgw_client.h +++ b/src/cls/rgw/cls_rgw_client.h @@ -3,6 +3,7 @@ #include "include/types.h" #include "include/rados/librados.hpp" + #include "cls_rgw_types.h" /* bucket index */ diff --git a/src/cls/rgw/cls_rgw_ops.cc b/src/cls/rgw/cls_rgw_ops.cc index e6041592cd3..6d2ce577aee 100644 --- a/src/cls/rgw/cls_rgw_ops.cc +++ b/src/cls/rgw/cls_rgw_ops.cc @@ -1,8 +1,6 @@ - -#include "cls/rgw/cls_rgw_ops.h" - #include "common/Formatter.h" +#include "cls_rgw_ops.h" void rgw_cls_obj_prepare_op::generate_test_instances(list<rgw_cls_obj_prepare_op*>& o) { diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h index 2ba72299fac..4b88c34553d 100644 --- a/src/cls/rgw/cls_rgw_ops.h +++ b/src/cls/rgw/cls_rgw_ops.h @@ -1,10 +1,11 @@ #ifndef CEPH_CLS_RGW_OPS_H #define CEPH_CLS_RGW_OPS_H +#include "include/types.h" + #include <map> -#include "include/types.h" -#include "cls/rgw/cls_rgw_types.h" +#include "cls_rgw_types.h" struct rgw_cls_tag_timeout_op { diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc index 1c40e02922e..ab6dc17eb82 100644 --- a/src/cls/rgw/cls_rgw_types.cc +++ b/src/cls/rgw/cls_rgw_types.cc @@ -1,7 +1,6 @@ - -#include "cls/rgw/cls_rgw_types.h" #include "common/Formatter.h" +#include "cls_rgw_types.h" void rgw_bucket_pending_info::generate_test_instances(list<rgw_bucket_pending_info*>& o) { diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h index 42fcef89e50..36906f454e7 100644 --- a/src/cls/rgw/cls_rgw_types.h +++ b/src/cls/rgw/cls_rgw_types.h @@ -1,9 +1,10 @@ #ifndef CEPH_CLS_RGW_TYPES_H #define CEPH_CLS_RGW_TYPES_H +#include "include/types.h" + #include <map> -#include "include/types.h" #include "include/utime.h" #define CEPH_RGW_REMOVE 'r' diff --git a/src/cls_acl.cc b/src/cls_acl.cc index d3c774d5b93..6fb3a884ccb 100644 --- a/src/cls_acl.cc +++ b/src/cls_acl.cc @@ -1,18 +1,15 @@ - +#include "include/types.h" #include <iostream> #include <string.h> #include <stdlib.h> #include <errno.h> - #include <openssl/md5.h> #include <openssl/sha.h> -#include "include/types.h" #include "objclass/objclass.h" - CLS_VER(1,0) CLS_NAME(acl) diff --git a/src/cls_crypto.cc b/src/cls_crypto.cc index 3f01dd078ba..240dd22ec3b 100644 --- a/src/cls_crypto.cc +++ b/src/cls_crypto.cc @@ -1,18 +1,14 @@ - - +#include "include/types.h" #include <iostream> #include <string.h> #include <stdlib.h> #include <errno.h> - #include <openssl/md5.h> #include <openssl/sha.h> -#include "include/types.h" #include "objclass/objclass.h" - CLS_VER(1,0) CLS_NAME(crypto) diff --git a/src/common/BackTrace.cc b/src/common/BackTrace.cc index ebbb33c0145..fcbc0fe1153 100644 --- a/src/common/BackTrace.cc +++ b/src/common/BackTrace.cc @@ -1,13 +1,13 @@ +#include "acconfig.h" #include <ostream> #include <cxxabi.h> #include <stdlib.h> #include <string.h> -#include "BackTrace.h" - #include "common/version.h" -#include "acconfig.h" + +#include "BackTrace.h" #define _STR(x) #x #define STRINGIFY(x) _STR(x) diff --git a/src/common/Clock.cc b/src/common/Clock.cc index 9b6554a8e9d..a6e23d509fa 100644 --- a/src/common/Clock.cc +++ b/src/common/Clock.cc @@ -12,13 +12,10 @@ * */ - -#include "common/Clock.h" #include "common/ceph_context.h" #include "common/config.h" -#include "include/utime.h" -#include <time.h> +#include "Clock.h" utime_t ceph_clock_now(CephContext *cct) { diff --git a/src/common/Clock.h b/src/common/Clock.h index bdcb0d15530..42e36eca57c 100644 --- a/src/common/Clock.h +++ b/src/common/Clock.h @@ -15,10 +15,10 @@ #ifndef CEPH_CLOCK_H #define CEPH_CLOCK_H -#include "include/utime.h" - #include <time.h> +#include "include/utime.h" + class CephContext; extern utime_t ceph_clock_now(CephContext *cct); diff --git a/src/common/Cond.h b/src/common/Cond.h index ee95a65b5b6..360a2722862 100644 --- a/src/common/Cond.h +++ b/src/common/Cond.h @@ -16,14 +16,12 @@ #ifndef CEPH_COND_H #define CEPH_COND_H +#include <pthread.h> #include <time.h> -#include "Mutex.h" -#include "Clock.h" - #include "include/Context.h" - -#include <pthread.h> +#include "common/Mutex.h" +#include "common/Clock.h" class Cond { // my bits diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc index 147cdc2fb60..397c850c756 100644 --- a/src/common/ConfUtils.cc +++ b/src/common/ConfUtils.cc @@ -15,7 +15,6 @@ #include <algorithm> #include <errno.h> #include <list> -#include <map> #include <sstream> #include <stdio.h> #include <stdlib.h> @@ -25,10 +24,10 @@ #include <sys/types.h> #include <unistd.h> -#include "include/buffer.h" #include "common/errno.h" #include "common/utf8.h" -#include "common/ConfUtils.h" + +#include "ConfUtils.h" using std::cerr; using std::ostringstream; diff --git a/src/common/DecayCounter.h b/src/common/DecayCounter.h index fa6f85f49b0..80664627ad0 100644 --- a/src/common/DecayCounter.h +++ b/src/common/DecayCounter.h @@ -15,10 +15,10 @@ #ifndef CEPH_DECAYCOUNTER_H #define CEPH_DECAYCOUNTER_H -#include "include/utime.h" - #include <math.h> +#include "include/utime.h" + /** * * TODO: normalize value based on some fucntion of half_life, diff --git a/src/common/Finisher.cc b/src/common/Finisher.cc index c2029f2d668..7a7223e2cfb 100644 --- a/src/common/Finisher.cc +++ b/src/common/Finisher.cc @@ -2,9 +2,10 @@ // vim: ts=8 sw=2 smarttab #include "common/config.h" +#include "common/debug.h" + #include "Finisher.h" -#include "common/debug.h" #define dout_subsys ceph_subsys_finisher #undef dout_prefix #define dout_prefix *_dout << "finisher(" << this << ") " diff --git a/src/common/Formatter.cc b/src/common/Formatter.cc index 305aa3bc466..1f882682050 100644 --- a/src/common/Formatter.cc +++ b/src/common/Formatter.cc @@ -14,18 +14,15 @@ #define LARGE_SIZE 1024 -#include "assert.h" -#include "Formatter.h" -#include "common/escape.h" - -#include <inttypes.h> -#include <iostream> -#include <sstream> -#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <vector> +#include "include/assert.h" +#include "common/escape.h" + +#include "Formatter.h" + // ----------------------- namespace ceph { diff --git a/src/common/Formatter.h b/src/common/Formatter.h index 5c6bb573d23..b2567c20f4d 100644 --- a/src/common/Formatter.h +++ b/src/common/Formatter.h @@ -1,8 +1,8 @@ #ifndef CEPH_FORMATTER_H #define CEPH_FORMATTER_H -#include <deque> #include <inttypes.h> +#include <deque> #include <iostream> #include <list> #include <ostream> diff --git a/src/common/HeartbeatMap.cc b/src/common/HeartbeatMap.cc index 48e6e021fc9..55107dd8af7 100644 --- a/src/common/HeartbeatMap.cc +++ b/src/common/HeartbeatMap.cc @@ -18,11 +18,12 @@ #include <fcntl.h> #include <errno.h> -#include "HeartbeatMap.h" -#include "ceph_context.h" +#include "common/ceph_context.h" #include "common/errno.h" +#include "common/debug.h" + +#include "HeartbeatMap.h" -#include "debug.h" #define dout_subsys ceph_subsys_heartbeatmap #undef dout_prefix #define dout_prefix *_dout << "heartbeat_map " diff --git a/src/common/HeartbeatMap.h b/src/common/HeartbeatMap.h index e6d736f61a1..ce82923b649 100644 --- a/src/common/HeartbeatMap.h +++ b/src/common/HeartbeatMap.h @@ -16,13 +16,12 @@ #define CEPH_HEARTBEATMAP_H #include <pthread.h> - #include <string> #include <list> #include "include/atomic.h" -#include "RWLock.h" +#include "common/RWLock.h" class CephContext; diff --git a/src/common/LogClient.cc b/src/common/LogClient.cc index 0dce8bd69a0..b8ddcb98388 100644 --- a/src/common/LogClient.cc +++ b/src/common/LogClient.cc @@ -12,17 +12,8 @@ * */ - - #include "include/types.h" -#include "msg/Messenger.h" -#include "msg/Message.h" - -#include "messages/MLog.h" -#include "messages/MLogAck.h" -#include "mon/MonMap.h" - #include <iostream> #include <errno.h> #include <sys/stat.h> @@ -33,9 +24,14 @@ #include <sys/mount.h> #endif // DARWIN -#include "common/LogClient.h" - #include "common/config.h" +#include "msg/Messenger.h" +#include "mon/MonMap.h" + +#include "messages/MLog.h" +#include "messages/MLogAck.h" + +#include "LogClient.h" #define dout_subsys ceph_subsys_monc diff --git a/src/common/LogClient.h b/src/common/LogClient.h index 8fa7bd14ce6..b254961f222 100644 --- a/src/common/LogClient.h +++ b/src/common/LogClient.h @@ -15,12 +15,12 @@ #ifndef CEPH_LOGCLIENT_H #define CEPH_LOGCLIENT_H -#include "common/LogEntry.h" -#include "common/Mutex.h" - #include <iosfwd> #include <sstream> +#include "common/LogEntry.h" +#include "common/Mutex.h" + class LogClient; class MLog; class MLogAck; diff --git a/src/common/LogEntry.cc b/src/common/LogEntry.cc index 80801bcf3a3..7aa50786c72 100644 --- a/src/common/LogEntry.cc +++ b/src/common/LogEntry.cc @@ -1,9 +1,9 @@ #include <syslog.h> -#include "LogEntry.h" -#include "Formatter.h" +#include "common/Formatter.h" +#include "LogEntry.h" int clog_type_to_syslog_prio(clog_type t) { diff --git a/src/common/LogEntry.h b/src/common/LogEntry.h index cea68013016..1c17b50e9a4 100644 --- a/src/common/LogEntry.h +++ b/src/common/LogEntry.h @@ -16,9 +16,10 @@ #define CEPH_LOGENTRY_H #include "include/types.h" +#include "msg/msg_types.h" // for entity_inst_t + #include "include/utime.h" #include "include/encoding.h" -#include "msg/msg_types.h" // for entity_inst_t namespace ceph { class Formatter; diff --git a/src/common/MemoryModel.cc b/src/common/MemoryModel.cc index b21ed6133bc..8b2e36721b6 100644 --- a/src/common/MemoryModel.cc +++ b/src/common/MemoryModel.cc @@ -1,11 +1,12 @@ - #include "include/types.h" -#include "MemoryModel.h" -#include "common/config.h" -#include "debug.h" #include <fstream> +#include "common/config.h" +#include "common/debug.h" + +#include "MemoryModel.h" + #define dout_subsys ceph_subsys_ MemoryModel::MemoryModel(CephContext *cct_) diff --git a/src/common/Mutex.cc b/src/common/Mutex.cc index 235086470a7..faffbc346e6 100644 --- a/src/common/Mutex.cc +++ b/src/common/Mutex.cc @@ -11,16 +11,17 @@ * Foundation. See file COPYING. * */ -using namespace std; #include <string> -#include "common/Mutex.h" +#include "include/utime.h" #include "common/perf_counters.h" -#include "common/ceph_context.h" #include "common/config.h" -#include "include/utime.h" #include "common/Clock.h" +#include "Mutex.h" + +using namespace std; + Mutex::Mutex(const char *n, bool r, bool ld, bool bt, CephContext *cct) : diff --git a/src/common/Mutex.h b/src/common/Mutex.h index 06e435d49df..cf81dfd514e 100644 --- a/src/common/Mutex.h +++ b/src/common/Mutex.h @@ -15,12 +15,12 @@ #ifndef CEPH_MUTEX_H #define CEPH_MUTEX_H +#include <pthread.h> + #include "include/assert.h" -#include "lockdep.h" +#include "common/lockdep.h" #include "common/ceph_context.h" -#include <pthread.h> - using namespace ceph; class PerfCounters; diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc index 353596fe830..3832d23d784 100644 --- a/src/common/OutputDataSocket.cc +++ b/src/common/OutputDataSocket.cc @@ -11,34 +11,30 @@ * Foundation. See file COPYING. * */ - -#include "common/Thread.h" -#include "common/OutputDataSocket.h" -#include "common/config.h" -#include "common/debug.h" -#include "common/errno.h" -#include "common/perf_counters.h" -#include "common/pipe.h" -#include "common/safe_io.h" -#include "common/version.h" -#include "common/Formatter.h" - +#include <inttypes.h> #include <errno.h> #include <fcntl.h> -#include <inttypes.h> -#include <map> #include <poll.h> #include <set> #include <sstream> #include <stdint.h> #include <string.h> -#include <string> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> #include <unistd.h> #include "include/compat.h" +#include "common/config.h" +#include "common/debug.h" +#include "common/errno.h" +#include "common/perf_counters.h" +#include "common/pipe.h" +#include "common/safe_io.h" +#include "common/version.h" +#include "common/Formatter.h" + +#include "OutputDataSocket.h" #define dout_subsys ceph_subsys_asok #undef dout_prefix diff --git a/src/common/OutputDataSocket.h b/src/common/OutputDataSocket.h index f581a56bf03..03f99766303 100644 --- a/src/common/OutputDataSocket.h +++ b/src/common/OutputDataSocket.h @@ -15,14 +15,14 @@ #ifndef CEPH_COMMON_OUTPUTDATASOCKET_H #define CEPH_COMMON_OUTPUTDATASOCKET_H -#include "common/Thread.h" -#include "common/Mutex.h" -#include "common/Cond.h" - #include <string> #include <map> #include <list> + #include "include/buffer.h" +#include "common/Thread.h" +#include "common/Mutex.h" +#include "common/Cond.h" class CephContext; diff --git a/src/common/PrebufferedStreambuf.cc b/src/common/PrebufferedStreambuf.cc index d6db8bbe0af..4b8a9288395 100644 --- a/src/common/PrebufferedStreambuf.cc +++ b/src/common/PrebufferedStreambuf.cc @@ -1,5 +1,5 @@ -#include "common/PrebufferedStreambuf.h" +#include "PrebufferedStreambuf.h" PrebufferedStreambuf::PrebufferedStreambuf(char *buf, size_t len) : m_buf(buf), m_buf_len(len) diff --git a/src/common/RWLock.h b/src/common/RWLock.h index f8915ed288e..847f62b5af4 100644 --- a/src/common/RWLock.h +++ b/src/common/RWLock.h @@ -18,7 +18,8 @@ #define CEPH_RWLock_Posix__H #include <pthread.h> -#include "lockdep.h" + +#include "common/lockdep.h" class RWLock { diff --git a/src/common/RefCountedObj.cc b/src/common/RefCountedObj.cc index 236a2b11ffd..9c8b8418b6b 100644 --- a/src/common/RefCountedObj.cc +++ b/src/common/RefCountedObj.cc @@ -12,7 +12,7 @@ * */ -#include "common/RefCountedObj.h" +#include "RefCountedObj.h" void intrusive_ptr_add_ref(RefCountedObject *p) { p->get(); diff --git a/src/common/RefCountedObj.h b/src/common/RefCountedObj.h index 4bbbc8dfa61..0cd6b8f969c 100644 --- a/src/common/RefCountedObj.h +++ b/src/common/RefCountedObj.h @@ -15,10 +15,9 @@ #ifndef CEPH_REFCOUNTEDOBJ_H #define CEPH_REFCOUNTEDOBJ_H +#include "include/atomic.h" #include "common/Mutex.h" #include "common/Cond.h" -#include "include/atomic.h" - struct RefCountedObject { atomic_t nref; diff --git a/src/common/TextTable.h b/src/common/TextTable.h index 44d0aa4cd46..f1e6235d39b 100644 --- a/src/common/TextTable.h +++ b/src/common/TextTable.h @@ -15,6 +15,7 @@ #include <sstream> #include <iomanip> #include <string> + #include "include/assert.h" /** diff --git a/src/common/Thread.cc b/src/common/Thread.cc index 0f4e322b27a..4d18e7cc069 100644 --- a/src/common/Thread.cc +++ b/src/common/Thread.cc @@ -12,21 +12,20 @@ * */ -#include "common/Thread.h" -#include "common/code_environment.h" -#include "common/debug.h" -#include "common/signal.h" - #include <dirent.h> #include <errno.h> #include <iostream> -#include <pthread.h> #include <signal.h> #include <sstream> #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include "common/code_environment.h" +#include "common/debug.h" +#include "common/signal.h" + +#include "Thread.h" Thread::Thread() : thread_id(0) diff --git a/src/common/Throttle.cc b/src/common/Throttle.cc index 796f0c5c4fc..758178d835c 100644 --- a/src/common/Throttle.cc +++ b/src/common/Throttle.cc @@ -1,9 +1,9 @@ - -#include "common/Throttle.h" #include "common/debug.h" #include "common/ceph_context.h" #include "common/perf_counters.h" +#include "Throttle.h" + #define dout_subsys ceph_subsys_throttle #undef dout_prefix diff --git a/src/common/Throttle.h b/src/common/Throttle.h index e1fbcb494c7..8ff2c13b6a7 100644 --- a/src/common/Throttle.h +++ b/src/common/Throttle.h @@ -1,10 +1,11 @@ #ifndef CEPH_THROTTLE_H #define CEPH_THROTTLE_H -#include "Mutex.h" -#include "Cond.h" #include <list> + #include "include/atomic.h" +#include "common/Mutex.h" +#include "common/Cond.h" class CephContext; class PerfCounters; diff --git a/src/common/Timer.cc b/src/common/Timer.cc index ac0550c768f..1b560c3033e 100644 --- a/src/common/Timer.cc +++ b/src/common/Timer.cc @@ -12,24 +12,21 @@ * */ -#include "Cond.h" -#include "Mutex.h" -#include "Thread.h" -#include "Timer.h" +#include <sstream> +#include <signal.h> +#include <sys/time.h> +#include <math.h> -#include "common/config.h" #include "include/Context.h" +#include "common/config.h" +#include "common/Thread.h" + +#include "Timer.h" #define dout_subsys ceph_subsys_timer #undef dout_prefix #define dout_prefix *_dout << "timer(" << this << ")." -#include <sstream> -#include <signal.h> -#include <sys/time.h> -#include <math.h> - - class SafeTimerThread : public Thread { SafeTimer *parent; public: diff --git a/src/common/Timer.h b/src/common/Timer.h index 40d5015e18b..de89de60e80 100644 --- a/src/common/Timer.h +++ b/src/common/Timer.h @@ -15,11 +15,11 @@ #ifndef CEPH_TIMER_H #define CEPH_TIMER_H -#include "Cond.h" -#include "Mutex.h" - #include <map> +#include "common/Cond.h" +#include "common/Mutex.h" + class CephContext; class Context; class SafeTimerThread; diff --git a/src/common/WorkQueue.cc b/src/common/WorkQueue.cc index f2fc1747a9b..5d169b57108 100644 --- a/src/common/WorkQueue.cc +++ b/src/common/WorkQueue.cc @@ -11,16 +11,16 @@ * Foundation. See file COPYING. * */ +#include "include/types.h" #include <sstream> -#include "include/types.h" #include "include/utime.h" -#include "WorkQueue.h" - #include "common/config.h" #include "common/HeartbeatMap.h" +#include "WorkQueue.h" + #define dout_subsys ceph_subsys_tp #undef dout_prefix #define dout_prefix *_dout << name << " " diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h index 2475b45d1ac..1b0ceac3c16 100644 --- a/src/common/WorkQueue.h +++ b/src/common/WorkQueue.h @@ -15,9 +15,9 @@ #ifndef CEPH_WORKQUEUE_H #define CEPH_WORKQUEUE_H -#include "Mutex.h" -#include "Cond.h" -#include "Thread.h" +#include "common/Mutex.h" +#include "common/Cond.h" +#include "common/Thread.h" #include "common/config_obs.h" class CephContext; diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc index 428f863fa9f..06e62d7f0e1 100644 --- a/src/common/admin_socket.cc +++ b/src/common/admin_socket.cc @@ -12,33 +12,31 @@ * */ -#include "common/Thread.h" -#include "common/admin_socket.h" -#include "common/config.h" -#include "common/debug.h" -#include "common/errno.h" -#include "common/perf_counters.h" -#include "common/pipe.h" -#include "common/safe_io.h" -#include "common/version.h" -#include "common/Formatter.h" - #include <errno.h> #include <fcntl.h> #include <inttypes.h> -#include <map> #include <poll.h> #include <set> #include <sstream> #include <stdint.h> #include <string.h> -#include <string> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> #include <unistd.h> #include "include/compat.h" +#include "common/Thread.h" +#include "common/config.h" +#include "common/debug.h" +#include "common/errno.h" +#include "common/perf_counters.h" +#include "common/pipe.h" +#include "common/safe_io.h" +#include "common/version.h" +#include "common/Formatter.h" + +#include "admin_socket.h" #define dout_subsys ceph_subsys_asok #undef dout_prefix diff --git a/src/common/admin_socket.h b/src/common/admin_socket.h index 6154f50cabe..e0e06f0b6a6 100644 --- a/src/common/admin_socket.h +++ b/src/common/admin_socket.h @@ -15,12 +15,12 @@ #ifndef CEPH_COMMON_ADMIN_SOCKET_H #define CEPH_COMMON_ADMIN_SOCKET_H -#include "common/Thread.h" -#include "common/Mutex.h" - #include <string> #include <map> + #include "include/buffer.h" +#include "common/Thread.h" +#include "common/Mutex.h" class AdminSocket; class CephContext; diff --git a/src/common/admin_socket_client.cc b/src/common/admin_socket_client.cc index 782e808ad86..ec66161f0a1 100644 --- a/src/common/admin_socket_client.cc +++ b/src/common/admin_socket_client.cc @@ -12,12 +12,6 @@ * */ -#include "common/admin_socket.h" -#include "common/ceph_context.h" -#include "common/errno.h" -#include "common/safe_io.h" -#include "common/admin_socket_client.h" - #include <arpa/inet.h> #include <errno.h> #include <fcntl.h> @@ -25,11 +19,9 @@ #include <map> #include <poll.h> #include <sstream> -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <string> #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> @@ -37,6 +29,13 @@ #include <unistd.h> #include <vector> +#include "common/admin_socket.h" +#include "common/ceph_context.h" +#include "common/errno.h" +#include "common/safe_io.h" + +#include "common/admin_socket_client.h" + using std::ostringstream; const char* get_rand_socket_path() diff --git a/src/common/assert.cc b/src/common/assert.cc index 7889ad043a6..6b4958d4990 100644 --- a/src/common/assert.cc +++ b/src/common/assert.cc @@ -11,20 +11,19 @@ * Foundation. See file COPYING. * */ - -#include "BackTrace.h" -#include "common/ceph_context.h" -#include "common/config.h" -#include "common/debug.h" -#include "common/Clock.h" -#include "include/assert.h" - #include <errno.h> #include <iostream> #include <pthread.h> #include <sstream> #include <time.h> +#include "include/assert.h" +#include "common/ceph_context.h" +#include "common/config.h" +#include "common/debug.h" +#include "common/Clock.h" +#include "common/BackTrace.h" + namespace ceph { static CephContext *g_assert_context = NULL; diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc index 22b0aa67b3e..bc2307baacd 100644 --- a/src/common/blkdev.cc +++ b/src/common/blkdev.cc @@ -1,20 +1,20 @@ +#include "acconfig.h" + #include <inttypes.h> #include <fcntl.h> #include <sys/ioctl.h> #include <errno.h> - #include <sys/types.h> #include <sys/stat.h> #include <sys/mount.h> #include <iostream> -#include "acconfig.h" -#include "include/compat.h" - #if defined(__FreeBSD__) #include <sys/disk.h> #endif +#include "include/compat.h" + int get_block_device_size(int fd, int64_t *psize) { int ret = 0; diff --git a/src/common/buffer.cc b/src/common/buffer.cc index b2d3ec6ed8c..9caba6aead2 100644 --- a/src/common/buffer.cc +++ b/src/common/buffer.cc @@ -11,16 +11,7 @@ * Foundation. See file COPYING. * */ - - -#include "armor.h" -#include "common/environment.h" -#include "common/errno.h" -#include "common/safe_io.h" -#include "common/simple_spin.h" -#include "include/atomic.h" #include "include/types.h" -#include "include/compat.h" #include <errno.h> #include <fstream> @@ -28,6 +19,14 @@ #include <sys/uio.h> #include <limits.h> +#include "include/atomic.h" +#include "include/compat.h" +#include "common/environment.h" +#include "common/errno.h" +#include "common/safe_io.h" +#include "common/simple_spin.h" +#include "common/armor.h" + namespace ceph { #ifdef BUFFER_DEBUG diff --git a/src/common/ceph_argparse.cc b/src/common/ceph_argparse.cc index 646931acdc9..5b318103664 100644 --- a/src/common/ceph_argparse.cc +++ b/src/common/ceph_argparse.cc @@ -11,16 +11,6 @@ * Foundation. See file COPYING. * */ - -#include "auth/Auth.h" -#include "common/ConfUtils.h" -#include "common/ceph_argparse.h" -#include "common/common_init.h" -#include "common/config.h" -#include "common/strtol.h" -#include "common/version.h" -#include "include/intarith.h" -#include "include/str_list.h" #include "msg/msg_types.h" #include <errno.h> @@ -31,6 +21,17 @@ #include <sstream> #include <vector> +#include "include/intarith.h" +#include "include/str_list.h" +#include "common/ConfUtils.h" +#include "common/common_init.h" +#include "common/config.h" +#include "common/strtol.h" +#include "common/version.h" +#include "auth/Auth.h" + +#include "ceph_argparse.h" + /* * Ceph argument parsing library * diff --git a/src/common/ceph_argparse.h b/src/common/ceph_argparse.h index fd9439c5627..9cf7dc58beb 100644 --- a/src/common/ceph_argparse.h +++ b/src/common/ceph_argparse.h @@ -22,6 +22,7 @@ * Until we do that, though, this file is the place for argv parsing * stuff to live. */ +#include "msg/msg_types.h" #include <deque> #include <stdint.h> @@ -29,7 +30,6 @@ #include <vector> #include "common/entity_name.h" -#include "msg/msg_types.h" /////////////////////// Types /////////////////////// class CephInitParameters diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc index decf86db70a..f40623ef664 100644 --- a/src/common/ceph_context.cc +++ b/src/common/ceph_context.cc @@ -13,23 +13,22 @@ */ #include <time.h> +#include <pthread.h> +#include <semaphore.h> #include "common/admin_socket.h" #include "common/perf_counters.h" #include "common/Thread.h" -#include "common/ceph_context.h" #include "common/config.h" #include "common/debug.h" #include "common/HeartbeatMap.h" #include "common/errno.h" #include "common/lockdep.h" #include "common/Formatter.h" -#include "log/Log.h" #include "auth/Crypto.h" +#include "log/Log.h" -#include <iostream> -#include <pthread.h> -#include <semaphore.h> +#include "ceph_context.h" using ceph::HeartbeatMap; diff --git a/src/common/ceph_crypto.cc b/src/common/ceph_crypto.cc index 3f04349c20b..9d866ac728f 100644 --- a/src/common/ceph_crypto.cc +++ b/src/common/ceph_crypto.cc @@ -12,13 +12,14 @@ * */ +#include <pthread.h> +#include <stdlib.h> + #include "common/config.h" #include "common/ceph_context.h" -#include "ceph_crypto.h" #include "auth/Crypto.h" -#include <pthread.h> -#include <stdlib.h> +#include "ceph_crypto.h" void ceph::crypto::shutdown(); diff --git a/src/common/ceph_crypto.h b/src/common/ceph_crypto.h index c55359431d4..33349c9af9c 100644 --- a/src/common/ceph_crypto.h +++ b/src/common/ceph_crypto.h @@ -10,7 +10,7 @@ #ifdef USE_CRYPTOPP # define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1 -#include <string.h> +# include <string.h> # include <cryptopp/md5.h> # include <cryptopp/sha.h> # include <cryptopp/hmac.h> diff --git a/src/common/ceph_crypto_cms.cc b/src/common/ceph_crypto_cms.cc index 4d7a4ef598b..675a9c3a7a7 100644 --- a/src/common/ceph_crypto_cms.cc +++ b/src/common/ceph_crypto_cms.cc @@ -34,31 +34,23 @@ * * ***** END LICENSE BLOCK ***** */ - -#include "common/config.h" +#include <string.h> +#include <errno.h> #ifdef USE_NSS - #include <nspr.h> #include <cert.h> #include <nss.h> #include <smime.h> - #endif -#include <string.h> -#include <errno.h> - - -#include "include/buffer.h" - +#include "common/config.h" #include "common/debug.h" #include "ceph_crypto_cms.h" #define dout_subsys ceph_subsys_crypto - #ifndef USE_NSS int ceph_decode_cms(CephContext *cct, bufferlist& cms_bl, bufferlist& decoded_bl) diff --git a/src/common/code_environment.cc b/src/common/code_environment.cc index 58b27f86049..cf5db9b5481 100644 --- a/src/common/code_environment.cc +++ b/src/common/code_environment.cc @@ -12,17 +12,18 @@ * */ -#include "common/code_environment.h" - #include <errno.h> #include <iostream> #include <stdlib.h> #include <string.h> #include <string> + #if defined(__linux__) #include <sys/prctl.h> #endif +#include "code_environment.h" + code_environment_t g_code_env = CODE_ENVIRONMENT_UTILITY; extern "C" const char *code_environment_to_str(enum code_environment_t e) diff --git a/src/common/common_init.cc b/src/common/common_init.cc index defde28b22e..54ad4e293ff 100644 --- a/src/common/common_init.cc +++ b/src/common/common_init.cc @@ -11,21 +11,19 @@ * Foundation. See file COPYING. * */ +#include <errno.h> +#include "include/color.h" #include "common/ceph_argparse.h" #include "common/ceph_context.h" #include "common/ceph_crypto.h" -#include "common/code_environment.h" -#include "common/common_init.h" #include "common/config.h" #include "common/debug.h" #include "common/errno.h" #include "common/safe_io.h" #include "common/version.h" -#include "include/color.h" -#include <errno.h> -#include <deque> +#include "common_init.h" #define dout_subsys ceph_subsys_ diff --git a/src/common/config.cc b/src/common/config.cc index 0e86b792ae9..aa0f0adb15a 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -11,29 +11,28 @@ * Foundation. See file COPYING. * */ +#include "include/types.h" -#include "auth/Auth.h" -#include "common/ConfUtils.h" +#include <errno.h> +#include <sstream> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "include/str_list.h" +#include "include/stringify.h" +#include "include/assert.h" #include "common/ceph_argparse.h" #include "common/common_init.h" -#include "common/config.h" #include "common/static_assert.h" #include "common/strtol.h" #include "common/version.h" -#include "include/str_list.h" -#include "include/types.h" -#include "include/stringify.h" +#include "auth/Auth.h" #include "msg/msg_types.h" #include "osd/osd_types.h" -#include "include/assert.h" - -#include <errno.h> -#include <sstream> -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> -#include <sys/types.h> +#include "config.h" /* Don't use standard Ceph logging in this file. * We can't use logging until it's initialized, and a lot of the necessary diff --git a/src/common/config.h b/src/common/config.h index 86d240f4ce6..e735e030ccf 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -17,6 +17,8 @@ extern struct ceph_file_layout g_default_file_layout; +#include "msg/msg_types.h" + #include <iosfwd> #include <vector> #include <map> @@ -25,9 +27,8 @@ extern struct ceph_file_layout g_default_file_layout; #include "common/ConfUtils.h" #include "common/entity_name.h" #include "common/Mutex.h" -#include "log/SubsystemMap.h" #include "common/config_obs.h" -#include "msg/msg_types.h" +#include "log/SubsystemMap.h" #define OSD_REP_PRIMARY 0 #define OSD_REP_SPLAY 1 diff --git a/src/common/debug.cc b/src/common/debug.cc index 4bbbfc8fc23..afa2192e8c1 100644 --- a/src/common/debug.cc +++ b/src/common/debug.cc @@ -1,4 +1,3 @@ - #include <iostream> void dout_emergency(const char * const str) diff --git a/src/common/debug.h b/src/common/debug.h index bf59ec0d21c..0960b760e95 100644 --- a/src/common/debug.h +++ b/src/common/debug.h @@ -16,17 +16,17 @@ #ifndef CEPH_DOUT_H #define CEPH_DOUT_H -#include "common/config.h" -#include "common/likely.h" -#include "common/Clock.h" -#include "log/Log.h" -#include "include/assert.h" - #include <iostream> #include <pthread.h> #include <streambuf> #include <sstream> +#include "include/assert.h" +#include "common/config.h" +#include "common/likely.h" +#include "common/Clock.h" +#include "log/Log.h" + extern void dout_emergency(const char * const str); extern void dout_emergency(const std::string &str); diff --git a/src/common/entity_name.cc b/src/common/entity_name.cc index 2e0b0cb1d9e..a551f33e4c0 100644 --- a/src/common/entity_name.cc +++ b/src/common/entity_name.cc @@ -11,13 +11,14 @@ * Foundation. See file COPYING. * */ - -#include "common/entity_name.h" -#include "include/msgr.h" +#include "include/types.h" #include <errno.h> #include <sstream> -#include <string> + +#include "include/msgr.h" + +#include "entity_name.h" using std::string; diff --git a/src/common/entity_name.h b/src/common/entity_name.h index 550bf1dedc6..f58d02ff84e 100644 --- a/src/common/entity_name.h +++ b/src/common/entity_name.h @@ -15,13 +15,14 @@ #ifndef CEPH_COMMON_ENTITY_NAME_H #define CEPH_COMMON_ENTITY_NAME_H +#include "msg/msg_types.h" + #include <iosfwd> #include <stdint.h> #include <string> #include "include/encoding.h" #include "include/buffer.h" -#include "msg/msg_types.h" /* Represents a Ceph entity name. * diff --git a/src/common/environment.cc b/src/common/environment.cc index a71bb34665f..5e6c28c8636 100644 --- a/src/common/environment.cc +++ b/src/common/environment.cc @@ -12,11 +12,11 @@ * */ -#include "common/environment.h" - #include <stdlib.h> #include <strings.h> +#include "environment.h" + bool get_env_bool(const char *key) { const char *val = getenv(key); diff --git a/src/common/errno.cc b/src/common/errno.cc index a981ab7119a..86dec1c1adf 100644 --- a/src/common/errno.cc +++ b/src/common/errno.cc @@ -1,9 +1,8 @@ -#include "common/errno.h" - #include <sstream> -#include <string> #include <string.h> +#include "errno.h" + std::string cpp_strerror(int err) { char buf[128]; diff --git a/src/common/escape.c b/src/common/escape.c index 585961e02a1..30e202c1968 100644 --- a/src/common/escape.c +++ b/src/common/escape.c @@ -12,11 +12,11 @@ * */ -#include "common/escape.h" - #include <stdio.h> #include <string.h> +#include "escape.h" + /* * Some functions for escaping RGW responses */ diff --git a/src/common/fd.cc b/src/common/fd.cc index 547e0f8e27b..35ae5f89f66 100644 --- a/src/common/fd.cc +++ b/src/common/fd.cc @@ -12,15 +12,15 @@ * */ -#include "fd.h" - #include <sys/types.h> #include <unistd.h> #include <dirent.h> #include <errno.h> -#include "debug.h" -#include "errno.h" +#include "common/debug.h" +#include "common/errno.h" + +#include "fd.h" void dump_open_fds(CephContext *cct) { diff --git a/src/common/fiemap.cc b/src/common/fiemap.cc index 0df12d6e8fd..46d45286737 100644 --- a/src/common/fiemap.cc +++ b/src/common/fiemap.cc @@ -34,6 +34,7 @@ #if defined(__linux__) #include <linux/fs.h> #endif + #include "include/inttypes.h" #include "include/fiemap.h" diff --git a/src/common/hex.cc b/src/common/hex.cc index 24ba6724e87..3b6544c5053 100644 --- a/src/common/hex.cc +++ b/src/common/hex.cc @@ -12,11 +12,11 @@ * */ +#include <stdio.h> + #include "common/debug.h" -#include "common/hex.h" -#include <stdio.h> -#include <string> +#include "hex.h" void hex2str(const char *s, int len, char *buf, int dest_len) { diff --git a/src/common/ipaddr.cc b/src/common/ipaddr.cc index 253a7c67de7..b9cc8c8e60d 100644 --- a/src/common/ipaddr.cc +++ b/src/common/ipaddr.cc @@ -1,9 +1,9 @@ -#include "include/ipaddr.h" #include <arpa/inet.h> #include <stdlib.h> #include <string.h> +#include "include/ipaddr.h" static void netmask_ipv4(const struct in_addr *addr, unsigned int prefix_len, diff --git a/src/common/lockdep.cc b/src/common/lockdep.cc index 44303709a9e..91d3963894e 100644 --- a/src/common/lockdep.cc +++ b/src/common/lockdep.cc @@ -11,14 +11,17 @@ * Foundation. See file COPYING. * */ -#include "BackTrace.h" -#include "Clock.h" +#include "include/types.h" + +#include <ext/hash_map> + +#include "common/BackTrace.h" +#include "common/Clock.h" #include "common/debug.h" #include "common/environment.h" -#include "include/types.h" + #include "lockdep.h" -#include <ext/hash_map> #if defined(__FreeBSD__) && defined(__LP64__) // On FreeBSD pthread_t is a pointer. namespace __gnu_cxx { diff --git a/src/common/mime.c b/src/common/mime.c index 90c19a7684e..3453a0ab8d6 100644 --- a/src/common/mime.c +++ b/src/common/mime.c @@ -11,12 +11,12 @@ * Foundation. See file COPYING. * */ -#include "common/utf8.h" - #include <errno.h> #include <stdio.h> #include <string.h> +#include "common/utf8.h" + int mime_encode_as_qp(const char *input, char *output, int outlen) { int ret = 1; diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc index aa7dcfcbbe5..f8fc0a992eb 100644 --- a/src/common/obj_bencher.cc +++ b/src/common/obj_bencher.cc @@ -14,19 +14,16 @@ * try and bench on a pool you don't have permission to access * it will just loop forever. */ -#include "common/Cond.h" -#include "global/global_context.h" -#include "obj_bencher.h" - #include <iostream> #include <fstream> - #include <cerrno> - #include <stdlib.h> #include <time.h> #include <sstream> +#include "global/global_context.h" + +#include "obj_bencher.h" const std::string BENCH_LASTRUN_METADATA = "benchmark_last_metadata"; const std::string BENCH_PREFIX = "benchmark_data"; diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc index 306ccf430c1..7b580580a64 100644 --- a/src/common/perf_counters.cc +++ b/src/common/perf_counters.cc @@ -11,18 +11,16 @@ * Foundation. See file COPYING. * */ - -#include "common/perf_counters.h" -#include "common/debug.h" -#include "common/errno.h" - -#include <errno.h> #include <inttypes.h> +#include <errno.h> #include <map> #include <sstream> -#include <stdint.h> #include <string.h> -#include <string> + +#include "common/debug.h" +#include "common/errno.h" + +#include "perf_counters.h" using std::ostringstream; diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h index 269a32f2c46..88e8ef45974 100644 --- a/src/common/perf_counters.h +++ b/src/common/perf_counters.h @@ -16,15 +16,15 @@ #ifndef CEPH_COMMON_PERF_COUNTERS_H #define CEPH_COMMON_PERF_COUNTERS_H -#include "common/config_obs.h" -#include "common/Mutex.h" -#include "include/buffer.h" -#include "include/utime.h" - #include <stdint.h> #include <string> #include <vector> +#include "include/buffer.h" +#include "include/utime.h" +#include "common/config_obs.h" +#include "common/Mutex.h" + class CephContext; class PerfCountersBuilder; class PerfCountersCollectionTest; diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc index 38a5751c042..de436517696 100644 --- a/src/common/pick_address.cc +++ b/src/common/pick_address.cc @@ -12,8 +12,6 @@ * */ -#include "common/pick_address.h" - #include <netdb.h> #include <errno.h> @@ -22,6 +20,8 @@ #include "common/debug.h" #include "common/errno.h" +#include "pick_address.h" + #define dout_subsys ceph_subsys_ static const struct sockaddr *find_ip_in_subnet_list(CephContext *cct, diff --git a/src/common/pipe.c b/src/common/pipe.c index 9c01b322f89..7ee7c213679 100644 --- a/src/common/pipe.c +++ b/src/common/pipe.c @@ -12,12 +12,12 @@ * */ -#include "common/pipe.h" - #include <errno.h> #include <fcntl.h> #include <unistd.h> +#include "pipe.h" + int pipe_cloexec(int pipefd[2]) { #if defined(O_CLOEXEC) && !defined(__FreeBSD__) diff --git a/src/common/run_cmd.cc b/src/common/run_cmd.cc index 5f5cc3cca32..ab30bbeb8d1 100644 --- a/src/common/run_cmd.cc +++ b/src/common/run_cmd.cc @@ -12,8 +12,6 @@ * */ -#include "common/errno.h" - #include <errno.h> #include <sstream> #include <stdarg.h> @@ -23,6 +21,8 @@ #include <unistd.h> #include <vector> +#include "common/errno.h" + using std::ostringstream; std::string run_cmd(const char *cmd, ...) diff --git a/src/common/safe_io.c b/src/common/safe_io.c index a7be648ebf4..c896a3274f6 100644 --- a/src/common/safe_io.c +++ b/src/common/safe_io.c @@ -17,7 +17,7 @@ #include <unistd.h> #include <errno.h> -#include "common/safe_io.h" +#include "safe_io.h" ssize_t safe_read(int fd, void *buf, size_t count) { diff --git a/src/common/shared_cache.hpp b/src/common/shared_cache.hpp index 9f912df61f0..7ee80df891e 100644 --- a/src/common/shared_cache.hpp +++ b/src/common/shared_cache.hpp @@ -19,6 +19,7 @@ #include <list> #include <memory> #include <utility> + #include "common/Mutex.h" #include "common/Cond.h" diff --git a/src/common/sharedptr_registry.hpp b/src/common/sharedptr_registry.hpp index bd0c656024d..ee7cdad2785 100644 --- a/src/common/sharedptr_registry.hpp +++ b/src/common/sharedptr_registry.hpp @@ -17,6 +17,7 @@ #include <map> #include <memory> + #include "common/Mutex.h" #include "common/Cond.h" diff --git a/src/common/signal.cc b/src/common/signal.cc index 406ff463567..9d062636904 100644 --- a/src/common/signal.cc +++ b/src/common/signal.cc @@ -12,18 +12,18 @@ * */ +#include <sstream> +#include <stdlib.h> +#include <sys/stat.h> +#include <sys/types.h> + #include "common/BackTrace.h" #include "common/perf_counters.h" -#include "global/pidfile.h" #include "common/debug.h" -#include "common/signal.h" #include "common/config.h" +#include "global/pidfile.h" -#include <signal.h> -#include <sstream> -#include <stdlib.h> -#include <sys/stat.h> -#include <sys/types.h> +#include "signal.h" std::string signal_mask_to_str() { diff --git a/src/common/simple_cache.hpp b/src/common/simple_cache.hpp index 60919fd9731..b1e2a9e33d7 100644 --- a/src/common/simple_cache.hpp +++ b/src/common/simple_cache.hpp @@ -18,6 +18,7 @@ #include <map> #include <list> #include <memory> + #include "common/Mutex.h" #include "common/Cond.h" diff --git a/src/common/simple_spin.cc b/src/common/simple_spin.cc index fc4ac633dea..579a0a14b7b 100644 --- a/src/common/simple_spin.cc +++ b/src/common/simple_spin.cc @@ -12,12 +12,11 @@ * */ -#include "common/simple_spin.h" - #include <stdio.h> -#include <stdint.h> #include <pthread.h> +#include "simple_spin.h" + static uint32_t bar = 13; static uint32_t *foo = &bar; diff --git a/src/common/snap_types.cc b/src/common/snap_types.cc index 6b65d7cbea2..da5bae7df0f 100644 --- a/src/common/snap_types.cc +++ b/src/common/snap_types.cc @@ -1,6 +1,6 @@ +#include "common/Formatter.h" #include "snap_types.h" -#include "common/Formatter.h" void SnapRealmInfo::encode(bufferlist& bl) const { diff --git a/src/common/utf8.c b/src/common/utf8.c index d8e08539198..ab6d700f5fd 100644 --- a/src/common/utf8.c +++ b/src/common/utf8.c @@ -11,11 +11,11 @@ * Foundation. See file COPYING. * */ -#include "common/utf8.h" - #include <stdio.h> #include <string.h> +#include "utf8.h" + #define MAX_UTF8_SZ 6 #define INVALID_UTF8_CHAR 0xfffffffful diff --git a/src/common/version.cc b/src/common/version.cc index 0ca569e9c56..19bb046d25e 100644 --- a/src/common/version.cc +++ b/src/common/version.cc @@ -13,11 +13,12 @@ */ #include "acconfig.h" -#include "ceph_ver.h" -#include "common/version.h" #include <sstream> -#include <string> + +#include "ceph_ver.h" + +#include "version.h" #define _STR(x) #x #define STRINGIFY(x) _STR(x) diff --git a/src/common/xattr.c b/src/common/xattr.c index 239ee02db42..44f84543eae 100644 --- a/src/common/xattr.c +++ b/src/common/xattr.c @@ -25,7 +25,7 @@ #error "Your system is not supported!" #endif -#include "common/xattr.h" +#include "xattr.h" /* * Sets extended attribute on a file. diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc index b290c2ecf02..bb19ccef9ea 100644 --- a/src/crush/CrushCompiler.cc +++ b/src/crush/CrushCompiler.cc @@ -1,19 +1,15 @@ - -#include "CrushCompiler.h" - -#ifndef EBADE -#define EBADE EFTYPE -#endif - #include <iostream> #include <stack> -#include <functional> #include <string> #include <stdexcept> #include <map> +#include <typeinfo> +#include "CrushCompiler.h" -#include <typeinfo> +#ifndef EBADE +#define EBADE EFTYPE +#endif // ------------- diff --git a/src/crush/CrushCompiler.h b/src/crush/CrushCompiler.h index d488735bb9e..5e54a7f99bd 100644 --- a/src/crush/CrushCompiler.h +++ b/src/crush/CrushCompiler.h @@ -4,13 +4,13 @@ #ifndef CEPH_CRUSH_COMPILER_H #define CEPH_CRUSH_COMPILER_H -#include "crush/CrushWrapper.h" -#include "crush/grammar.h" - #include <map> #include <ostream> #include <functional> +#include "CrushWrapper.h" +#include "grammar.h" + class CrushCompiler { CrushWrapper& crush; ostream& err; diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc index a659787e4f1..95129123966 100644 --- a/src/crush/CrushTester.cc +++ b/src/crush/CrushTester.cc @@ -1,8 +1,6 @@ - -#include "CrushTester.h" - #include <stdlib.h> +#include "CrushTester.h" void CrushTester::set_device_weight(int dev, float f) { diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h index f77991cc314..f21ae376774 100644 --- a/src/crush/CrushWrapper.h +++ b/src/crush/CrushWrapper.h @@ -4,14 +4,18 @@ #ifndef CEPH_CRUSH_WRAPPER_H #define CEPH_CRUSH_WRAPPER_H +#include "include/types.h" + #include <stdlib.h> #include <map> #include <set> #include <string> - #include <iostream> //for testing, remove -#include "include/types.h" +#include "include/assert.h" +#include "include/err.h" +#include "include/encoding.h" +#include "common/Mutex.h" extern "C" { #include "crush.h" @@ -20,13 +24,6 @@ extern "C" { #include "builder.h" } -#include "include/err.h" -#include "include/encoding.h" - - -#include "common/Mutex.h" - -#include "include/assert.h" #define BUG_ON(x) assert(!(x)) namespace ceph { diff --git a/src/crush/builder.c b/src/crush/builder.c index 880c8090243..a4ef5c9c7a5 100644 --- a/src/crush/builder.c +++ b/src/crush/builder.c @@ -6,9 +6,10 @@ #include <assert.h> #include <errno.h> -#include "builder.h" #include "hash.h" +#include "builder.h" + #define BUG_ON(x) assert(!(x)) struct crush_map *crush_create() diff --git a/src/crush/grammar.h b/src/crush/grammar.h index bb37fed428c..d5d90a7a7ec 100644 --- a/src/crush/grammar.h +++ b/src/crush/grammar.h @@ -27,6 +27,7 @@ #include <boost/spirit/include/classic_ast.hpp> #include <boost/spirit/include/classic_tree_to_xml.hpp> #endif + using namespace boost::spirit; struct crush_grammar : public grammar<crush_grammar> diff --git a/src/crush/hash.c b/src/crush/hash.c index 9f7f3257ebd..e647d333e3c 100644 --- a/src/crush/hash.c +++ b/src/crush/hash.c @@ -5,6 +5,7 @@ #include <sys/types.h> #include "include/inttypes.h" #endif + #include "hash.h" /* diff --git a/src/crush/hash.h b/src/crush/hash.h index 91e884230d5..900bfd873d1 100644 --- a/src/crush/hash.h +++ b/src/crush/hash.h @@ -1,6 +1,13 @@ #ifndef CEPH_CRUSH_HASH_H #define CEPH_CRUSH_HASH_H +#if defined(__linux__) +#include <linux/types.h> +#elif defined(__FreeBSD__) +#include <sys/types.h> +#include "include/inttypes.h" +#endif + #define CRUSH_HASH_RJENKINS1 0 #define CRUSH_HASH_DEFAULT CRUSH_HASH_RJENKINS1 diff --git a/src/crushtool.cc b/src/crushtool.cc index 0bf63de8437..b2e6580c55e 100644 --- a/src/crushtool.cc +++ b/src/crushtool.cc @@ -16,32 +16,28 @@ #include <sys/stat.h> #include <fcntl.h> #include <errno.h> - #include <fstream> +#include "include/assert.h" #include "common/errno.h" #include "common/config.h" - #include "common/ceph_argparse.h" -#include "global/global_context.h" -#include "global/global_init.h" -#include "global/debug.h" #include "crush/CrushWrapper.h" #include "crush/CrushCompiler.h" #include "crush/CrushTester.h" -#include "include/assert.h" - -#define dout_subsys ceph_subsys_crush +#include "global/global_context.h" +#include "global/global_init.h" +#include "global/debug.h" using namespace std; +#define dout_subsys ceph_subsys_crush + void usage(); void data_analysis(); - const char *infn = "stdin"; - //////////////////////////////////////////////////////////////////////////// void data_analysis_usage() diff --git a/src/dupstore.cc b/src/dupstore.cc index fb0125c3b95..202bb1f219f 100644 --- a/src/dupstore.cc +++ b/src/dupstore.cc @@ -13,12 +13,13 @@ */ #include <iostream> -#include "os/FileStore.h" +#include <ext/hash_map> + #include "common/ceph_argparse.h" +#include "os/FileStore.h" #include "global/global_context.h" #include "global/global_init.h" -#include <ext/hash_map> using __gnu_cxx::hash_map; int dupstore(ObjectStore* src, ObjectStore* dst) diff --git a/src/fooclass.cc b/src/fooclass.cc index 2db2d815bb0..032ec9e6fa7 100644 --- a/src/fooclass.cc +++ b/src/fooclass.cc @@ -1,6 +1,3 @@ - - - #include <iostream> #include <string.h> #include <stdlib.h> diff --git a/src/global/global_context.cc b/src/global/global_context.cc index 05f76321ca3..4807faaa68b 100644 --- a/src/global/global_context.cc +++ b/src/global/global_context.cc @@ -13,7 +13,8 @@ */ #include "common/ceph_context.h" -#include "global/global_context.h" + +#include "global_context.h" /* * Global variables for use from process context. diff --git a/src/global/global_context.h b/src/global/global_context.h index ab251dced70..699a55fb3b5 100644 --- a/src/global/global_context.h +++ b/src/global/global_context.h @@ -15,11 +15,11 @@ #ifndef CEPH_GLOBAL_CONTEXT_H #define CEPH_GLOBAL_CONTEXT_H -#include "common/ceph_context.h" - #include <iostream> #include <stdint.h> +#include "common/ceph_context.h" + class md_config_t; extern CephContext *g_ceph_context; diff --git a/src/global/global_init.cc b/src/global/global_init.cc index c35afd8cf75..387b3d892e0 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -12,6 +12,10 @@ * */ +#include <errno.h> + +#include "include/compat.h" +#include "include/color.h" #include "common/Thread.h" #include "common/ceph_argparse.h" #include "common/code_environment.h" @@ -22,15 +26,11 @@ #include "common/signal.h" #include "common/version.h" #include "global/global_context.h" -#include "global/global_init.h" #include "global/pidfile.h" #include "global/signal_handler.h" #include "global/debug.h" -#include "include/compat.h" -#include "include/color.h" -#include <errno.h> -#include <deque> +#include "global_init.h" #define dout_subsys ceph_subsys_ diff --git a/src/global/pidfile.cc b/src/global/pidfile.cc index e7fc9ff6269..8608172f061 100644 --- a/src/global/pidfile.cc +++ b/src/global/pidfile.cc @@ -11,12 +11,6 @@ * Foundation. See file COPYING. * */ - -#include "common/errno.h" -#include "common/safe_io.h" -#include "global/debug.h" -#include "global/pidfile.h" - #include <errno.h> #include <fcntl.h> #include <sys/stat.h> @@ -28,6 +22,11 @@ #endif #include "include/compat.h" +#include "common/errno.h" +#include "common/safe_io.h" +#include "global/debug.h" + +#include "pidfile.h" #define dout_prefix *_dout diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc index 33915704834..307de142ed2 100644 --- a/src/global/signal_handler.cc +++ b/src/global/signal_handler.cc @@ -12,18 +12,19 @@ * */ +#include <sstream> +#include <stdlib.h> +#include <sys/stat.h> +#include <sys/types.h> + #include "common/BackTrace.h" #include "common/perf_counters.h" #include "common/config.h" +#include "global/global_context.h" #include "global/pidfile.h" #include "global/debug.h" -#include "global/signal_handler.h" -#include <signal.h> -#include <sstream> -#include <stdlib.h> -#include <sys/stat.h> -#include <sys/types.h> +#include "signal_handler.h" void install_sighandler(int signum, signal_handler_t handler, int flags) { diff --git a/src/include/CompatSet.h b/src/include/CompatSet.h index 797c3768987..1fa2b652e2b 100644 --- a/src/include/CompatSet.h +++ b/src/include/CompatSet.h @@ -14,9 +14,12 @@ #ifndef CEPH_COMPATSET_H #define CEPH_COMPATSET_H -#include "include/buffer.h" + +#include "types.h" + #include <vector> +#include "include/buffer.h" #include "common/Formatter.h" struct CompatSet { diff --git a/src/key_value_store/cls_kvs.cc b/src/key_value_store/cls_kvs.cc index 6490cdba98a..588e88a0b2e 100644 --- a/src/key_value_store/cls_kvs.cc +++ b/src/key_value_store/cls_kvs.cc @@ -5,14 +5,16 @@ * Author: Eleanor Cawthon */ -#include "objclass/objclass.h" -#include "/usr/include/asm-generic/errno-base.h" -#include "/usr/include/asm-generic/errno.h" -#include "key_value_store/kvs_arg_types.h" #include "include/types.h" + #include <iostream> #include <climits> +#include <asm-generic/errno-base.h> +#include <asm-generic/errno.h> + +#include "objclass/objclass.h" +#include "kvs_arg_types.h" cls_handle_t h_class; cls_method_handle_t h_get_idata_from_key; diff --git a/src/key_value_store/key_value_structure.h b/src/key_value_store/key_value_structure.h index ec02791017e..e5f981d7775 100644 --- a/src/key_value_store/key_value_structure.h +++ b/src/key_value_store/key_value_structure.h @@ -14,9 +14,10 @@ #ifndef KEY_VALUE_STRUCTURE_HPP_ #define KEY_VALUE_STRUCTURE_HPP_ +#include <vector> + #include "include/rados/librados.hpp" #include "include/utime.h" -#include <vector> using std::string; using std::map; diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc index 96c6cb08e96..d8ee220c603 100644 --- a/src/key_value_store/kv_flat_btree_async.cc +++ b/src/key_value_store/kv_flat_btree_async.cc @@ -11,27 +11,21 @@ * Foundation. See file COPYING. */ -#include "key_value_store/key_value_structure.h" -#include "key_value_store/kv_flat_btree_async.h" -#include "key_value_store/kvs_arg_types.h" -#include "include/rados/librados.hpp" -#include "/usr/include/asm-generic/errno.h" -#include "/usr/include/asm-generic/errno-base.h" -#include "common/ceph_context.h" -#include "global/global_context.h" -#include "common/Clock.h" -#include "include/rados.h" #include "include/types.h" - #include <string> #include <iostream> #include <cassert> #include <climits> #include <cmath> -#include <sstream> #include <stdlib.h> #include <iterator> +#include <asm-generic/errno.h> +#include <asm-generic/errno-base.h> + +#include "kvs_arg_types.h" + +#include "kv_flat_btree_async.h" using namespace std; using ceph::bufferlist; diff --git a/src/key_value_store/kv_flat_btree_async.h b/src/key_value_store/kv_flat_btree_async.h index 132d7987492..f20acbe380a 100644 --- a/src/key_value_store/kv_flat_btree_async.h +++ b/src/key_value_store/kv_flat_btree_async.h @@ -18,19 +18,19 @@ #define EPREFIX 136 #define EFIRSTOBJ 138 -#include "key_value_store/key_value_structure.h" -#include "include/utime.h" +#include <cfloat> +#include <queue> +#include <sstream> +#include <stdarg.h> + #include "include/rados.h" #include "include/encoding.h" #include "common/Mutex.h" #include "common/Clock.h" #include "common/Formatter.h" #include "global/global_context.h" -#include "include/rados/librados.hpp" -#include <cfloat> -#include <queue> -#include <sstream> -#include <stdarg.h> + +#include "key_value_structure.h" using namespace std; using ceph::bufferlist; diff --git a/src/key_value_store/kvs_arg_types.h b/src/key_value_store/kvs_arg_types.h index 4bd32f02aeb..428415c07c9 100644 --- a/src/key_value_store/kvs_arg_types.h +++ b/src/key_value_store/kvs_arg_types.h @@ -10,8 +10,7 @@ #define EBALANCE 137 -#include "include/encoding.h" -#include "key_value_store/kv_flat_btree_async.h" +#include "kv_flat_btree_async.h" using namespace std; using ceph::bufferlist; diff --git a/src/libcephfs.cc b/src/libcephfs.cc index c33f6284afc..894881f4645 100644 --- a/src/libcephfs.cc +++ b/src/libcephfs.cc @@ -17,18 +17,19 @@ #include <string.h> #include <string> -#include "client/Client.h" #include "include/cephfs/libcephfs.h" +#include "include/str_list.h" +#include "include/assert.h" #include "common/Mutex.h" #include "common/ceph_argparse.h" #include "common/common_init.h" #include "common/config.h" #include "common/version.h" +#include "client/Client.h" #include "mon/MonClient.h" -#include "include/str_list.h" -#include "messages/MMonMap.h" #include "msg/Messenger.h" -#include "include/assert.h" + +#include "messages/MMonMap.h" class ceph_mount_info { diff --git a/src/librados-config.cc b/src/librados-config.cc index a0a064fd1d7..6bded2b408a 100644 --- a/src/librados-config.cc +++ b/src/librados-config.cc @@ -12,12 +12,11 @@ * */ +#include "include/rados/librados.h" #include "common/config.h" - #include "common/ceph_argparse.h" #include "global/global_init.h" #include "global/global_context.h" -#include "include/rados/librados.h" void usage() { diff --git a/src/librados/AioCompletionImpl.h b/src/librados/AioCompletionImpl.h index 66270c92737..470c4992ea2 100644 --- a/src/librados/AioCompletionImpl.h +++ b/src/librados/AioCompletionImpl.h @@ -15,14 +15,14 @@ #ifndef CEPH_LIBRADOS_AIOCOMPLETIONIMPL_H #define CEPH_LIBRADOS_AIOCOMPLETIONIMPL_H -#include "common/Cond.h" -#include "common/Mutex.h" +#include "osd/osd_types.h" #include "include/buffer.h" #include "include/rados/librados.h" #include "include/rados/librados.hpp" #include "include/xlist.h" -#include "osd/osd_types.h" +#include "common/Cond.h" +#include "common/Mutex.h" class IoCtxImpl; diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc index 934a10190d1..b5b15d4655c 100644 --- a/src/librados/IoCtxImpl.cc +++ b/src/librados/IoCtxImpl.cc @@ -14,13 +14,14 @@ #include <limits.h> -#include "IoCtxImpl.h" - -#include "librados/AioCompletionImpl.h" -#include "librados/PoolAsyncCompletionImpl.h" -#include "librados/RadosClient.h" #include "include/assert.h" +#include "AioCompletionImpl.h" +#include "PoolAsyncCompletionImpl.h" +#include "RadosClient.h" + +#include "IoCtxImpl.h" + #define dout_subsys ceph_subsys_rados #undef dout_prefix #define dout_prefix *_dout << "librados: " diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h index feea0e8b196..945b098163c 100644 --- a/src/librados/IoCtxImpl.h +++ b/src/librados/IoCtxImpl.h @@ -15,6 +15,9 @@ #ifndef CEPH_LIBRADOS_IOCTXIMPL_H #define CEPH_LIBRADOS_IOCTXIMPL_H +#include "include/types.h" +#include "osd/osd_types.h" + #include "common/Cond.h" #include "common/Mutex.h" #include "common/snap_types.h" @@ -22,9 +25,7 @@ #include "include/rados.h" #include "include/rados/librados.h" #include "include/rados/librados.hpp" -#include "include/types.h" #include "include/xlist.h" -#include "osd/osd_types.h" #include "osdc/Objecter.h" class RadosClient; diff --git a/src/librados/PoolAsyncCompletionImpl.h b/src/librados/PoolAsyncCompletionImpl.h index efb89641466..47039f98a57 100644 --- a/src/librados/PoolAsyncCompletionImpl.h +++ b/src/librados/PoolAsyncCompletionImpl.h @@ -15,11 +15,11 @@ #ifndef CEPH_LIBRADOS_POOLASYNCCOMPLETIONIMPL_H #define CEPH_LIBRADOS_POOLASYNCCOMPLETIONIMPL_H -#include "common/Cond.h" -#include "common/Mutex.h" #include "include/Context.h" #include "include/rados/librados.h" #include "include/rados/librados.hpp" +#include "common/Cond.h" +#include "common/Mutex.h" namespace librados { struct PoolAsyncCompletionImpl { diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc index 7e76b65694d..33a358ee645 100644 --- a/src/librados/RadosClient.cc +++ b/src/librados/RadosClient.cc @@ -15,27 +15,25 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> - #include <iostream> #include <string> #include <pthread.h> #include <errno.h> +#include "include/assert.h" +#include "include/buffer.h" #include "common/ceph_context.h" #include "common/config.h" #include "common/common_init.h" #include "common/errno.h" -#include "include/buffer.h" +#include "msg/SimpleMessenger.h" #include "messages/MWatchNotify.h" -#include "msg/SimpleMessenger.h" #include "AioCompletionImpl.h" -#include "IoCtxImpl.h" #include "PoolAsyncCompletionImpl.h" -#include "RadosClient.h" -#include "include/assert.h" +#include "RadosClient.h" #define dout_subsys ceph_subsys_rados #undef dout_prefix diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h index 1f39f22fb3f..62798e09309 100644 --- a/src/librados/RadosClient.h +++ b/src/librados/RadosClient.h @@ -14,11 +14,11 @@ #ifndef CEPH_LIBRADOS_RADOSCLIENT_H #define CEPH_LIBRADOS_RADOSCLIENT_H +#include "include/rados/librados.h" +#include "include/rados/librados.hpp" #include "common/Cond.h" #include "common/Mutex.h" #include "common/Timer.h" -#include "include/rados/librados.h" -#include "include/rados/librados.hpp" #include "mon/MonClient.h" #include "msg/Dispatcher.h" #include "osd/OSDMap.h" diff --git a/src/librados/librados.cc b/src/librados/librados.cc index c31b82ae34b..2ab181d822d 100644 --- a/src/librados/librados.cc +++ b/src/librados/librados.cc @@ -12,20 +12,21 @@ * */ -using namespace std; +#include "include/types.h" +#include "include/rados/librados.h" +#include "include/rados/librados.hpp" #include "common/config.h" #include "common/errno.h" #include "common/ceph_argparse.h" #include "common/common_init.h" -#include "include/rados/librados.h" -#include "include/rados/librados.hpp" -#include "include/types.h" -#include "librados/AioCompletionImpl.h" -#include "librados/IoCtxImpl.h" -#include "librados/PoolAsyncCompletionImpl.h" -#include "librados/RadosClient.h" +#include "AioCompletionImpl.h" +#include "IoCtxImpl.h" +#include "PoolAsyncCompletionImpl.h" +#include "RadosClient.h" + +using namespace std; #define dout_subsys ceph_subsys_rados #undef dout_prefix diff --git a/src/librbd/AioCompletion.cc b/src/librbd/AioCompletion.cc index 723cc9705de..68318ff68aa 100644 --- a/src/librbd/AioCompletion.cc +++ b/src/librbd/AioCompletion.cc @@ -6,10 +6,10 @@ #include "common/ceph_context.h" #include "common/debug.h" -#include "librbd/AioRequest.h" -#include "librbd/internal.h" +#include "AioRequest.h" +#include "internal.h" -#include "librbd/AioCompletion.h" +#include "AioCompletion.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/AioCompletion.h b/src/librbd/AioCompletion.h index 361d425531f..be4a1725210 100644 --- a/src/librbd/AioCompletion.h +++ b/src/librbd/AioCompletion.h @@ -3,19 +3,17 @@ #ifndef CEPH_LIBRBD_AIOCOMPLETION_H #define CEPH_LIBRBD_AIOCOMPLETION_H +#include "include/Context.h" +#include "include/utime.h" #include "common/Cond.h" #include "common/Mutex.h" #include "common/ceph_context.h" #include "common/perf_counters.h" -#include "include/Context.h" -#include "include/utime.h" -#include "include/rbd/librbd.hpp" - -#include "librbd/ImageCtx.h" -#include "librbd/internal.h" - #include "osdc/Striper.h" +#include "ImageCtx.h" +#include "internal.h" + namespace librbd { class AioRead; diff --git a/src/librbd/AioRequest.cc b/src/librbd/AioRequest.cc index 51d95885aaf..266ddb8ba7d 100644 --- a/src/librbd/AioRequest.cc +++ b/src/librbd/AioRequest.cc @@ -5,11 +5,11 @@ #include "common/debug.h" #include "common/Mutex.h" -#include "librbd/AioCompletion.h" -#include "librbd/ImageCtx.h" -#include "librbd/internal.h" +#include "AioCompletion.h" +#include "ImageCtx.h" +#include "internal.h" -#include "librbd/AioRequest.h" +#include "AioRequest.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/AioRequest.h b/src/librbd/AioRequest.h index 259af88dda7..f97f8407059 100644 --- a/src/librbd/AioRequest.h +++ b/src/librbd/AioRequest.h @@ -3,14 +3,13 @@ #ifndef CEPH_LIBRBD_AIOREQUEST_H #define CEPH_LIBRBD_AIOREQUEST_H -#include <map> - #include "inttypes.h" +#include <map> -#include "common/snap_types.h" #include "include/buffer.h" #include "include/Context.h" #include "include/rados/librados.hpp" +#include "common/snap_types.h" namespace librbd { diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h index 14eb6d6d9ed..081fa2e1d4a 100644 --- a/src/librbd/ImageCtx.h +++ b/src/librbd/ImageCtx.h @@ -3,25 +3,25 @@ #ifndef CEPH_LIBRBD_IMAGECTX_H #define CEPH_LIBRBD_IMAGECTX_H -#include <inttypes.h> +#include "include/types.h" +#include "include/rbd_types.h" +#include <inttypes.h> #include <map> #include <set> #include <string> #include <vector> -#include "common/Mutex.h" -#include "common/snap_types.h" #include "include/buffer.h" #include "include/rbd/librbd.hpp" -#include "include/rbd_types.h" -#include "include/types.h" +#include "common/Mutex.h" +#include "common/snap_types.h" #include "osdc/ObjectCacher.h" - #include "cls/rbd/cls_rbd_client.h" -#include "librbd/LibrbdWriteback.h" -#include "librbd/SnapInfo.h" -#include "librbd/parent_types.h" + +#include "LibrbdWriteback.h" +#include "SnapInfo.h" +#include "parent_types.h" class CephContext; class PerfCounters; diff --git a/src/librbd/LibrbdWriteback.cc b/src/librbd/LibrbdWriteback.cc index 5ff73153c47..1b79b2ffcd5 100644 --- a/src/librbd/LibrbdWriteback.cc +++ b/src/librbd/LibrbdWriteback.cc @@ -3,19 +3,17 @@ #include <errno.h> +#include "include/assert.h" +#include "include/rbd/librbd.hpp" #include "common/ceph_context.h" #include "common/debug.h" #include "common/Mutex.h" -#include "include/Context.h" -#include "include/rados/librados.hpp" -#include "include/rbd/librbd.hpp" -#include "librbd/AioRequest.h" -#include "librbd/ImageCtx.h" -#include "librbd/internal.h" -#include "librbd/LibrbdWriteback.h" +#include "AioRequest.h" +#include "ImageCtx.h" +#include "internal.h" -#include "include/assert.h" +#include "LibrbdWriteback.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/LibrbdWriteback.h b/src/librbd/LibrbdWriteback.h index b054dbc5950..3c9031b5403 100644 --- a/src/librbd/LibrbdWriteback.h +++ b/src/librbd/LibrbdWriteback.h @@ -3,10 +3,11 @@ #ifndef CEPH_LIBRBD_LIBRBDWRITEBACKHANDLER_H #define CEPH_LIBRBD_LIBRBDWRITEBACKHANDLER_H -#include "include/Context.h" #include "include/types.h" -#include "include/rados/librados.hpp" #include "osd/osd_types.h" + +#include "include/Context.h" +#include "include/rados/librados.hpp" #include "osdc/WritebackHandler.h" class Mutex; diff --git a/src/librbd/SnapInfo.h b/src/librbd/SnapInfo.h index 5a7852c3c66..80d2b024380 100644 --- a/src/librbd/SnapInfo.h +++ b/src/librbd/SnapInfo.h @@ -8,7 +8,7 @@ #include "include/rados/librados.hpp" #include "cls/rbd/cls_rbd_client.h" -#include "librbd/parent_types.h" +#include "parent_types.h" namespace librbd { diff --git a/src/librbd/WatchCtx.cc b/src/librbd/WatchCtx.cc index 0f0c4142afc..91781f5609a 100644 --- a/src/librbd/WatchCtx.cc +++ b/src/librbd/WatchCtx.cc @@ -5,10 +5,10 @@ #include "common/debug.h" #include "common/perf_counters.h" -#include "librbd/ImageCtx.h" -#include "librbd/internal.h" +#include "ImageCtx.h" +#include "internal.h" -#include "librbd/WatchCtx.h" +#include "WatchCtx.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/WatchCtx.h b/src/librbd/WatchCtx.h index 0c0802a4035..d82e47aaaa0 100644 --- a/src/librbd/WatchCtx.h +++ b/src/librbd/WatchCtx.h @@ -5,9 +5,9 @@ #include <inttypes.h> -#include "common/Mutex.h" #include "include/buffer.h" #include "include/rados/librados.hpp" +#include "common/Mutex.h" class ImageCtx; diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 309c928ef0c..d18d0424107 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -1,23 +1,23 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab +#include "include/inttypes.h" + #include <errno.h> #include <limits.h> +#include "include/stringify.h" #include "common/ceph_context.h" #include "common/debug.h" #include "common/errno.h" #include "cls/lock/cls_lock_client.h" -#include "include/inttypes.h" -#include "include/stringify.h" - #include "cls/rbd/cls_rbd.h" -#include "librbd/AioCompletion.h" -#include "librbd/AioRequest.h" -#include "librbd/ImageCtx.h" +#include "AioCompletion.h" +#include "AioRequest.h" +#include "ImageCtx.h" +#include "parent_types.h" -#include "librbd/internal.h" -#include "librbd/parent_types.h" +#include "internal.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/librbd/internal.h b/src/librbd/internal.h index 88c2d394f07..a612e971563 100644 --- a/src/librbd/internal.h +++ b/src/librbd/internal.h @@ -3,8 +3,9 @@ #ifndef CEPH_LIBRBD_INTERNAL_H #define CEPH_LIBRBD_INTERNAL_H -#include <inttypes.h> +#include "include/rbd_types.h" +#include <inttypes.h> #include <map> #include <set> #include <string> @@ -12,7 +13,6 @@ #include "include/buffer.h" #include "include/rbd/librbd.hpp" -#include "include/rbd_types.h" enum { l_librbd_first = 26000, diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc index 683dda3bbf0..a025a12c7f7 100644 --- a/src/librbd/librbd.cc +++ b/src/librbd/librbd.cc @@ -11,28 +11,26 @@ * Foundation. See file COPYING. * */ - -#include <errno.h> #include <inttypes.h> +#include <errno.h> +#include <algorithm> +#include <string> +#include <vector> +#include "include/Context.h" +#include "include/rbd/librbd.hpp" #include "common/Cond.h" #include "common/debug.h" #include "common/errno.h" #include "common/snap_types.h" #include "common/perf_counters.h" -#include "include/Context.h" -#include "include/rbd/librbd.hpp" #include "osdc/ObjectCacher.h" - -#include "librbd/AioCompletion.h" #include "cls/rbd/cls_rbd_client.h" -#include "librbd/ImageCtx.h" -#include "librbd/internal.h" -#include "librbd/LibrbdWriteback.h" -#include <algorithm> -#include <string> -#include <vector> +#include "AioCompletion.h" +#include "ImageCtx.h" +#include "internal.h" +#include "LibrbdWriteback.h" #define dout_subsys ceph_subsys_rbd #undef dout_prefix diff --git a/src/log/Entry.h b/src/log/Entry.h index 7f6b1499f9d..a9dbebcaa30 100644 --- a/src/log/Entry.h +++ b/src/log/Entry.h @@ -4,11 +4,12 @@ #ifndef __CEPH_LOG_ENTRY_H #define __CEPH_LOG_ENTRY_H -#include "include/utime.h" -#include "common/PrebufferedStreambuf.h" #include <pthread.h> #include <string> +#include "include/utime.h" +#include "common/PrebufferedStreambuf.h" + #define CEPH_LOG_ENTRY_PREALLOC 80 namespace ceph { diff --git a/src/log/Log.cc b/src/log/Log.cc index 51a340ffcb1..3ed18bcb352 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -1,18 +1,17 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "Log.h" - #include <errno.h> #include <syslog.h> - #include <iostream> #include <sstream> +#include "include/assert.h" #include "common/errno.h" #include "common/safe_io.h" #include "common/Clock.h" -#include "include/assert.h" + +#include "Log.h" #define DEFAULT_MAX_NEW 100 #define DEFAULT_MAX_RECENT 10000 diff --git a/src/log/Log.h b/src/log/Log.h index ab83a7c86e4..5a378e929ee 100644 --- a/src/log/Log.h +++ b/src/log/Log.h @@ -4,10 +4,10 @@ #ifndef __CEPH_LOG_LOG_H #define __CEPH_LOG_LOG_H -#include "common/Thread.h" - #include <pthread.h> +#include "common/Thread.h" + #include "Entry.h" #include "EntryQueue.h" #include "SubsystemMap.h" diff --git a/src/log/test.cc b/src/log/test.cc index 85e9ebc01bd..3212850a2ba 100644 --- a/src/log/test.cc +++ b/src/log/test.cc @@ -1,9 +1,10 @@ #include <gtest/gtest.h> -#include "log/Log.h" #include "common/Clock.h" #include "common/PrebufferedStreambuf.h" +#include "Log.h" + using namespace ceph::log; TEST(Log, Simple) diff --git a/src/mds/Anchor.h b/src/mds/Anchor.h index 52e71f9ea68..13a00dc5949 100644 --- a/src/mds/Anchor.h +++ b/src/mds/Anchor.h @@ -15,13 +15,13 @@ #ifndef CEPH_ANCHOR_H #define CEPH_ANCHOR_H +#include "mds_types.h" + #include <string> -using std::string; -#include "include/types.h" -#include "mdstypes.h" #include "include/buffer.h" +using std::string; // identifies a anchor table mutation diff --git a/src/mds/AnchorClient.cc b/src/mds/AnchorClient.cc index 5be31a7fac7..fb1b4abb7f9 100644 --- a/src/mds/AnchorClient.cc +++ b/src/mds/AnchorClient.cc @@ -12,24 +12,22 @@ * */ -#include "AnchorClient.h" -#include "MDSMap.h" -#include "LogSegment.h" -#include "MDS.h" +#include "common/config.h" #include "msg/Messenger.h" +#include "global/debug.h" #include "messages/MMDSTableRequest.h" -#include "common/config.h" +#include "LogSegment.h" +#include "MDS.h" -#include "global/debug.h" +#include "AnchorClient.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorclient " - // LOOKUPS /* This function DOES NOT put the passed message before returning */ void AnchorClient::handle_query_result(class MMDSTableRequest *m) diff --git a/src/mds/AnchorServer.cc b/src/mds/AnchorServer.cc index f5e29493cab..8e6a0c449a0 100644 --- a/src/mds/AnchorServer.cc +++ b/src/mds/AnchorServer.cc @@ -12,12 +12,14 @@ * */ -#include "AnchorServer.h" -#include "MDS.h" #include "msg/Messenger.h" +#include "global/debug.h" + #include "messages/MMDSTableRequest.h" -#include "global/debug.h" +#include "MDS.h" + +#include "AnchorServer.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index d123ab9ce22..df12293cea0 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -11,22 +11,20 @@ * Foundation. See file COPYING. * */ +#include "global/global_context.h" +#include "global/debug.h" +#include "messages/MLock.h" - -#include "CDentry.h" #include "CInode.h" #include "CDir.h" #include "Anchor.h" - #include "MDS.h" #include "MDCache.h" #include "Locker.h" #include "LogSegment.h" -#include "messages/MLock.h" - -#include "global/debug.h" +#include "CDentry.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h index 480e5628bf4..61bb6949c8f 100644 --- a/src/mds/CDentry.h +++ b/src/mds/CDentry.h @@ -11,26 +11,25 @@ * Foundation. See file COPYING. * */ - - - #ifndef CEPH_CDENTRY_H #define CEPH_CDENTRY_H +#include "mds_types.h" + #include <string> #include <set> -using namespace std; #include "include/types.h" #include "include/buffer.h" #include "include/lru.h" #include "include/elist.h" #include "include/filepath.h" -#include "mdstypes.h" #include "SimpleLock.h" #include "LocalLock.h" +using namespace std; + class CInode; class CDir; class MDRequest; @@ -43,8 +42,6 @@ class LogSegment; class Session; - - // define an ordering bool operator<(const CDentry& l, const CDentry& r); diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index f0a04aeec86..7b2518a83ca 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -15,34 +15,28 @@ #include "include/types.h" -#include "CDir.h" +#include "include/bloom_filter.hpp" +#include "include/Context.h" +#include "include/assert.h" +#include "common/Clock.h" +#include "common/config.h" +#include "osdc/Objecter.h" +#include "global/global_context.h" +#include "global/debug.h" + #include "CDentry.h" -#include "CInode.h" #include "Mutation.h" - -#include "MDSMap.h" #include "MDS.h" #include "MDCache.h" #include "Locker.h" #include "MDLog.h" -#include "LogSegment.h" - -#include "include/bloom_filter.hpp" -#include "include/Context.h" -#include "common/Clock.h" -#include "osdc/Objecter.h" - -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" +#include "CDir.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") " - - // PINS //int cdir_pins[CDIR_NUM_PINS] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; diff --git a/src/mds/CDir.h b/src/mds/CDir.h index 2222418cc57..732684fa711 100644 --- a/src/mds/CDir.h +++ b/src/mds/CDir.h @@ -18,22 +18,22 @@ #define CEPH_CDIR_H #include "include/types.h" -#include "include/buffer.h" -#include "mdstypes.h" -#include "common/config.h" -#include "common/DecayCounter.h" +#include "mds_types.h" #include <iostream> - #include <list> #include <set> #include <map> #include <string> -using namespace std; +#include "include/buffer.h" +#include "common/config.h" +#include "common/DecayCounter.h" #include "CInode.h" +using namespace std; + class CDentry; class MDCache; class MDCluster; diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index af70b681ffc..d15104d0484 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -16,32 +16,24 @@ #include <string> #include <stdio.h> -#include "CInode.h" -#include "CDir.h" -#include "CDentry.h" +#include "include/assert.h" +#include "common/Clock.h" +#include "osdc/Objecter.h" +#include "global/global_context.h" +#include "messages/MLock.h" +#include "messages/MClientCaps.h" + +#include "events/EUpdate.h" + +#include "CDir.h" #include "MDS.h" #include "MDCache.h" #include "MDLog.h" #include "Locker.h" #include "Mutation.h" -#include "events/EUpdate.h" - -#include "osdc/Objecter.h" - -#include "snap.h" - -#include "LogSegment.h" - -#include "common/Clock.h" - -#include "messages/MLock.h" -#include "messages/MClientCaps.h" - -#include "common/config.h" -#include "global/global_context.h" -#include "include/assert.h" +#include "CInode.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/CInode.h b/src/mds/CInode.h index e19e8fe67e8..56afa783a06 100644 --- a/src/mds/CInode.h +++ b/src/mds/CInode.h @@ -17,17 +17,22 @@ #ifndef CEPH_CINODE_H #define CEPH_CINODE_H -#include "common/config.h" +#include "include/types.h" +#include "mds_types.h" + +#include <list> +#include <vector> +#include <set> +#include <map> +#include <iostream> + #include "include/dlist.h" #include "include/elist.h" -#include "include/types.h" #include "include/lru.h" - +#include "common/config.h" #include "global/debug.h" -#include "mdstypes.h" #include "flock.h" - #include "CDentry.h" #include "SimpleLock.h" #include "ScatterLock.h" @@ -35,11 +40,6 @@ #include "Capability.h" #include "snap.h" -#include <list> -#include <vector> -#include <set> -#include <map> -#include <iostream> using namespace std; class Context; diff --git a/src/mds/Dumper.cc b/src/mds/Dumper.cc index 917403ee208..a27b5f1a8f2 100644 --- a/src/mds/Dumper.cc +++ b/src/mds/Dumper.cc @@ -16,14 +16,16 @@ #define _BACKWARD_BACKWARD_WARNING_H // make gcc 4.3 shut up about hash_* #endif +#include "mds_types.h" + #include "include/compat.h" #include "common/entity_name.h" #include "common/errno.h" #include "common/safe_io.h" -#include "mds/Dumper.h" -#include "mds/mdstypes.h" #include "mon/MonClient.h" -#include "osdc/Journaler.h" +#include "global/debug.h" + +#include "Dumper.h" Dumper::~Dumper() { diff --git a/src/mds/Dumper.h b/src/mds/Dumper.h index 74b8c143d6c..f648f9e6b48 100644 --- a/src/mds/Dumper.h +++ b/src/mds/Dumper.h @@ -17,7 +17,6 @@ #include "osd/OSDMap.h" #include "osdc/Objecter.h" #include "osdc/Journaler.h" -#include "msg/Dispatcher.h" #include "msg/Messenger.h" #include "auth/Auth.h" #include "global/global_context.h" diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index 5c23996ea4a..e3d2d380836 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -12,14 +12,15 @@ * */ -#include "InoTable.h" -#include "MDS.h" - #include "include/types.h" #include "common/config.h" #include "global/debug.h" +#include "MDS.h" + +#include "InoTable.h" + #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << "." << table_name << ": " diff --git a/src/mds/InoTable.h b/src/mds/InoTable.h index 3a706360797..8310eecfb7c 100644 --- a/src/mds/InoTable.h +++ b/src/mds/InoTable.h @@ -16,9 +16,10 @@ #ifndef CEPH_INOTABLE_H #define CEPH_INOTABLE_H -#include "MDSTable.h" #include "include/interval_set.h" +#include "MDSTable.h" + class MDS; class InoTable : public MDSTable { diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 9cdf0823a77..9133cc834b9 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -12,50 +12,43 @@ * */ +#include "include/types.h" -#include "MDS.h" -#include "MDCache.h" -#include "Locker.h" -#include "CInode.h" -#include "CDir.h" -#include "CDentry.h" -#include "Mutation.h" - -#include "MDLog.h" -#include "MDSMap.h" +#include <errno.h> #include "include/filepath.h" +#include "common/config.h" +#include "msg/Messenger.h" +#include "global/global_context.h" +#include "global/debug.h" #include "events/EString.h" #include "events/EUpdate.h" #include "events/EOpen.h" -#include "msg/Messenger.h" - #include "messages/MGenericMessage.h" #include "messages/MDiscover.h" #include "messages/MDiscoverReply.h" - #include "messages/MDirUpdate.h" - #include "messages/MInodeFileCaps.h" - #include "messages/MLock.h" #include "messages/MClientLease.h" #include "messages/MDentryUnlink.h" - #include "messages/MClientRequest.h" #include "messages/MClientReply.h" #include "messages/MClientCaps.h" #include "messages/MClientCapRelease.h" - #include "messages/MMDSSlaveRequest.h" -#include <errno.h> - -#include "common/config.h" -#include "global/debug.h" +#include "MDS.h" +#include "MDCache.h" +#include "CInode.h" +#include "CDir.h" +#include "CDentry.h" +#include "Mutation.h" +#include "MDLog.h" +#include "Locker.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/Locker.h b/src/mds/Locker.h index b3b9919e7fd..20de89e27a6 100644 --- a/src/mds/Locker.h +++ b/src/mds/Locker.h @@ -20,6 +20,9 @@ #include <map> #include <list> #include <set> + +#include "SimpleLock.h" + using std::map; using std::list; using std::set; @@ -54,8 +57,6 @@ class ScatterLock; class LocalLock; class MDCache; -#include "SimpleLock.h" - class Locker { private: MDS *mds; diff --git a/src/mds/LogEvent.cc b/src/mds/LogEvent.cc index b4cc1968024..bef814f81fd 100644 --- a/src/mds/LogEvent.cc +++ b/src/mds/LogEvent.cc @@ -13,10 +13,6 @@ */ #include "common/config.h" -#include "LogEvent.h" - -#include "MDS.h" - #include "global/debug.h" // events i know of @@ -40,6 +36,9 @@ #include "events/ETableClient.h" #include "events/ETableServer.h" +#include "MDS.h" + +#include "LogEvent.h" LogEvent *LogEvent::decode(bufferlist& bl) { diff --git a/src/mds/LogEvent.h b/src/mds/LogEvent.h index e0b4bea4dc6..fd8386dd411 100644 --- a/src/mds/LogEvent.h +++ b/src/mds/LogEvent.h @@ -15,6 +15,14 @@ #ifndef CEPH_LOGEVENT_H #define CEPH_LOGEVENT_H +#include <string> + +#include "include/buffer.h" +#include "include/Context.h" +#include "include/utime.h" + +using namespace std; + #define EVENT_STRING 1 #define EVENT_SUBTREEMAP 2 @@ -38,14 +46,6 @@ #define EVENT_SUBTREEMAP_TEST 50 - -#include <string> -using namespace std; - -#include "include/buffer.h" -#include "include/Context.h" -#include "include/utime.h" - class MDS; class LogSegment; diff --git a/src/mds/LogSegment.h b/src/mds/LogSegment.h index 7c7360466a5..8000e4122de 100644 --- a/src/mds/LogSegment.h +++ b/src/mds/LogSegment.h @@ -15,16 +15,19 @@ #ifndef CEPH_LOGSEGMENT_H #define CEPH_LOGSEGMENT_H +#include "mds_types.h" + +#include <ext/hash_set> + #include "include/dlist.h" #include "include/elist.h" #include "include/interval_set.h" #include "include/Context.h" -#include "mdstypes.h" + #include "CInode.h" #include "CDentry.h" #include "CDir.h" -#include <ext/hash_set> using __gnu_cxx::hash_set; class CDir; diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc index 49cd46b7196..1f55fabb26e 100644 --- a/src/mds/MDBalancer.cc +++ b/src/mds/MDBalancer.cc @@ -12,32 +12,32 @@ * */ -#include "mdstypes.h" +#include "mds_types.h" + +#include <fstream> +#include <iostream> +#include <vector> + +#include "include/Context.h" +#include "common/config.h" +#include "msg/Messenger.h" +#include "global/global_context.h" +#include "global/debug.h" + +#include "messages/MHeartbeat.h" +#include "messages/MMDSLoadTargets.h" -#include "MDBalancer.h" #include "MDS.h" #include "mon/MonClient.h" -#include "MDSMap.h" -#include "CInode.h" #include "CDir.h" #include "MDCache.h" #include "Migrator.h" -#include "include/Context.h" -#include "msg/Messenger.h" -#include "messages/MHeartbeat.h" -#include "messages/MMDSLoadTargets.h" +#include "MDBalancer.h" -#include <fstream> -#include <iostream> -#include <vector> -#include <map> using std::map; using std::vector; -#include "common/config.h" -#include "global/debug.h" - #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_balancer diff --git a/src/mds/MDBalancer.h b/src/mds/MDBalancer.h index 0aa931fdfe4..8daf1ffbe1b 100644 --- a/src/mds/MDBalancer.h +++ b/src/mds/MDBalancer.h @@ -17,15 +17,16 @@ #ifndef CEPH_MDBALANCER_H #define CEPH_MDBALANCER_H +#include "include/types.h" + #include <list> #include <map> -using std::list; -using std::map; -#include "include/types.h" #include "common/Clock.h" #include "CInode.h" +using std::list; +using std::map; class MDS; class Message; diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index c0c2ae6ad64..9f3ad22be01 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -12,6 +12,10 @@ * */ +extern struct ceph_file_layout g_default_file_layout; + +#include "mds_types.h" + #include <errno.h> #include <fstream> #include <iostream> @@ -19,34 +23,18 @@ #include <string> #include <map> -#include "MDCache.h" -#include "MDS.h" -#include "Server.h" -#include "Locker.h" -#include "MDLog.h" -#include "MDBalancer.h" -#include "Migrator.h" - -#include "AnchorClient.h" -#include "SnapClient.h" - -#include "MDSMap.h" - -#include "CInode.h" -#include "CDir.h" - -#include "Mutation.h" - #include "include/ceph_fs.h" -#include "include/filepath.h" - -#include "msg/Message.h" -#include "msg/Messenger.h" - +#include "include/assert.h" +#include "common/Timer.h" #include "common/perf_counters.h" #include "common/MemoryModel.h" +#include "common/config.h" +#include "msg/Message.h" +#include "msg/Messenger.h" #include "osdc/Journaler.h" #include "osdc/Filer.h" +#include "global/global_context.h" +#include "global/debug.h" #include "events/ESubtreeMap.h" #include "events/EUpdate.h" @@ -86,19 +74,23 @@ #include "messages/MMDSFragmentNotify.h" +#include "MDS.h" +#include "Server.h" +#include "Locker.h" +#include "MDLog.h" +#include "MDBalancer.h" +#include "Migrator.h" +#include "Mutation.h" + +#include "AnchorClient.h" +#include "SnapClient.h" #include "InoTable.h" -#include "common/Timer.h" +#include "MDCache.h" using namespace std; -extern struct ceph_file_layout g_default_file_layout; - -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" - #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix _prefix(_dout, mds) diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index 31c7467bf41..e09c0d9b888 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -18,6 +18,7 @@ #define CEPH_MDCACHE_H #include "include/types.h" + #include "include/filepath.h" #include "CInode.h" diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index f6056543417..ece246ce978 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -12,23 +12,22 @@ * */ -#include "MDLog.h" -#include "MDS.h" -#include "MDCache.h" -#include "LogEvent.h" - -#include "osdc/Journaler.h" - +#include "include/assert.h" #include "common/entity_name.h" #include "common/perf_counters.h" - -#include "events/ESubtreeMap.h" - #include "common/config.h" #include "common/errno.h" -#include "include/assert.h" +#include "osdc/Journaler.h" +#include "events/ESubtreeMap.h" +#include "global/global_context.h" #include "global/debug.h" +#include "MDS.h" +#include "MDCache.h" +#include "LogEvent.h" + +#include "MDLog.h" + #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h index 9a547f0d791..ee325c08d94 100644 --- a/src/mds/MDLog.h +++ b/src/mds/MDLog.h @@ -16,6 +16,19 @@ #ifndef CEPH_MDLOG_H #define CEPH_MDLOG_H +#include "include/types.h" + +#include <list> +#include <map> + +#include "include/Context.h" +#include "common/Thread.h" +#include "common/Cond.h" + +#include "LogSegment.h" + +using std::map; + enum { l_mdl_first = 5000, l_mdl_evadd, @@ -37,28 +50,13 @@ enum { l_mdl_last, }; -#include "include/types.h" -#include "include/Context.h" - -#include "common/Thread.h" -#include "common/Cond.h" - -#include "LogSegment.h" - -#include <list> - class Journaler; class LogEvent; class MDS; class LogSegment; class ESubtreeMap; - class PerfCounters; -#include <map> -using std::map; - - class MDLog { public: MDS *mds; diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index 4d6a2734779..0049acfb654 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -11,30 +11,42 @@ * Foundation. See file COPYING. * */ +#include "mds_types.h" #include <unistd.h> -#include "global/signal_handler.h" - -#include "include/types.h" #include "common/entity_name.h" #include "common/Clock.h" #include "common/signal.h" #include "common/ceph_argparse.h" #include "common/errno.h" - - +#include "common/config.h" +#include "common/errno.h" +#include "auth/AuthAuthorizeHandler.h" +#include "auth/KeyRing.h" #include "msg/Messenger.h" #include "mon/MonClient.h" - #include "osd/OSDMap.h" #include "osdc/Objecter.h" #include "osdc/Filer.h" #include "osdc/Journaler.h" +#include "perfglue/cpu_profiler.h" +#include "perfglue/heap_profiler.h" +#include "global/global_context.h" +#include "global/signal_handler.h" +#include "global/debug.h" + +#include "events/ESession.h" -#include "MDSMap.h" +#include "messages/MMDSMap.h" +#include "messages/MMDSBeacon.h" +#include "messages/MGenericMessage.h" +#include "messages/MOSDMap.h" +#include "messages/MClientRequest.h" +#include "messages/MClientRequestForward.h" +#include "messages/MMDSTableRequest.h" +#include "messages/MMonCommand.h" -#include "MDS.h" #include "Server.h" #include "Locker.h" #include "MDCache.h" @@ -46,46 +58,14 @@ #include "AnchorClient.h" #include "SnapServer.h" #include "SnapClient.h" - #include "InoTable.h" -#include "common/perf_counters.h" - -#include "common/Timer.h" - -#include "events/ESession.h" - -#include "messages/MMDSMap.h" -#include "messages/MMDSBeacon.h" - -#include "messages/MGenericMessage.h" - -#include "messages/MOSDMap.h" - -#include "messages/MClientRequest.h" -#include "messages/MClientRequestForward.h" - -#include "messages/MMDSTableRequest.h" - -#include "messages/MMonCommand.h" - -#include "auth/AuthAuthorizeHandler.h" -#include "auth/KeyRing.h" - -#include "common/config.h" -#include "common/errno.h" - -#include "perfglue/cpu_profiler.h" -#include "perfglue/heap_profiler.h" - -#include "global/debug.h" +#include "MDS.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << whoami << '.' << incarnation << ' ' - - // cons/des MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) : Dispatcher(m->cct), diff --git a/src/mds/MDS.h b/src/mds/MDS.h index c7c36598241..5e6bc7d29b8 100644 --- a/src/mds/MDS.h +++ b/src/mds/MDS.h @@ -17,11 +17,10 @@ #ifndef CEPH_MDS_H #define CEPH_MDS_H -#include "mdstypes.h" +#include "include/types.h" +#include "mds_types.h" -#include "msg/Dispatcher.h" #include "include/CompatSet.h" -#include "include/types.h" #include "include/Context.h" #include "common/DecayCounter.h" #include "common/perf_counters.h" @@ -29,15 +28,13 @@ #include "common/Cond.h" #include "common/Timer.h" #include "common/LogClient.h" +#include "msg/Dispatcher.h" #include "MDSMap.h" - #include "SessionMap.h" - #define CEPH_MDS_PROTOCOL 14 /* cluster internal */ - enum { l_mds_first = 2000, l_mds_req, diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index cb94d94f975..56379ad88ac 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -11,14 +11,12 @@ * Foundation. See file COPYING. * */ - +#include <sstream> #include "MDSMap.h" -#include <sstream> using std::stringstream; - // features CompatSet get_mdsmap_compat_set() { CompatSet::FeatureSet feature_compat; diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h index 6adeb92f4a2..2a9032f7b9a 100644 --- a/src/mds/MDSMap.h +++ b/src/mds/MDSMap.h @@ -16,24 +16,22 @@ #ifndef CEPH_MDSMAP_H #define CEPH_MDSMAP_H -#include <errno.h> - #include "include/types.h" -#include "common/Clock.h" -#include "msg/Message.h" +#include <errno.h> #include <set> #include <map> #include <string> -using namespace std; - -#include "common/config.h" #include "include/CompatSet.h" +#include "common/config.h" #include "common/Formatter.h" - +#include "common/Clock.h" +#include "msg/Message.h" #include "global/global_context.h" +using namespace std; + /* boot --> standby, creating, or starting. diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index bd2c45bb005..19d1e2d5753 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -12,25 +12,23 @@ * */ -#include "MDSTable.h" - -#include "MDS.h" -#include "MDLog.h" +#include "mds_types.h" -#include "osdc/Filer.h" - -#include "include/types.h" - -#include "common/config.h" #include "include/assert.h" +#include "common/config.h" +#include "osdc/Filer.h" +#include "global/global_context.h" #include "global/debug.h" +#include "MDS.h" +#include "MDLog.h" + +#include "MDSTable.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << "." << table_name << ": " - class C_MT_Save : public Context { MDSTable *ida; version_t version; diff --git a/src/mds/MDSTable.h b/src/mds/MDSTable.h index 42225651522..4f3e932d61d 100644 --- a/src/mds/MDSTable.h +++ b/src/mds/MDSTable.h @@ -15,8 +15,9 @@ #ifndef CEPH_MDSTABLE_H #define CEPH_MDSTABLE_H -#include "mdstypes.h" +#include "mds_types.h" #include "mds_table_types.h" + #include "include/buffer.h" #include "include/Context.h" diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc index f256aa8fdd3..028f26166f9 100644 --- a/src/mds/MDSTableClient.cc +++ b/src/mds/MDSTableClient.cc @@ -12,24 +12,22 @@ * */ -#include <iostream> +#include "mds_types.h" -#include "MDSMap.h" +#include <iostream> -#include "include/Context.h" +#include "common/config.h" #include "msg/Messenger.h" +#include "global/debug.h" -#include "MDS.h" -#include "MDLog.h" -#include "LogSegment.h" - -#include "MDSTableClient.h" #include "events/ETableClient.h" #include "messages/MMDSTableRequest.h" -#include "common/config.h" -#include "global/debug.h" +#include "MDS.h" +#include "MDLog.h" + +#include "MDSTableClient.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc index f2e59e03217..cbfd8f2646b 100644 --- a/src/mds/MDSTableServer.cc +++ b/src/mds/MDSTableServer.cc @@ -11,16 +11,18 @@ * Foundation. See file COPYING. * */ +#include "mds_types.h" -#include "MDSTableServer.h" -#include "MDS.h" -#include "MDLog.h" #include "msg/Messenger.h" +#include "global/debug.h" #include "messages/MMDSTableRequest.h" #include "events/ETableServer.h" -#include "global/debug.h" +#include "MDS.h" +#include "MDLog.h" + +#include "MDSTableServer.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index d0ef16b2793..a96f5442f5e 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -11,21 +11,12 @@ * Foundation. See file COPYING. * */ - -#include "MDS.h" -#include "MDCache.h" -#include "CInode.h" -#include "CDir.h" -#include "CDentry.h" -#include "Migrator.h" -#include "Locker.h" -#include "Server.h" - -#include "MDBalancer.h" -#include "MDLog.h" -#include "MDSMap.h" +#include "mds_types.h" #include "include/filepath.h" +#include "common/config.h" +#include "msg/Messenger.h" +#include "global/debug.h" #include "events/EString.h" #include "events/EExport.h" @@ -33,10 +24,7 @@ #include "events/EImportFinish.h" #include "events/ESessions.h" -#include "msg/Messenger.h" - #include "messages/MClientCaps.h" - #include "messages/MExportDirDiscover.h" #include "messages/MExportDirDiscoverAck.h" #include "messages/MExportDirCancel.h" @@ -47,10 +35,20 @@ #include "messages/MExportDirNotify.h" #include "messages/MExportDirNotifyAck.h" #include "messages/MExportDirFinish.h" - #include "messages/MExportCaps.h" #include "messages/MExportCapsAck.h" +#include "MDS.h" +#include "MDCache.h" +#include "CInode.h" +#include "CDir.h" +#include "CDentry.h" +#include "Locker.h" +#include "Server.h" +#include "MDBalancer.h" +#include "MDLog.h" + +#include "Migrator.h" /* * this is what the dir->dir_auth values look like @@ -72,9 +70,6 @@ * - auth bit is set if i am listed as first _or_ second dir_auth. */ -#include "common/config.h" -#include "global/debug.h" - #define dout_subsys ceph_subsys_mds #undef DOUT_COND #define DOUT_COND(cct, l) (l <= cct->_conf->debug_mds || l <= cct->_conf->debug_mds_migrator) diff --git a/src/mds/Migrator.h b/src/mds/Migrator.h index 7827667b208..284d712988e 100644 --- a/src/mds/Migrator.h +++ b/src/mds/Migrator.h @@ -22,11 +22,11 @@ #include <map> #include <list> #include <set> + using std::map; using std::list; using std::set; - class MDS; class CDir; class CInode; @@ -48,7 +48,6 @@ class MExportCapsAck; class EImportStart; - class Migrator { private: MDS *mds; diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc index a9c35134bc8..8aecb89de43 100644 --- a/src/mds/Mutation.cc +++ b/src/mds/Mutation.cc @@ -11,14 +11,13 @@ * Foundation. See file COPYING. * */ +#include "messages/MMDSSlaveRequest.h" +#include "messages/MClientRequest.h" -#include "Mutation.h" #include "ScatterLock.h" #include "CDir.h" -#include "messages/MClientRequest.h" -#include "messages/MMDSSlaveRequest.h" - +#include "Mutation.h" // Mutation diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h index 37cc764254d..5d7fd121df5 100644 --- a/src/mds/Mutation.h +++ b/src/mds/Mutation.h @@ -15,11 +15,11 @@ #ifndef CEPH_MDS_MUTATION_H #define CEPH_MDS_MUTATION_H +#include "mds_types.h" + #include "include/interval_set.h" #include "include/elist.h" -#include "mdstypes.h" - #include "SimpleLock.h" #include "Capability.h" diff --git a/src/mds/Resetter.cc b/src/mds/Resetter.cc index e968cdcada6..061bb2ee734 100644 --- a/src/mds/Resetter.cc +++ b/src/mds/Resetter.cc @@ -12,11 +12,13 @@ * */ -#include "mds/Resetter.h" -#include "osdc/Journaler.h" -#include "mds/mdstypes.h" +#include "mds_types.h" + #include "mon/MonClient.h" -#include "mds/events/EResetJournal.h" + +#include "events/EResetJournal.h" + +#include "Resetter.h" Resetter::~Resetter() { diff --git a/src/mds/Server.cc b/src/mds/Server.cc index e5e967afcbb..36c83915a14 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -12,19 +12,21 @@ * */ -#include "MDS.h" -#include "Server.h" -#include "Locker.h" -#include "MDCache.h" -#include "MDLog.h" -#include "Migrator.h" -#include "MDBalancer.h" -#include "AnchorClient.h" -#include "InoTable.h" -#include "SnapClient.h" -#include "Mutation.h" +#include "mds_types.h" + +#include <errno.h> +#include <fcntl.h> +#include <list> +#include <iostream> +#include "include/filepath.h" +#include "include/compat.h" +#include "common/Timer.h" +#include "common/perf_counters.h" +#include "common/config.h" #include "msg/Messenger.h" +#include "osd/OSDMap.h" +#include "global/debug.h" #include "messages/MClientSession.h" #include "messages/MClientRequest.h" @@ -32,11 +34,8 @@ #include "messages/MClientReconnect.h" #include "messages/MClientCaps.h" #include "messages/MClientSnap.h" - #include "messages/MMDSSlaveRequest.h" - #include "messages/MLock.h" - #include "messages/MDentryUnlink.h" #include "events/EString.h" @@ -46,21 +45,21 @@ #include "events/EOpen.h" #include "events/ECommitted.h" -#include "include/filepath.h" -#include "common/Timer.h" -#include "common/perf_counters.h" -#include "include/compat.h" +#include "MDS.h" +#include "Locker.h" +#include "MDCache.h" +#include "MDLog.h" +#include "Migrator.h" +#include "MDBalancer.h" +#include "AnchorClient.h" +#include "InoTable.h" +#include "SnapClient.h" +#include "Mutation.h" -#include <errno.h> -#include <fcntl.h> +#include "Server.h" -#include <list> -#include <iostream> using namespace std; -#include "common/config.h" -#include "global/debug.h" - #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".server " diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index de0d11232bd..fd561e069a1 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -12,20 +12,20 @@ * */ +#include "include/assert.h" +#include "common/config.h" +#include "osdc/Filer.h" +#include "global/debug.h" + #include "MDS.h" #include "MDCache.h" -#include "SessionMap.h" -#include "osdc/Filer.h" -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" +#include "SessionMap.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix #define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".sessionmap " - void SessionMap::dump() { dout(10) << "dump" << dendl; diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h index 759454b1873..56e75693210 100644 --- a/src/mds/SessionMap.h +++ b/src/mds/SessionMap.h @@ -11,29 +11,26 @@ * Foundation. See file COPYING. * */ - #ifndef CEPH_MDS_SESSIONMAP_H #define CEPH_MDS_SESSIONMAP_H -#include <set> -using std::set; +#include "mds_types.h" +#include <set> #include <ext/hash_map> -using __gnu_cxx::hash_map; #include "include/Context.h" #include "include/xlist.h" #include "include/elist.h" #include "include/interval_set.h" -#include "mdstypes.h" - -class CInode; -class MDRequest; +#include "msg/Message.h" +#include "global/global_context.h" #include "CInode.h" #include "Capability.h" -#include "msg/Message.h" +using std::set; +using __gnu_cxx::hash_map; /* * session diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h index 5ea2d4b7f50..427b266de94 100644 --- a/src/mds/SimpleLock.h +++ b/src/mds/SimpleLock.h @@ -16,6 +16,8 @@ #ifndef CEPH_SIMPLELOCK_H #define CEPH_SIMPLELOCK_H +#include "mds_types.h" + // -- lock types -- // see CEPH_LOCK_* diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index a9a97c5fad9..79b32fb6923 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -11,21 +11,21 @@ * Foundation. See file COPYING. * */ +#include "mds_types.h" -#include "SnapServer.h" -#include "MDS.h" -#include "osd/OSDMap.h" +#include "include/assert.h" +#include "common/config.h" +#include "msg/Messenger.h" #include "mon/MonClient.h" +#include "osd/OSDMap.h" +#include "global/debug.h" -#include "include/types.h" #include "messages/MMDSTableRequest.h" #include "messages/MRemoveSnaps.h" -#include "msg/Messenger.h" +#include "MDS.h" -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" +#include "SnapServer.h" #define dout_subsys ceph_subsys_mds #undef dout_prefix diff --git a/src/mds/flock.cc b/src/mds/flock.cc index 74e6989474c..1d0d05f4301 100644 --- a/src/mds/flock.cc +++ b/src/mds/flock.cc @@ -1,10 +1,10 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include <errno.h> +#include "mds_types.h" #include "global/debug.h" -#include "mdstypes.h" -#include "mds/flock.h" + +#include "flock.h" #define dout_subsys ceph_subsys_mds diff --git a/src/mds/flock.h b/src/mds/flock.h index ae93d1660f0..344b6750e8a 100644 --- a/src/mds/flock.h +++ b/src/mds/flock.h @@ -3,11 +3,11 @@ #ifndef CEPH_MDS_FLOCK_H #define CEPH_MDS_FLOCK_H +#include "mds_types.h" + #include <errno.h> #include "common/debug.h" -#include "mdstypes.h" - inline ostream& operator<<(ostream& out, ceph_filelock& l) { out << "start: " << l.start << ", length: " << l.length diff --git a/src/mds/journal.cc b/src/mds/journal.cc index c85d9dbe448..09c9c28a635 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -14,6 +14,8 @@ #include "common/config.h" #include "osdc/Journaler.h" +#include "global/debug.h" + #include "events/EString.h" #include "events/ESubtreeMap.h" #include "events/ESession.h" @@ -35,9 +37,6 @@ #include "events/ETableClient.h" #include "events/ETableServer.h" - -#include "LogSegment.h" - #include "MDS.h" #include "MDLog.h" #include "MDCache.h" @@ -51,7 +50,6 @@ #include "Locker.h" -#include "global/debug.h" #define dout_subsys ceph_subsys_mds #undef DOUT_COND diff --git a/src/mds/locks.c b/src/mds/locks.c index ce1a6dd453c..d8de3fb90df 100644 --- a/src/mds/locks.c +++ b/src/mds/locks.c @@ -15,6 +15,7 @@ typedef char bool; #include <fcntl.h> #include "include/ceph_fs.h" + #include "locks.h" static const struct sm_state_t simplelock[LOCK_MAX] = { diff --git a/src/mds/mdstypes.h b/src/mds/mds_types.h index 22e754eb2a1..e7125203edc 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mds_types.h @@ -3,25 +3,27 @@ #ifndef CEPH_MDSTYPES_H #define CEPH_MDSTYPES_H +#include "include/types.h" + +#include <boost/pool/pool.hpp> #include <inttypes.h> #include <math.h> #include <ostream> #include <set> #include <map> -using namespace std; -#include "common/config.h" -#include "common/Clock.h" -#include "common/DecayCounter.h" #include "include/Context.h" - +#include "include/assert.h" #include "include/frag.h" #include "include/xlist.h" +#include "common/config.h" +#include "common/Clock.h" +#include "common/DecayCounter.h" +#include "global/global_context.h" #include "inode_backtrace.h" -#include <boost/pool/pool.hpp> -#include "include/assert.h" +using namespace std; #define CEPH_FS_ONDISK_MAGIC "ceph fs volume v011" diff --git a/src/mds/snap.cc b/src/mds/snap.cc index d7392d2959a..c0aebd58fa5 100644 --- a/src/mds/snap.cc +++ b/src/mds/snap.cc @@ -11,14 +11,16 @@ * Foundation. See file COPYING. * */ - -#include "snap.h" -#include "MDCache.h" -#include "MDS.h" +#include "mds_types.h" #include "messages/MClientSnap.h" #include "global/debug.h" +#include "MDS.h" +#include "MDCache.h" + +#include "snap.h" + /* * SnapRealm */ diff --git a/src/mds/snap.h b/src/mds/snap.h index e583820dce9..4c4eb07da09 100644 --- a/src/mds/snap.h +++ b/src/mds/snap.h @@ -15,7 +15,8 @@ #ifndef CEPH_MDS_SNAP_H #define CEPH_MDS_SNAP_H -#include "mdstypes.h" +#include "mds_types.h" + #include "include/xlist.h" #include "include/elist.h" #include "common/snap_types.h" diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h index aa40407d063..9010cd1a0fb 100644 --- a/src/messages/MCacheExpire.h +++ b/src/messages/MCacheExpire.h @@ -15,7 +15,7 @@ #ifndef CEPH_MCACHEEXPIRE_H #define CEPH_MCACHEEXPIRE_H -#include "mds/mdstypes.h" +#include "mds/mds_types.h" class MCacheExpire : public Message { __s32 from; diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h index 400159c6db6..2b4ee77e5aa 100644 --- a/src/messages/MClientReconnect.h +++ b/src/messages/MClientReconnect.h @@ -15,10 +15,10 @@ #ifndef CEPH_MCLIENTRECONNECT_H #define CEPH_MCLIENTRECONNECT_H -#include "msg/Message.h" -#include "mds/mdstypes.h" -#include "include/ceph_features.h" +#include "mds/mds_types.h" +#include "include/ceph_features.h" +#include "msg/Message.h" class MClientReconnect : public Message { diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index 9dc93836329..3cb9c29575d 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -33,15 +33,15 @@ * */ -#include "msg/Message.h" -#include "include/filepath.h" -#include "mds/mdstypes.h" +#include "mds/mds_types.h" #include <sys/types.h> #include <utime.h> #include <sys/stat.h> #include <fcntl.h> +#include "include/filepath.h" +#include "msg/Message.h" // metadata ops. diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h index 03ec582c49e..417303ebaa8 100644 --- a/src/messages/MMDSSlaveRequest.h +++ b/src/messages/MMDSSlaveRequest.h @@ -16,8 +16,11 @@ #ifndef CEPH_MMDSSLAVEREQUEST_H #define CEPH_MMDSSLAVEREQUEST_H +#include "mds/mds_types.h" + +#include "include/filepath.h" + #include "msg/Message.h" -#include "mds/mdstypes.h" class MMDSSlaveRequest : public Message { public: diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h index b589d9842f1..d533f7f94b4 100644 --- a/src/messages/MMonElection.h +++ b/src/messages/MMonElection.h @@ -16,6 +16,7 @@ #ifndef CEPH_MMONELECTION_H #define CEPH_MMONELECTION_H +#include "include/ceph_features.h" #include "msg/Message.h" #include "mon/MonMap.h" diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 727c1c525a8..017aabcf96d 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -12,33 +12,34 @@ * */ -#include <sstream> - -#include "AuthMonitor.h" -#include "Monitor.h" -#include "MonitorStore.h" +#include "mon_types.h" +#include "osd/osd_types.h" -#include "messages/MMonCommand.h" -#include "messages/MAuth.h" -#include "messages/MAuthReply.h" -#include "messages/MMonGlobalID.h" +#include <sstream> #include "include/str_list.h" +#include "include/assert.h" +#include "common/config.h" #include "common/Timer.h" - #include "auth/AuthServiceHandler.h" #include "auth/KeyRing.h" +#include "global/global_context.h" +#include "global/debug.h" -#include "osd/osd_types.h" +#include "messages/MMonCommand.h" +#include "messages/MAuth.h" +#include "messages/MAuthReply.h" +#include "messages/MMonGlobalID.h" -#include "common/config.h" -#include "include/assert.h" +#include "Monitor.h" +#include "MonitorStore.h" -#include "global/debug.h" +#include "AuthMonitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix #define dout_prefix _prefix(_dout, mon, paxos->get_version()) + static ostream& _prefix(std::ostream *_dout, Monitor *mon, version_t v) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h index 92e79373223..6094750ed96 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -15,15 +15,18 @@ #ifndef CEPH_AUTHMONITOR_H #define CEPH_AUTHMONITOR_H +#include "mon_types.h" + #include <map> #include <set> -using namespace std; #include "include/ceph_features.h" -#include "include/types.h" #include "msg/Messenger.h" + #include "PaxosService.h" -#include "mon/Monitor.h" +#include "Monitor.h" + +using namespace std; class MMonCommand; class MAuth; diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index 3483c2438bb..a269af76bbd 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -11,19 +11,20 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" -#include "Elector.h" -#include "Monitor.h" +#include "include/assert.h" +#include "common/config.h" +#include "global/global_context.h" +#include "global/debug.h" -#include "common/Timer.h" -#include "MonitorStore.h" -#include "MonmapMonitor.h" #include "messages/MMonElection.h" -#include "common/config.h" -#include "include/assert.h" +#include "Monitor.h" +#include "MonitorStore.h" +#include "MonmapMonitor.h" -#include "global/debug.h" +#include "Elector.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/Elector.h b/src/mon/Elector.h index d81eb239763..38a85dabeb1 100644 --- a/src/mon/Elector.h +++ b/src/mon/Elector.h @@ -16,15 +16,15 @@ #ifndef CEPH_MON_ELECTOR_H #define CEPH_MON_ELECTOR_H -#include <map> -using namespace std; +#include "mon_types.h" -#include "include/types.h" -#include "msg/Message.h" +#include <map> #include "include/Context.h" - #include "common/Timer.h" +#include "msg/Message.h" + +using namespace std; class Monitor; diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index ccc896c77bf..62299afc0ac 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -11,26 +11,26 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" +#include "osd/osd_types.h" #include <sstream> #include <syslog.h> -#include "LogMonitor.h" -#include "Monitor.h" -#include "MonitorStore.h" +#include "include/assert.h" +#include "common/Timer.h" +#include "common/errno.h" +#include "common/config.h" +#include "global/global_context.h" +#include "global/debug.h" #include "messages/MMonCommand.h" -#include "messages/MLog.h" #include "messages/MLogAck.h" -#include "common/Timer.h" - -#include "osd/osd_types.h" -#include "common/errno.h" -#include "common/config.h" -#include "include/assert.h" +#include "Monitor.h" +#include "MonitorStore.h" -#include "global/debug.h" +#include "LogMonitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h index 49fecc6f2ee..fc0db46004a 100644 --- a/src/mon/LogMonitor.h +++ b/src/mon/LogMonitor.h @@ -15,16 +15,18 @@ #ifndef CEPH_LOGMONITOR_H #define CEPH_LOGMONITOR_H +#include "mon_types.h" + #include <map> #include <set> -using namespace std; -#include "include/types.h" +#include "common/LogEntry.h" #include "msg/Messenger.h" +#include "messages/MLog.h" + #include "PaxosService.h" -#include "common/LogEntry.h" -#include "messages/MLog.h" +using namespace std; class MMonCommand; diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 03364feac3d..ded878d71e9 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -11,31 +11,30 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" +#include <sstream> -#include "MDSMonitor.h" -#include "Monitor.h" -#include "MonitorStore.h" -#include "OSDMonitor.h" - +#include "include/assert.h" +#include "common/config.h" #include "common/strtol.h" #include "common/ceph_argparse.h" +#include "common/perf_counters.h" +#include "common/Timer.h" +#include "global/global_context.h" +#include "global/debug.h" #include "messages/MMDSMap.h" #include "messages/MMDSBeacon.h" #include "messages/MMDSLoadTargets.h" #include "messages/MMonCommand.h" - #include "messages/MGenericMessage.h" -#include "common/perf_counters.h" -#include "common/Timer.h" - -#include <sstream> +#include "Monitor.h" +#include "MonitorStore.h" +#include "OSDMonitor.h" -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" +#include "MDSMonitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index d852785fa90..79cae760515 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -18,19 +18,20 @@ #ifndef CEPH_MDSMONITOR_H #define CEPH_MDSMONITOR_H +#include "mon_types.h" + #include <map> #include <set> -using namespace std; -#include "include/types.h" #include "msg/Messenger.h" - #include "mds/MDSMap.h" +#include "messages/MMDSBeacon.h" + #include "PaxosService.h" #include "Session.h" -#include "messages/MMDSBeacon.h" +using namespace std; class MMDSGetMap; class MMonCommand; diff --git a/src/mon/MonCaps.cc b/src/mon/MonCaps.cc index 3c5be9278a3..0909ea8867b 100644 --- a/src/mon/MonCaps.cc +++ b/src/mon/MonCaps.cc @@ -11,14 +11,16 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" #include <errno.h> + +#include "include/ceph_features.h" #include "common/config.h" #include "common/debug.h" #include "common/Formatter.h" + #include "MonCaps.h" -#include "mon_types.h" -#include "include/ceph_features.h" #define dout_subsys ceph_subsys_auth diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 6ffe8e8d6da..9b7988da821 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -12,7 +12,18 @@ * */ +#include "include/str_list.h" +#include "include/addr_parsing.h" +#include "common/ConfUtils.h" +#include "common/ceph_argparse.h" +#include "common/errno.h" +#include "common/LogClient.h" +#include "common/config.h" +#include "auth/Auth.h" +#include "auth/KeyRing.h" +#include "auth/AuthMethodList.h" #include "msg/SimpleMessenger.h" + #include "messages/MMonGetMap.h" #include "messages/MMonGetVersion.h" #include "messages/MMonGetVersionReply.h" @@ -22,23 +33,8 @@ #include "messages/MMonSubscribe.h" #include "messages/MMonSubscribeAck.h" -#include "common/ConfUtils.h" -#include "common/ceph_argparse.h" -#include "common/errno.h" -#include "common/LogClient.h" #include "MonClient.h" -#include "MonMap.h" - -#include "auth/Auth.h" -#include "auth/KeyRing.h" -#include "auth/AuthMethodList.h" - -#include "include/str_list.h" -#include "include/addr_parsing.h" - -#include "common/config.h" - #define dout_subsys ceph_subsys_monc #undef dout_prefix diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index 1d38ed27602..5eacda6c96f 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -15,22 +15,19 @@ #ifndef CEPH_MONCLIENT_H #define CEPH_MONCLIENT_H -#include "msg/Dispatcher.h" -#include "msg/Messenger.h" - -#include "MonMap.h" +#include <memory> #include "common/Timer.h" #include "common/Finisher.h" - +#include "common/SimpleRNG.h" +#include "msg/Dispatcher.h" +#include "msg/Messenger.h" #include "auth/AuthClientHandler.h" #include "auth/RotatingKeyRing.h" #include "messages/MMonSubscribe.h" -#include "common/SimpleRNG.h" - -#include <memory> +#include "MonMap.h" class MonMap; class MMonMap; diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index 3577fc94ed5..f22f901ea9e 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -1,19 +1,17 @@ -#include "MonMap.h" - #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include "common/Formatter.h" - #include "include/ceph_features.h" #include "include/addr_parsing.h" +#include "common/Formatter.h" #include "common/ceph_argparse.h" #include "common/errno.h" - #include "common/debug.h" +#include "MonMap.h" + using ceph::Formatter; void MonMap::encode(bufferlist& blist, uint64_t features) const diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 6f5455783de..47d8165001e 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -15,11 +15,10 @@ #ifndef CEPH_MONMAP_H #define CEPH_MONMAP_H -#include "include/err.h" +#include "include/types.h" +#include "include/err.h" #include "msg/Message.h" -#include "include/types.h" -//#include "common/config.h" namespace ceph { class Formatter; diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 7cae0417439..9f5e3395256 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -11,21 +11,27 @@ * Foundation. See file COPYING. * */ - +#include "mon_types.h" #include <sstream> #include <stdlib.h> #include <signal.h> #include <limits.h> -#include "Monitor.h" +#include "include/color.h" +#include "include/ceph_fs.h" +#include "include/str_list.h" +#include "include/assert.h" +#include "common/config.h" #include "common/version.h" - -#include "osd/OSDMap.h" - -#include "MonitorStore.h" - -#include "msg/Messenger.h" +#include "common/strtol.h" +#include "common/ceph_argparse.h" +#include "common/Clock.h" +#include "common/errno.h" +#include "common/perf_counters.h" +#include "common/admin_socket.h" +#include "global/global_context.h" +#include "global/debug.h" #include "messages/PaxosServiceMessage.h" #include "messages/MMonMap.h" @@ -33,45 +39,25 @@ #include "messages/MMonGetVersion.h" #include "messages/MMonGetVersionReply.h" #include "messages/MGenericMessage.h" -#include "messages/MMonCommand.h" #include "messages/MMonCommandAck.h" #include "messages/MMonProbe.h" #include "messages/MMonJoin.h" #include "messages/MMonPaxos.h" #include "messages/MRoute.h" #include "messages/MForward.h" - #include "messages/MMonSubscribe.h" #include "messages/MMonSubscribeAck.h" - #include "messages/MAuthReply.h" -#include "common/strtol.h" -#include "common/ceph_argparse.h" -#include "common/Timer.h" -#include "common/Clock.h" -#include "common/errno.h" -#include "common/perf_counters.h" -#include "common/admin_socket.h" - -#include "include/color.h" -#include "include/ceph_fs.h" -#include "include/str_list.h" - #include "OSDMonitor.h" #include "MDSMonitor.h" #include "MonmapMonitor.h" #include "PGMonitor.h" #include "LogMonitor.h" #include "AuthMonitor.h" +#include "MonitorStore.h" -#include "auth/AuthMethodList.h" -#include "auth/KeyRing.h" - -#include "common/config.h" -#include "include/assert.h" - -#include "global/debug.h" +#include "Monitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 1fddcd45e37..8299f00c258 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -23,31 +23,26 @@ #ifndef CEPH_MONITOR_H #define CEPH_MONITOR_H -#include "include/types.h" -#include "msg/Messenger.h" - -#include "common/Timer.h" - -#include "MonMap.h" -#include "Elector.h" -#include "Paxos.h" -#include "Session.h" +#include "mon_types.h" -#include "osd/OSDMap.h" +#include <memory> +#include <errno.h> +#include "common/Timer.h" #include "common/LogClient.h" - #include "auth/cephx/CephxKeyServer.h" #include "auth/AuthMethodList.h" #include "auth/KeyRing.h" - +#include "msg/Messenger.h" +#include "osd/OSDMap.h" #include "perfglue/heap_profiler.h" #include "messages/MMonCommand.h" -#include <memory> -#include <errno.h> - +#include "MonMap.h" +#include "Elector.h" +#include "Paxos.h" +#include "Session.h" #define CEPH_MON_PROTOCOL 9 /* cluster internal */ diff --git a/src/mon/MonitorStore.cc b/src/mon/MonitorStore.cc index fa14783ccd2..6dc5391af71 100644 --- a/src/mon/MonitorStore.cc +++ b/src/mon/MonitorStore.cc @@ -11,8 +11,22 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" -#include "MonitorStore.h" +#include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <sstream> +#include <sys/file.h> + +#if defined(__FreeBSD__) +#include <sys/param.h> +#endif + +#include "include/compat.h" #include "common/Clock.h" #include "common/entity_name.h" #include "common/errno.h" @@ -22,11 +36,7 @@ #include "common/sync_filesystem.h" #include "global/debug.h" -#if defined(__FreeBSD__) -#include <sys/param.h> -#endif - -#include "include/compat.h" +#include "MonitorStore.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix @@ -35,15 +45,6 @@ static ostream& _prefix(std::ostream *_dout, const string& dir) { return *_dout << "store(" << dir << ") "; } -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <errno.h> -#include <unistd.h> -#include <sstream> -#include <sys/file.h> - int MonitorStore::mount() { char t[1024]; diff --git a/src/mon/MonitorStore.h b/src/mon/MonitorStore.h index 9d1efde3d53..ece82116dd4 100644 --- a/src/mon/MonitorStore.h +++ b/src/mon/MonitorStore.h @@ -15,15 +15,15 @@ #ifndef CEPH_MON_MONITORSTORE_H #define CEPH_MON_MONITORSTORE_H -#include "include/types.h" -#include "include/buffer.h" - -#include "common/compiler_extensions.h" +#include "mon_types.h" #include <iosfwd> #include <string.h> #include <errno.h> +#include "include/buffer.h" +#include "common/compiler_extensions.h" + class MonitorStore { string dir; int lock_fd; diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 46e0d7e2ca8..cbf52cb5faf 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -11,25 +11,27 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" -#include "MonmapMonitor.h" -#include "Monitor.h" -#include "MonitorStore.h" - -#include "messages/MMonCommand.h" -#include "messages/MMonJoin.h" +#include <sstream> +#include "include/assert.h" +#include "common/config.h" #include "common/Timer.h" #include "common/ceph_argparse.h" -#include "mon/MDSMonitor.h" -#include "mon/OSDMonitor.h" -#include "mon/PGMonitor.h" +#include "global/global_context.h" +#include "global/debug.h" -#include <sstream> -#include "common/config.h" -#include "include/assert.h" +#include "messages/MMonCommand.h" +#include "messages/MMonJoin.h" -#include "global/debug.h" +#include "MDSMonitor.h" +#include "OSDMonitor.h" +#include "PGMonitor.h" +#include "MonitorStore.h" +#include "Monitor.h" + +#include "MonmapMonitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h index 2cd4413e510..802d0170b08 100644 --- a/src/mon/MonmapMonitor.h +++ b/src/mon/MonmapMonitor.h @@ -19,17 +19,18 @@ #ifndef CEPH_MONMAPMONITOR_H #define CEPH_MONMAPMONITOR_H +#include "mon_types.h" + #include <map> #include <set> -using namespace std; - -#include "include/types.h" #include "msg/Messenger.h" #include "PaxosService.h" #include "MonMap.h" +using namespace std; + class MMonGetMap; class MMonMap; class MMonCommand; diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index fcbdbdfb07f..70f664a0256 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -11,18 +11,23 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" #include <sstream> -#include "OSDMonitor.h" -#include "Monitor.h" -#include "MDSMonitor.h" -#include "PGMonitor.h" - -#include "MonitorStore.h" - +#include "include/compat.h" +#include "include/assert.h" +#include "include/stringify.h" +#include "common/Timer.h" +#include "common/ceph_argparse.h" +#include "common/perf_counters.h" +#include "common/strtol.h" +#include "common/config.h" +#include "common/errno.h" #include "crush/CrushWrapper.h" #include "crush/CrushTester.h" +#include "global/debug.h" +#include "global/global_context.h" #include "messages/MOSDFailure.h" #include "messages/MOSDMap.h" @@ -35,19 +40,12 @@ #include "messages/MRemoveSnaps.h" #include "messages/MOSDScrub.h" -#include "common/Timer.h" -#include "common/ceph_argparse.h" -#include "common/perf_counters.h" -#include "common/strtol.h" - -#include "common/config.h" -#include "common/errno.h" - -#include "include/compat.h" -#include "include/assert.h" -#include "include/stringify.h" +#include "Monitor.h" +#include "MDSMonitor.h" +#include "PGMonitor.h" +#include "MonitorStore.h" -#include "global/debug.h" +#include "OSDMonitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 9529f731c84..ec3465f6433 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -18,25 +18,27 @@ #ifndef CEPH_OSDMONITOR_H #define CEPH_OSDMONITOR_H +#include "mon_types.h" + #include <map> #include <set> -using namespace std; -#include "include/types.h" #include "msg/Messenger.h" - #include "osd/OSDMap.h" -#include "PaxosService.h" -#include "Session.h" - -class Monitor; #include "messages/MOSDBoot.h" #include "messages/MMonCommand.h" #include "messages/MOSDMap.h" #include "messages/MOSDFailure.h" #include "messages/MPoolOp.h" +#include "PaxosService.h" +#include "Session.h" + +using namespace std; + +class Monitor; + /// information about a particular peer's failure reports for one osd struct failure_reporter_t { int num_reports; ///< reports from this reporter diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 938e2862aaa..c67788aca67 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -1,14 +1,12 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab +#include "include/ceph_features.h" +#include "common/Formatter.h" + #include "PGMap.h" #define dout_subsys ceph_subsys_mon -#include "common/debug.h" - -#include "common/Formatter.h" -#include "include/ceph_features.h" - // -- void PGMap::Incremental::encode(bufferlist &bl, uint64_t features) const diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h index 5748101125b..ea83b1cd80e 100644 --- a/src/mon/PGMap.h +++ b/src/mon/PGMap.h @@ -21,11 +21,13 @@ #ifndef CEPH_PGMAP_H #define CEPH_PGMAP_H -#include "common/debug.h" #include "osd/osd_types.h" -#include "common/config.h" + #include <sstream> +#include "common/debug.h" +#include "common/config.h" + namespace ceph { class Formatter; } class PGMap { diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 2791884953f..de6c0d340c2 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -11,42 +11,38 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" +#include <sstream> -#include "PGMonitor.h" -#include "Monitor.h" -#include "MDSMonitor.h" -#include "OSDMonitor.h" -#include "MonitorStore.h" +#include "common/Timer.h" +#include "common/Formatter.h" +#include "common/ceph_argparse.h" +#include "common/perf_counters.h" +#include "common/errno.h" +#include "osd/osd_types.h" +#include "global/global_context.h" +#include "global/debug.h" -#include "messages/MPGStats.h" -#include "messages/MPGStatsAck.h" #include "messages/MGetPoolStats.h" #include "messages/MGetPoolStatsReply.h" - #include "messages/MStatfs.h" #include "messages/MStatfsReply.h" #include "messages/MOSDPGCreate.h" #include "messages/MMonCommand.h" #include "messages/MOSDScrub.h" -#include "common/Timer.h" -#include "common/Formatter.h" -#include "common/ceph_argparse.h" -#include "common/perf_counters.h" - -#include "osd/osd_types.h" - -#include "common/config.h" -#include "common/errno.h" - -#include "global/debug.h" +#include "Monitor.h" +#include "MDSMonitor.h" +#include "OSDMonitor.h" +#include "MonitorStore.h" -#include <sstream> +#include "PGMonitor.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix #define dout_prefix _prefix(_dout, mon, pg_map) + static ostream& _prefix(std::ostream *_dout, const Monitor *mon, const PGMap& pg_map) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h index 2927c00453a..aa49e0932a8 100644 --- a/src/mon/PGMonitor.h +++ b/src/mon/PGMonitor.h @@ -20,19 +20,23 @@ #ifndef CEPH_PGMONITOR_H #define CEPH_PGMONITOR_H +#include "mon_types.h" + #include <map> #include <set> -using namespace std; -#include "PGMap.h" -#include "PaxosService.h" -#include "include/types.h" #include "include/utime.h" -#include "msg/Messenger.h" #include "common/config.h" +#include "msg/Messenger.h" #include "messages/MPGStats.h" #include "messages/MPGStatsAck.h" + +#include "PGMap.h" +#include "PaxosService.h" + +using namespace std; + class MStatfs; class MMonCommand; class MGetPoolStats; diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 72d5bc76370..7cb3dccd79f 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -11,20 +11,24 @@ * Foundation. See file COPYING. * */ +#include "mon_types.h" -#include "Paxos.h" -#include "Monitor.h" -#include "MonitorStore.h" +#include "include/assert.h" +#include "common/config.h" +#include "global/global_context.h" +#include "global/debug.h" #include "messages/MMonPaxos.h" -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" +#include "Monitor.h" +#include "MonitorStore.h" + +#include "Paxos.h" #define dout_subsys ceph_subsys_paxos #undef dout_prefix #define dout_prefix _prefix(_dout, mon, mon->name, mon->rank, machine_name, state, first_committed, last_committed) + static ostream& _prefix(std::ostream *_dout, Monitor *mon, const string& name, int rank, const char *machine_name, int state, version_t first_committed, version_t last_committed) diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index adc8af399ad..0deb2603b67 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -38,16 +38,16 @@ e 12v #ifndef CEPH_MON_PAXOS_H #define CEPH_MON_PAXOS_H -#include "include/types.h" #include "mon_types.h" -#include "include/buffer.h" -#include "messages/PaxosServiceMessage.h" -#include "msg/msg_types.h" -#include "include/Context.h" +#include <errno.h> +#include "include/buffer.h" +#include "include/Context.h" #include "common/Timer.h" -#include <errno.h> +#include "msg/msg_types.h" + +#include "messages/PaxosServiceMessage.h" class Monitor; class MMonPaxos; diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index 07d75e75625..361c586b0b5 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -12,17 +12,20 @@ * */ -#include "PaxosService.h" +#include "include/assert.h" +#include "common/config.h" #include "common/Clock.h" +#include "global/global_context.h" +#include "global/debug.h" + #include "Monitor.h" -#include "common/config.h" -#include "include/assert.h" -#include "global/debug.h" +#include "PaxosService.h" #define dout_subsys ceph_subsys_paxos #undef dout_prefix #define dout_prefix _prefix(_dout, mon, paxos, paxos->machine_id) + static ostream& _prefix(std::ostream *_dout, Monitor *mon, Paxos *paxos, int machine_id) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h index 78bcc8d367d..4ee78b52ef7 100644 --- a/src/mon/PaxosService.h +++ b/src/mon/PaxosService.h @@ -15,10 +15,12 @@ #ifndef CEPH_PAXOSSERVICE_H #define CEPH_PAXOSSERVICE_H -#include "messages/PaxosServiceMessage.h" -#include "include/Context.h" #include <errno.h> +#include "include/Context.h" + +#include "messages/PaxosServiceMessage.h" + class Monitor; class Paxos; diff --git a/src/mon/Session.h b/src/mon/Session.h index d343085238a..6a284121413 100644 --- a/src/mon/Session.h +++ b/src/mon/Session.h @@ -15,15 +15,15 @@ #ifndef CEPH_MON_SESSION_H #define CEPH_MON_SESSION_H -#include "include/xlist.h" +#include "mon_types.h" #include "msg/msg_types.h" +#include "include/xlist.h" #include "auth/AuthServiceHandler.h" +#include "global/global_context.h" #include "MonCaps.h" -#include "global/global_context.h" - struct MonSession; struct Subscription { diff --git a/src/mon/mon_types.h b/src/mon/mon_types.h index 48ca35d5322..3e4da25db39 100644 --- a/src/mon/mon_types.h +++ b/src/mon/mon_types.h @@ -15,6 +15,8 @@ #ifndef CEPH_MON_TYPES_H #define CEPH_MON_TYPES_H +#include "include/types.h" + #define PAXOS_PGMAP 0 // before osd, for pg kick to behave #define PAXOS_MDSMAP 1 #define PAXOS_OSDMAP 2 diff --git a/src/monmaptool.cc b/src/monmaptool.cc index cbc211accb9..221119f6466 100644 --- a/src/monmaptool.cc +++ b/src/monmaptool.cc @@ -16,17 +16,17 @@ #include <sys/stat.h> #include <fcntl.h> #include <errno.h> - #include <iostream> #include <string> -using namespace std; +#include "include/str_list.h" #include "common/config.h" #include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "global/debug.h" #include "mon/MonMap.h" -#include "include/str_list.h" +#include "global/global_init.h" +#include "global/global_context.h" + +using namespace std; void usage() { diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c index e42b2733c9e..0a2417a10e0 100755 --- a/src/mount/mount.ceph.c +++ b/src/mount/mount.ceph.c @@ -6,8 +6,8 @@ #include <sys/types.h> #include <sys/wait.h> -#include "common/secret.h" #include "include/addr_parsing.h" +#include "common/secret.h" #ifndef MS_RELATIME # define MS_RELATIME (1<<21) diff --git a/src/mount/mtab.c b/src/mount/mtab.c index 9b2c9237e16..6cb13fcc6cc 100644 --- a/src/mount/mtab.c +++ b/src/mount/mtab.c @@ -24,7 +24,6 @@ #include "mount/canonicalize.c" - /* Updating mtab ----------------------------------------------*/ /* Flag for already existing lock file. */ diff --git a/src/msg/Accepter.cc b/src/msg/Accepter.cc index ac180e21441..3ad0e8af2be 100644 --- a/src/msg/Accepter.cc +++ b/src/msg/Accepter.cc @@ -18,17 +18,16 @@ #include <limits.h> #include <poll.h> -#include "Accepter.h" -#include "SimpleMessenger.h" +#include "common/debug.h" +#include "common/errno.h" +#include "SimpleMessenger.h" #include "Message.h" #include "Pipe.h" -#include "common/debug.h" -#include "common/errno.h" +#include "Accepter.h" #define dout_subsys ceph_subsys_ms - #undef dout_prefix #define dout_prefix *_dout << "accepter." diff --git a/src/msg/Accepter.h b/src/msg/Accepter.h index 07d766b32cd..97ce600ac04 100644 --- a/src/msg/Accepter.h +++ b/src/msg/Accepter.h @@ -15,7 +15,8 @@ #ifndef CEPH_MSG_ACCEPTER_H #define CEPH_MSG_ACCEPTER_H -#include "msg/msg_types.h" +#include "msg_types.h" + #include "common/Thread.h" class SimpleMessenger; diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc index 04e405581a7..6c350c007c9 100644 --- a/src/msg/DispatchQueue.cc +++ b/src/msg/DispatchQueue.cc @@ -12,19 +12,19 @@ * */ -#include "msg/Message.h" -#include "DispatchQueue.h" -#include "SimpleMessenger.h" #include "common/ceph_context.h" - -#define dout_subsys ceph_subsys_ms #include "common/debug.h" +#include "Message.h" +#include "SimpleMessenger.h" + +#include "DispatchQueue.h" /******************* * DispatchQueue */ +#define dout_subsys ceph_subsys_ms #undef dout_prefix #define dout_prefix *_dout << "-- " << msgr->get_myaddr() << " " diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h index ea44c165d56..068d0924e1d 100644 --- a/src/msg/DispatchQueue.h +++ b/src/msg/DispatchQueue.h @@ -17,6 +17,7 @@ #include <map> #include <boost/intrusive_ptr.hpp> + #include "include/assert.h" #include "include/xlist.h" #include "include/atomic.h" diff --git a/src/msg/Dispatcher.h b/src/msg/Dispatcher.h index 9f837cd6fdb..207c58a36b5 100644 --- a/src/msg/Dispatcher.h +++ b/src/msg/Dispatcher.h @@ -16,10 +16,11 @@ #ifndef CEPH_DISPATCHER_H #define CEPH_DISPATCHER_H -#include "Message.h" #include "common/config.h" #include "auth/Auth.h" +#include "Message.h" + class Messenger; class Dispatcher { diff --git a/src/msg/Message.cc b/src/msg/Message.cc index 8d4a2f7e4d6..1c024f97b9f 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -1,20 +1,18 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab +#include "include/types.h" + #ifdef ENCODE_DUMP # include <typeinfo> # include <cxxabi.h> #endif #include <iostream> -using namespace std; - -#include "include/types.h" +#include "common/config.h" #include "global/global_context.h" -#include "Message.h" -#include "Pipe.h" #include "messages/MPGStats.h" #include "messages/MGenericMessage.h" @@ -146,7 +144,11 @@ using namespace std; #include "messages/MWatchNotify.h" -#include "common/config.h" +#include "Pipe.h" + +#include "Message.h" + +using namespace std; #define DEBUGLVL 10 // debug level of output diff --git a/src/msg/Message.h b/src/msg/Message.h index fc434ed9b85..840b75dcebb 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -14,21 +14,18 @@ #ifndef CEPH_MESSAGE_H #define CEPH_MESSAGE_H + +#include "msg_types.h" +#include "include/types.h" #include <stdlib.h> #include <ostream> - #include <boost/intrusive_ptr.hpp> -// Because intusive_ptr clobbers our assert... -#include "include/assert.h" -#include "include/types.h" +#include "include/assert.h" // intusive_ptr clobbers it #include "include/buffer.h" #include "common/Throttle.h" -#include "msg_types.h" - #include "common/RefCountedObj.h" - #include "common/debug.h" #include "common/config.h" diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index 6ece6536ad7..096df8c4b65 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -12,30 +12,29 @@ * */ - - #ifndef CEPH_MESSENGER_H #define CEPH_MESSENGER_H +#include "include/types.h" + #include <map> -using namespace std; +#include <errno.h> +#include <sstream> -#include "Message.h" -#include "Dispatcher.h" #include "common/Mutex.h" #include "common/Cond.h" #include "include/Context.h" -#include "include/types.h" #include "include/ceph_features.h" #include "auth/Crypto.h" -#include <errno.h> -#include <sstream> +#include "Message.h" +#include "Dispatcher.h" + +using namespace std; class MDS; class Timer; - class Messenger { private: list<Dispatcher*> dispatchers; diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index 1ebf2854473..d0f60847e83 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -18,19 +18,18 @@ #include <limits.h> #include <poll.h> -#include "Message.h" -#include "Pipe.h" -#include "SimpleMessenger.h" - #include "common/debug.h" #include "common/errno.h" - // Below included to get encode_encrypt(); That probably should be in Crypto.h, instead - #include "auth/Crypto.h" #include "auth/cephx/CephxProtocol.h" #include "auth/AuthSessionHandler.h" +#include "Message.h" +#include "SimpleMessenger.h" + +#include "Pipe.h" + // Constant to limit starting sequence number to 2^31. Nothing special about it, just a big number. PLR #define SEQ_MASK 0x7fffffff #define dout_subsys ceph_subsys_ms diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h index 1bcc8263f4a..18a3d2a6046 100644 --- a/src/msg/Pipe.h +++ b/src/msg/Pipe.h @@ -16,9 +16,10 @@ #define CEPH_MSGR_PIPE_H #include "msg_types.h" -#include "Messenger.h" + #include "auth/AuthSessionHandler.h" +#include "Messenger.h" class SimpleMessenger; class IncomingQueue; diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index d35fa039e48..a036c204dc6 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -16,29 +16,29 @@ #define CEPH_SIMPLEMESSENGER_H #include "include/types.h" -#include "include/xlist.h" #include <list> #include <map> -using namespace std; #include <ext/hash_map> #include <ext/hash_set> -using namespace __gnu_cxx; -#include "common/Mutex.h" #include "include/atomic.h" +#include "include/assert.h" +#include "include/xlist.h" +#include "common/Mutex.h" #include "common/Cond.h" #include "common/Thread.h" #include "common/Throttle.h" #include "Messenger.h" #include "Message.h" -#include "include/assert.h" #include "DispatchQueue.h" - #include "Pipe.h" #include "Accepter.h" +using namespace std; +using namespace __gnu_cxx; + /* * This class handles transmission and reception of messages. Generally * speaking, there are several major components: diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc index ef87e02e30d..aaccef60b8d 100644 --- a/src/msg/msg_types.cc +++ b/src/msg/msg_types.cc @@ -1,6 +1,4 @@ -#include "msg_types.h" - #include <arpa/inet.h> #include <stdlib.h> #include <string.h> @@ -8,6 +6,8 @@ #include "common/Formatter.h" +#include "msg_types.h" + void entity_name_t::dump(Formatter *f) const { f->dump_string("type", type_str()); diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index 8f3d74bb00c..f6a6bc997f7 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -15,9 +15,10 @@ #ifndef CEPH_MSG_TYPES_H #define CEPH_MSG_TYPES_H +#include "include/types.h" + #include <netinet/in.h> -#include "include/types.h" #include "include/blobhash.h" #include "include/encoding.h" diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc index 79f5af70e98..805d3b84f48 100644 --- a/src/objclass/class_api.cc +++ b/src/objclass/class_api.cc @@ -2,12 +2,11 @@ // vim: ts=8 sw=2 smarttab #include "common/config.h" - -#include "objclass/objclass.h" #include "osd/ReplicatedPG.h" - #include "osd/ClassHandler.h" +#include "objclass.h" + static ClassHandler *ch; void cls_initialize(ClassHandler *h) diff --git a/src/objclass/class_debug.cc b/src/objclass/class_debug.cc index ced943be8a7..39059b578fd 100644 --- a/src/objclass/class_debug.cc +++ b/src/objclass/class_debug.cc @@ -1,17 +1,16 @@ // -*- mode:C; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "common/config.h" - -#include "global/debug.h" -#include "objclass/objclass.h" - #include <stdio.h> #include <stdlib.h> #include <stdarg.h> - #include <iostream> +#include "common/config.h" +#include "global/debug.h" + +#include "objclass.h" + #define dout_subsys ceph_subsys_objclass int cls_log(int level, const char *format, ...) diff --git a/src/objclass/objclass.h b/src/objclass/objclass.h index 9f61bcbb5be..48ab4ee10f3 100644 --- a/src/objclass/objclass.h +++ b/src/objclass/objclass.h @@ -6,7 +6,7 @@ #ifdef __cplusplus -#include "../include/types.h" +#include "include/types.h" #include "msg/msg_types.h" extern "C" { diff --git a/src/os/CollectionIndex.h b/src/os/CollectionIndex.h index 9b1ceae8c46..23da0ad6cfd 100644 --- a/src/os/CollectionIndex.h +++ b/src/os/CollectionIndex.h @@ -19,8 +19,8 @@ #include <vector> #include <tr1/memory> -#include "osd/osd_types.h" #include "include/object.h" +#include "osd/osd_types.h" /** * CollectionIndex provides an interface for manipulating indexed colelctions diff --git a/src/os/DBObjectMap.cc b/src/os/DBObjectMap.cc index 3e7539c2414..41542b1316a 100644 --- a/src/os/DBObjectMap.cc +++ b/src/os/DBObjectMap.cc @@ -2,22 +2,13 @@ #include <iostream> #include <inttypes.h> -#include "include/buffer.h" -#include <set> -#include <map> -#include <string> -#include <tr1/memory> - -#include <vector> - -#include "ObjectMap.h" -#include "KeyValueDB.h" -#include "DBObjectMap.h" #include <errno.h> -#include "global/debug.h" -#include "common/config.h" #include "include/assert.h" +#include "common/config.h" +#include "global/debug.h" + +#include "DBObjectMap.h" #define dout_subsys ceph_subsys_filestore #undef dout_prefix diff --git a/src/os/DBObjectMap.h b/src/os/DBObjectMap.h index 18c6ce402ff..0c12a043b22 100644 --- a/src/os/DBObjectMap.h +++ b/src/os/DBObjectMap.h @@ -2,21 +2,22 @@ #ifndef DBOBJECTMAP_DB_H #define DBOBJECTMAP_DB_H -#include "include/buffer.h" +#include "osd/osd_types.h" + +#include <boost/scoped_ptr.hpp> +#include <tr1/memory> #include <set> #include <map> #include <string> - #include <vector> -#include <tr1/memory> -#include <boost/scoped_ptr.hpp> -#include "ObjectMap.h" -#include "KeyValueDB.h" -#include "osd/osd_types.h" +#include "include/buffer.h" #include "common/Mutex.h" #include "common/Cond.h" +#include "ObjectMap.h" +#include "KeyValueDB.h" + /** * DBObjectMap: Implements ObjectMap in terms of KeyValueDB * diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index f5b548d1968..2ddb9cfd6cb 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -12,15 +12,6 @@ * */ -#include "common/errno.h" -#include "common/safe_io.h" -#include "FileJournal.h" -#include "include/color.h" -#include "common/perf_counters.h" -#include "os/ObjectStore.h" - -#include "include/compat.h" - #include <fcntl.h> #include <sstream> #include <stdio.h> @@ -28,9 +19,16 @@ #include <sys/stat.h> #include <sys/mount.h> +#include "include/compat.h" +#include "include/color.h" +#include "common/errno.h" +#include "common/safe_io.h" +#include "common/perf_counters.h" #include "common/blkdev.h" +#include "os/ObjectStore.h" #include "global/debug.h" +#include "FileJournal.h" #define dout_subsys ceph_subsys_journal #undef dout_prefix diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h index 11349b87272..fe7c90243ae 100644 --- a/src/os/FileJournal.h +++ b/src/os/FileJournal.h @@ -17,18 +17,20 @@ #define CEPH_FILEJOURNAL_H #include <deque> -using std::deque; -#include "Journal.h" +#ifdef HAVE_LIBAIO +# include <libaio.h> +#endif + #include "common/Cond.h" #include "common/Mutex.h" #include "common/Thread.h" #include "common/Throttle.h" #include "global/global_context.h" -#ifdef HAVE_LIBAIO -# include <libaio.h> -#endif +#include "Journal.h" + +using std::deque; /** * Implements journaling on top of block device or file. diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index e8e1e6c5427..39c64838120 100644 --- a/src/os/FileStore.cc +++ b/src/os/FileStore.cc @@ -12,6 +12,9 @@ * */ +#include "include/types.h" +#include "osd/osd_types.h" + #include <inttypes.h> #include <unistd.h> #include <stdlib.h> @@ -22,65 +25,51 @@ #include <errno.h> #include <dirent.h> #include <sys/ioctl.h> +#include <sstream> +#include <iostream> #if defined(__linux__) #include <linux/fs.h> #include <syscall.h> #endif -#include <iostream> -#include <map> - #if defined(__FreeBSD__) #include "include/inttypes.h" #endif -#include "include/compat.h" -#include "include/fiemap.h" - -#include "common/xattr.h" -#include "chain_xattr.h" - #if defined(DARWIN) || defined(__FreeBSD__) #include <sys/param.h> #include <sys/mount.h> #endif // DARWIN - -#include <fstream> -#include <sstream> - -#include "FileStore.h" -#include "common/BackTrace.h" -#include "include/types.h" -#include "FileJournal.h" - -#include "osd/osd_types.h" +#include "include/compat.h" +#include "include/fiemap.h" #include "include/color.h" #include "include/buffer.h" - -#include "common/Timer.h" +#include "common/xattr.h" +#include "common/BackTrace.h" +#include "common/config.h" #include "common/errno.h" #include "common/run_cmd.h" #include "common/safe_io.h" #include "common/perf_counters.h" #include "common/sync_filesystem.h" #include "common/fd.h" -#include "HashIndex.h" +#include "common/ceph_crypto.h" +#include "global/debug.h" + +#include "chain_xattr.h" +#include "FileJournal.h" #include "DBObjectMap.h" #include "LevelDBStore.h" -#include "common/ceph_crypto.h" -using ceph::crypto::SHA1; - #ifndef __CYGWIN__ # include "btrfs_ioctl.h" #endif -#include "include/assert.h" +#include "FileStore.h" -#include "common/config.h" -#include "global/debug.h" +using ceph::crypto::SHA1; #define dout_subsys ceph_subsys_filestore #undef dout_prefix diff --git a/src/os/FileStore.h b/src/os/FileStore.h index e4b1566fbb8..5b08d40fb93 100644 --- a/src/os/FileStore.h +++ b/src/os/FileStore.h @@ -22,28 +22,24 @@ #include <deque> #include <boost/scoped_ptr.hpp> #include <fstream> -using namespace std; - #include <ext/hash_map> -using namespace __gnu_cxx; #include "include/assert.h" - -#include "ObjectStore.h" -#include "JournalingObjectStore.h" - +#include "include/uuid.h" #include "common/Timer.h" #include "common/WorkQueue.h" - #include "common/Mutex.h" +#include "global/global_context.h" + +#include "ObjectStore.h" +#include "JournalingObjectStore.h" #include "HashIndex.h" #include "IndexManager.h" #include "ObjectMap.h" #include "SequencerPosition.h" -#include "include/uuid.h" - -#include "global/global_context.h" +using namespace std; +using namespace __gnu_cxx; // from include/linux/falloc.h: #ifndef FALLOC_FL_PUNCH_HOLE diff --git a/src/os/FlatIndex.cc b/src/os/FlatIndex.cc index e6bf79d8145..aeb17695ba0 100644 --- a/src/os/FlatIndex.cc +++ b/src/os/FlatIndex.cc @@ -11,20 +11,21 @@ * Foundation. See file COPYING. * */ +#include "osd/osd_types.h" + +#include <errno.h> #if defined(__FreeBSD__) #include <sys/cdefs.h> #include <sys/param.h> #endif -#include "FlatIndex.h" -#include "CollectionIndex.h" #include "common/ceph_crypto.h" -#include "osd/osd_types.h" -#include <errno.h> #include "chain_xattr.h" +#include "FlatIndex.h" + using ceph::crypto::SHA1; /* diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc index 4107a06bce7..3e6f94895f0 100644 --- a/src/os/HashIndex.cc +++ b/src/os/HashIndex.cc @@ -11,16 +11,15 @@ * Foundation. See file COPYING. * */ - #include "include/types.h" -#include "include/buffer.h" #include "osd/osd_types.h" -#include <errno.h> -#include "HashIndex.h" +#include <errno.h> #include "global/debug.h" +#include "HashIndex.h" + #define dout_subsys ceph_subsys_filestore const string HashIndex::SUBDIR_ATTR = "contents"; diff --git a/src/os/HashIndex.h b/src/os/HashIndex.h index fcabd9f7198..6232b749071 100644 --- a/src/os/HashIndex.h +++ b/src/os/HashIndex.h @@ -17,8 +17,8 @@ #include "include/buffer.h" #include "include/encoding.h" -#include "LFNIndex.h" +#include "LFNIndex.h" /** * Implements collection prehashing. diff --git a/src/os/IndexManager.cc b/src/os/IndexManager.cc index 2d8b0e9306e..c04e1edb47f 100644 --- a/src/os/IndexManager.cc +++ b/src/os/IndexManager.cc @@ -12,29 +12,20 @@ * */ -#include <tr1/memory> -#include <map> +#include <errno.h> #if defined(__FreeBSD__) #include <sys/param.h> #endif -#include <errno.h> - -#include "common/Mutex.h" -#include "common/Cond.h" -#include "common/config.h" #include "include/buffer.h" - -#include "IndexManager.h" -#include "FlatIndex.h" -#include "HashIndex.h" -#include "CollectionIndex.h" - -#include "chain_xattr.h" #include "global/global_context.h" #include "global/debug.h" +#include "chain_xattr.h" + +#include "IndexManager.h" + static int set_version(const char *path, uint32_t version) { bufferlist bl; ::encode(version, bl); diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc index dfdca068372..68cc7682337 100644 --- a/src/os/JournalingObjectStore.cc +++ b/src/os/JournalingObjectStore.cc @@ -1,15 +1,13 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -#include "JournalingObjectStore.h" - #include "global/debug.h" +#include "JournalingObjectStore.h" + #define dout_subsys ceph_subsys_journal #undef dout_prefix #define dout_prefix *_dout << "journal " - - void JournalingObjectStore::journal_start() { dout(10) << "journal_start" << dendl; diff --git a/src/os/JournalingObjectStore.h b/src/os/JournalingObjectStore.h index 82b9ed5c252..6b9d8aba176 100644 --- a/src/os/JournalingObjectStore.h +++ b/src/os/JournalingObjectStore.h @@ -15,10 +15,11 @@ #ifndef CEPH_JOURNALINGOBJECTSTORE_H #define CEPH_JOURNALINGOBJECTSTORE_H -#include "ObjectStore.h" -#include "Journal.h" -#include "global/global_context.h" #include "common/RWLock.h" +#include "global/global_context.h" + +#include "Journal.h" +#include "ObjectStore.h" class JournalingObjectStore : public ObjectStore { protected: diff --git a/src/os/KeyValueDB.h b/src/os/KeyValueDB.h index f62bca996a5..e4784cf3ca0 100644 --- a/src/os/KeyValueDB.h +++ b/src/os/KeyValueDB.h @@ -3,12 +3,14 @@ #ifndef KEY_VALUE_DB_H #define KEY_VALUE_DB_H -#include "include/buffer.h" #include <set> #include <map> #include <string> #include <tr1/memory> #include <boost/scoped_ptr.hpp> + +#include "include/buffer.h" + #include "ObjectMap.h" using std::string; diff --git a/src/os/LFNIndex.cc b/src/os/LFNIndex.cc index 5e505638d15..969c94e0379 100644 --- a/src/os/LFNIndex.cc +++ b/src/os/LFNIndex.cc @@ -11,11 +11,8 @@ * Foundation. See file COPYING. * */ +#include "osd/osd_types.h" -#include <string> -#include <map> -#include <set> -#include <vector> #include <errno.h> #include <string.h> @@ -23,23 +20,20 @@ #include <sys/param.h> #endif -#include "osd/osd_types.h" -#include "include/object.h" -#include "common/config.h" -#include "common/debug.h" #include "include/buffer.h" -#include "common/ceph_crypto.h" #include "include/compat.h" +#include "common/config.h" +#include "common/debug.h" #include "chain_xattr.h" #include "LFNIndex.h" + using ceph::crypto::SHA1; #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "LFNIndex(" << get_base_path() << ") " - const string LFNIndex::LFN_ATTR = "user.cephos.lfn"; const string LFNIndex::PHASH_ATTR_PREFIX = "user.cephos.phash."; const string LFNIndex::SUBDIR_PREFIX = "DIR_"; diff --git a/src/os/LFNIndex.h b/src/os/LFNIndex.h index b3c05358822..af374d41a53 100644 --- a/src/os/LFNIndex.h +++ b/src/os/LFNIndex.h @@ -12,10 +12,11 @@ * */ - #ifndef OS_LFNINDEX_H #define OS_LFNINDEX_H +#include "osd/osd_types.h" + #include <string> #include <map> #include <set> @@ -23,7 +24,6 @@ #include <tr1/memory> #include <exception> -#include "osd/osd_types.h" #include "include/object.h" #include "common/ceph_crypto.h" diff --git a/src/os/LevelDBStore.cc b/src/os/LevelDBStore.cc index ec8fead966f..165706ceb0b 100644 --- a/src/os/LevelDBStore.cc +++ b/src/os/LevelDBStore.cc @@ -1,15 +1,18 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "LevelDBStore.h" #include <set> #include <map> #include <string> #include <tr1/memory> +#include <errno.h> + #include "leveldb/db.h" #include "leveldb/write_batch.h" #include "leveldb/slice.h" -#include <errno.h> + +#include "LevelDBStore.h" + using std::string; int LevelDBStore::init(ostream &out) diff --git a/src/os/LevelDBStore.h b/src/os/LevelDBStore.h index 0fd9a11bced..fedf5e509a7 100644 --- a/src/os/LevelDBStore.h +++ b/src/os/LevelDBStore.h @@ -4,17 +4,16 @@ #define LEVEL_DB_STORE_H #include "include/types.h" -#include "include/buffer.h" -#include "KeyValueDB.h" -#include <set> -#include <map> -#include <string> -#include <tr1/memory> + #include <boost/scoped_ptr.hpp> + +#include "include/buffer.h" #include "leveldb/db.h" #include "leveldb/write_batch.h" #include "leveldb/slice.h" +#include "KeyValueDB.h" + /** * Uses LevelDB to implement the KeyValueDB interface */ diff --git a/src/os/ObjectMap.h b/src/os/ObjectMap.h index 5cc1e495de1..6b84c4488cb 100644 --- a/src/os/ObjectMap.h +++ b/src/os/ObjectMap.h @@ -15,12 +15,13 @@ #ifndef OS_KEYVALUESTORE_H #define OS_KEYVALUESTORE_H -#include "IndexManager.h" -#include "SequencerPosition.h" #include <string> #include <vector> #include <tr1/memory> +#include "IndexManager.h" +#include "SequencerPosition.h" + /** * Encapsulates the FileStore key value store * diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc index dacc5440308..0be170c7bdd 100644 --- a/src/os/ObjectStore.cc +++ b/src/os/ObjectStore.cc @@ -12,9 +12,11 @@ * */ #include <sstream> -#include "ObjectStore.h" + #include "common/Formatter.h" +#include "ObjectStore.h" + ostream& operator<<(ostream& out, const ObjectStore::Sequencer& s) { return out << "osr(" << s.get_name() << " " << &s << ")"; diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index a1cb21c0326..e37aaf8ee48 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -14,12 +14,8 @@ #ifndef CEPH_OBJECTSTORE_H #define CEPH_OBJECTSTORE_H -#include "include/Context.h" -#include "include/buffer.h" #include "include/types.h" #include "osd/osd_types.h" -#include "common/TrackedOp.h" -#include "ObjectMap.h" #include <errno.h> #include <sys/stat.h> @@ -31,6 +27,12 @@ #include <sys/vfs.h> /* or <sys/statfs.h> */ #endif /* DARWIN */ +#include "include/Context.h" +#include "include/buffer.h" +#include "common/TrackedOp.h" + +#include "ObjectMap.h" + using std::vector; using std::string; diff --git a/src/os/SequencerPosition.h b/src/os/SequencerPosition.h index 38f11f08dc4..3f67a471a34 100644 --- a/src/os/SequencerPosition.h +++ b/src/os/SequencerPosition.h @@ -5,11 +5,13 @@ #define __CEPH_OS_SEQUENCERPOSITION_H #include "include/types.h" + +#include <ostream> + #include "include/cmp.h" #include "include/encoding.h" #include "common/Formatter.h" -#include <ostream> /** * transaction and op offset diff --git a/src/os/chain_xattr.cc b/src/os/chain_xattr.cc index 0fdaa90e30d..e64a3fcdb58 100644 --- a/src/os/chain_xattr.cc +++ b/src/os/chain_xattr.cc @@ -1,8 +1,6 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "chain_xattr.h" - #include <inttypes.h> #include <unistd.h> #include <stdlib.h> @@ -10,12 +8,10 @@ #include <sys/stat.h> #include <fcntl.h> #include <sys/file.h> -#include <errno.h> #include <dirent.h> #include <sys/ioctl.h> #include <string.h> #include <stdio.h> -#include "include/assert.h" #if defined(__linux__) #include <linux/fs.h> @@ -25,7 +21,9 @@ #include "include/inttypes.h" #endif -#include "common/xattr.h" +#include "include/assert.h" + +#include "chain_xattr.h" /* * chaining xattrs diff --git a/src/os/chain_xattr.h b/src/os/chain_xattr.h index 7e8312ff32b..d6558cd8b69 100644 --- a/src/os/chain_xattr.h +++ b/src/os/chain_xattr.h @@ -4,10 +4,10 @@ #ifndef __CEPH_OSD_CHAIN_XATTR_H #define __CEPH_OSD_CHAIN_XATTR_H -#include "common/xattr.h" - #include <errno.h> +#include "common/xattr.h" + #define CHAIN_XATTR_MAX_NAME_LEN 128 #define CHAIN_XATTR_MAX_BLOCK_LEN 2048 diff --git a/src/os/hobject.cc b/src/os/hobject.cc index 0134b30ebd1..54582c70acd 100644 --- a/src/os/hobject.cc +++ b/src/os/hobject.cc @@ -1,8 +1,9 @@ - #include "include/types.h" -#include "hobject.h" + #include "common/Formatter.h" +#include "hobject.h" + void hobject_t::encode(bufferlist& bl) const { ENCODE_START(4, 3, bl); diff --git a/src/os/hobject.h b/src/os/hobject.h index d75ae8570c4..c39e0ed916b 100644 --- a/src/os/hobject.h +++ b/src/os/hobject.h @@ -17,9 +17,8 @@ #include "include/object.h" #include "include/cmp.h" - #include "json_spirit/json_spirit_value.h" -#include "include/assert.h" // spirit clobbers it! +#include "include/assert.h" // spirit clobbers it! typedef uint64_t filestore_hobject_key_t; diff --git a/src/osd/Ager.cc b/src/osd/Ager.cc index 01e6745f16e..1563a403a6e 100644 --- a/src/osd/Ager.cc +++ b/src/osd/Ager.cc @@ -3,13 +3,6 @@ #include "include/types.h" -#include "Ager.h" -#include "os/ObjectStore.h" - -#include "common/Clock.h" -#include "global/global_context.h" -#include "global/debug.h" - // ick #include <sys/types.h> #include <sys/stat.h> @@ -20,6 +13,10 @@ #include <sys/mount.h> #endif // DARWIN || __FreeBSD__ +#include "global/global_context.h" +#include "global/debug.h" + +#include "Ager.h" int myrand() { diff --git a/src/osd/Ager.h b/src/osd/Ager.h index 55db507993f..5a5dd79edd4 100644 --- a/src/osd/Ager.h +++ b/src/osd/Ager.h @@ -4,12 +4,14 @@ #define CEPH_AGER_H #include "include/types.h" -#include "include/Distribution.h" -#include "os/ObjectStore.h" -#include "common/Clock.h" #include <list> #include <vector> + +#include "include/Distribution.h" +#include "common/Clock.h" +#include "os/ObjectStore.h" + using namespace std; class Ager { diff --git a/src/osd/ClassHandler.cc b/src/osd/ClassHandler.cc index e27f6c5ef2b..ec13eb2cde3 100644 --- a/src/osd/ClassHandler.cc +++ b/src/osd/ClassHandler.cc @@ -1,11 +1,7 @@ #include "include/types.h" -#include "msg/Message.h" -#include "osd/OSD.h" -#include "ClassHandler.h" #include <dlfcn.h> - #include <map> #if defined(__FreeBSD__) @@ -13,8 +9,13 @@ #endif #include "common/config.h" +#include "msg/Message.h" #include "global/debug.h" +#include "OSD.h" + +#include "ClassHandler.h" + #define dout_subsys ceph_subsys_osd #undef dout_prefix #define dout_prefix *_dout diff --git a/src/osd/ClassHandler.h b/src/osd/ClassHandler.h index f336d861fbc..f57de26f8cf 100644 --- a/src/osd/ClassHandler.h +++ b/src/osd/ClassHandler.h @@ -3,11 +3,9 @@ #include "include/types.h" -#include "objclass/objclass.h" - #include "common/Cond.h" #include "common/Mutex.h" - +#include "objclass/objclass.h" class ClassHandler { diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e0376e19f2d..2bc1a5e91fb 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -11,6 +11,7 @@ * Foundation. See file COPYING. * */ +#include "include/types.h" #include <fstream> #include <iostream> @@ -24,32 +25,31 @@ #include <sys/mount.h> #endif // DARWIN || __FreeBSD__ -#include "osd/PG.h" - -#include "include/types.h" #include "include/compat.h" - -#include "OSD.h" -#include "OSDMap.h" -#include "Watch.h" - +#include "include/color.h" +#include "include/assert.h" +#include "common/config.h" +#include "common/perf_counters.h" +#include "common/safe_io.h" +#include "common/HeartbeatMap.h" +#include "common/admin_socket.h" +#include "common/errno.h" #include "common/ceph_argparse.h" #include "common/version.h" -#include "os/FileStore.h" -#include "os/FileJournal.h" - -#include "ReplicatedPG.h" - -#include "Ager.h" - - +#include "auth/AuthAuthorizeHandler.h" +#include "mon/MonClient.h" #include "msg/Messenger.h" #include "msg/Message.h" - -#include "mon/MonClient.h" +#include "objclass/objclass.h" +#include "os/FileStore.h" +#include "os/FileJournal.h" +#include "perfglue/cpu_profiler.h" +#include "perfglue/heap_profiler.h" +#include "global/signal_handler.h" +#include "global/pidfile.h" +#include "global/debug.h" #include "messages/MLog.h" - #include "messages/MGenericMessage.h" #include "messages/MPing.h" #include "messages/MOSDPing.h" @@ -60,7 +60,6 @@ #include "messages/MOSDSubOpReply.h" #include "messages/MOSDBoot.h" #include "messages/MOSDPGTemp.h" - #include "messages/MOSDMap.h" #include "messages/MOSDPGNotify.h" #include "messages/MOSDPGQuery.h" @@ -74,47 +73,21 @@ #include "messages/MOSDPGMissing.h" #include "messages/MBackfillReserve.h" #include "messages/MRecoveryReserve.h" - #include "messages/MOSDAlive.h" - #include "messages/MOSDScrub.h" -#include "messages/MOSDRepScrub.h" - #include "messages/MMonCommand.h" #include "messages/MCommand.h" #include "messages/MCommandReply.h" - #include "messages/MPGStats.h" #include "messages/MPGStatsAck.h" - #include "messages/MWatchNotify.h" -#include "common/perf_counters.h" -#include "common/Timer.h" -#include "common/LogClient.h" -#include "common/safe_io.h" -#include "common/HeartbeatMap.h" -#include "common/admin_socket.h" - -#include "global/signal_handler.h" -#include "global/pidfile.h" -#include "global/debug.h" - -#include "include/color.h" -#include "perfglue/cpu_profiler.h" -#include "perfglue/heap_profiler.h" - -#include "osd/ClassHandler.h" -#include "osd/OpRequest.h" - -#include "auth/AuthAuthorizeHandler.h" - -#include "common/errno.h" - -#include "objclass/objclass.h" +#include "OSDMap.h" +#include "Watch.h" +#include "ReplicatedPG.h" +#include "Ager.h" -#include "include/assert.h" -#include "common/config.h" +#include "OSD.h" #define dout_subsys ceph_subsys_osd #undef dout_prefix diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 211a4c1fe7c..4da249f628b 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -15,45 +15,40 @@ #ifndef CEPH_OSD_H #define CEPH_OSD_H -#include "boost/tuple/tuple.hpp" - -#include "PG.h" - -#include "msg/Dispatcher.h" +#include <boost/tuple/tuple.hpp> +#include <map> +#include <memory> +#include <tr1/memory> +#include <ext/hash_map> +#include <ext/hash_set> +#include "include/CompatSet.h" #include "common/Mutex.h" #include "common/RWLock.h" #include "common/Timer.h" #include "common/WorkQueue.h" #include "common/LogClient.h" #include "common/AsyncReserver.h" - -#include "os/ObjectStore.h" -#include "OSDCap.h" - +#include "common/shared_cache.hpp" +#include "common/simple_cache.hpp" +#include "common/sharedptr_registry.hpp" +#include "common/PrioritizedQueue.h" #include "common/DecayCounter.h" -#include "osd/ClassHandler.h" - -#include "include/CompatSet.h" - #include "auth/KeyRing.h" +#include "msg/Dispatcher.h" +#include "os/ObjectStore.h" +#include "global/global_context.h" + #include "messages/MOSDRepScrub.h" + +#include "OSDCap.h" +#include "ClassHandler.h" #include "OpRequest.h" +#include "PG.h" -#include <map> -#include <memory> -#include <tr1/memory> using namespace std; - -#include <ext/hash_map> -#include <ext/hash_set> using namespace __gnu_cxx; -#include "common/shared_cache.hpp" -#include "common/simple_cache.hpp" -#include "common/sharedptr_registry.hpp" -#include "common/PrioritizedQueue.h" - #define CEPH_OSD_PROTOCOL 10 /* cluster internal */ diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc index 065631154f8..95a0a0bf07c 100644 --- a/src/osd/OSDCap.cc +++ b/src/osd/OSDCap.cc @@ -17,10 +17,11 @@ #include <boost/spirit/include/phoenix_operator.hpp> #include <boost/spirit/include/phoenix.hpp> -#include "OSDCap.h" #include "common/config.h" #include "common/debug.h" +#include "OSDCap.h" + using std::ostream; using std::vector; diff --git a/src/osd/OSDCap.h b/src/osd/OSDCap.h index 4306b89988b..00293212f45 100644 --- a/src/osd/OSDCap.h +++ b/src/osd/OSDCap.h @@ -27,10 +27,11 @@ #ifndef CEPH_OSDCAP_H #define CEPH_OSDCAP_H +#include "include/types.h" + #include <ostream> -using std::ostream; -#include "include/types.h" +using std::ostream; static const __u8 OSD_CAP_R = (1 << 1); // read static const __u8 OSD_CAP_W = (1 << 2); // write diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 03ecad78dcc..891a9fde910 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -12,13 +12,10 @@ * */ -#include "OSDMap.h" - -#include "common/config.h" +#include "common/code_environment.h" #include "common/Formatter.h" -#include "include/ceph_features.h" -#include "common/code_environment.h" +#include "OSDMap.h" #define dout_subsys ceph_subsys_osd diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 4d4bbd0b031..095aff0b542 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -21,27 +21,26 @@ * disks, disk groups, total # osds, * */ -#include "common/config.h" + #include "include/types.h" #include "osd_types.h" -#include "msg/Message.h" -#include "common/Mutex.h" -#include "common/Clock.h" - -#include "include/ceph_features.h" - -#include "crush/CrushWrapper.h" - -#include "include/interval_set.h" #include <vector> #include <list> #include <set> #include <map> #include <tr1/memory> -using namespace std; - #include <ext/hash_set> + +#include "include/ceph_features.h" +#include "include/interval_set.h" +#include "common/config.h" +#include "common/Mutex.h" +#include "common/Clock.h" +#include "crush/CrushWrapper.h" +#include "msg/Message.h" + +using namespace std; using __gnu_cxx::hash_set; /* diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc index 2999f7e8b5d..e2de8d2acdf 100644 --- a/src/osd/OpRequest.cc +++ b/src/osd/OpRequest.cc @@ -1,17 +1,18 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -#include "OpRequest.h" -#include "common/Formatter.h" #include <iostream> #include <vector> + +#include "include/assert.h" +#include "common/Formatter.h" #include "common/config.h" -#include "msg/Message.h" #include "messages/MOSDOp.h" #include "messages/MOSDSubOp.h" -#include "include/assert.h" #include "global/global_context.h" #include "global/debug.h" +#include "OpRequest.h" + #define dout_subsys ceph_subsys_optracker #undef dout_prefix #define dout_prefix _prefix(_dout) diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h index b689764ed3a..ff095a5cc56 100644 --- a/src/osd/OpRequest.h +++ b/src/osd/OpRequest.h @@ -13,17 +13,18 @@ #ifndef OPREQUEST_H_ #define OPREQUEST_H_ + +#include "osd_types.h" + #include <sstream> #include <stdint.h> -#include <vector> - #include <include/utime.h> -#include "common/Mutex.h" -#include "include/xlist.h" -#include "msg/Message.h" #include <tr1/memory> + +#include "include/xlist.h" +#include "common/Mutex.h" #include "common/TrackedOp.h" -#include "osd/osd_types.h" +#include "msg/Message.h" class OpRequest; class OpHistory { diff --git a/src/osd/PG.cc b/src/osd/PG.cc index cd177f044e7..9b7fa4ca233 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -12,12 +12,11 @@ * */ -#include "PG.h" -#include "common/config.h" -#include "OSD.h" -#include "OpRequest.h" +#include <sstream> #include "common/Timer.h" +#include "common/config.h" +#include "global/debug.h" #include "messages/MOSDOp.h" #include "messages/MOSDPGNotify.h" @@ -29,13 +28,12 @@ #include "messages/MOSDPGBackfill.h" #include "messages/MBackfillReserve.h" #include "messages/MRecoveryReserve.h" - #include "messages/MOSDSubOp.h" #include "messages/MOSDSubOpReply.h" -#include "global/debug.h" +#include "OSD.h" -#include <sstream> +#include "PG.h" #define dout_subsys ceph_subsys_osd #undef dout_prefix diff --git a/src/osd/PG.h b/src/osd/PG.h index 8556fd21e43..1cb79c61a77 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -15,6 +15,9 @@ #ifndef CEPH_PG_H #define CEPH_PG_H +#include "include/types.h" +#include "osd_types.h" + #include <boost/statechart/custom_reaction.hpp> #include <boost/statechart/event.hpp> #include <boost/statechart/simple_state.hpp> @@ -23,39 +26,33 @@ #include <boost/statechart/transition.hpp> #include <boost/statechart/event_base.hpp> #include <boost/scoped_ptr.hpp> +#include <list> +#include <memory> +#include <string> #include <tr1/memory> +#include <ext/hash_map> +#include <ext/hash_set> -// re-include our assert to clobber boost's -#include "include/assert.h" -#include "include/types.h" +#include "include/assert.h" // boost clobbers it #include "include/stringify.h" -#include "osd_types.h" #include "include/buffer.h" #include "include/xlist.h" #include "include/atomic.h" - -#include "OpRequest.h" -#include "OSDMap.h" +#include "common/DecayCounter.h" #include "os/ObjectStore.h" #include "msg/Messenger.h" +#include "global/global_context.h" + #include "messages/MOSDRepScrub.h" #include "messages/MOSDPGLog.h" -#include "common/DecayCounter.h" - -#include "global/global_context.h" +#include "OpRequest.h" +#include "OSDMap.h" -#include <list> -#include <memory> -#include <string> using namespace std; - -#include <ext/hash_map> -#include <ext/hash_set> using namespace __gnu_cxx; - //#define DEBUG_RECOVERY_OIDS // track set of recovering oids explicitly, to find counting bugs class OSD; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2a8f3ec5f8e..66a633e2aac 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -11,40 +11,30 @@ * */ -#include "PG.h" -#include "ReplicatedPG.h" -#include "OSD.h" -#include "OpRequest.h" - +#include "include/compat.h" +#include "common/config.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "mds/inode_backtrace.h" // Ugh +#include "global/global_context.h" +#include "json_spirit/json_spirit_value.h" +#include "json_spirit/json_spirit_reader.h" +#include "include/assert.h" // json_spirit clobbers it #include "messages/MOSDOp.h" #include "messages/MOSDOpReply.h" #include "messages/MOSDSubOp.h" #include "messages/MOSDSubOpReply.h" - #include "messages/MOSDPGNotify.h" #include "messages/MOSDPGInfo.h" #include "messages/MOSDPGRemove.h" #include "messages/MOSDPGTrim.h" #include "messages/MOSDPGScan.h" #include "messages/MOSDPGBackfill.h" - #include "messages/MOSDPing.h" #include "messages/MWatchNotify.h" -#include "Watch.h" - -#include "mds/inode_backtrace.h" // Ugh - -#include "common/config.h" -#include "include/compat.h" -#include "global/debug.h" - -#include "json_spirit/json_spirit_value.h" -#include "json_spirit/json_spirit_reader.h" -#include "include/assert.h" // json_spirit clobbers it +#include "ReplicatedPG.h" #define dout_subsys ceph_subsys_osd #define DOUT_PREFIX_ARGS this, osd->whoami, get_osdmap() diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 5d737e946a7..c47f127fb96 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -14,17 +14,16 @@ #ifndef CEPH_REPLICATEDPG_H #define CEPH_REPLICATEDPG_H - -#include "PG.h" -#include "OSD.h" -#include "Watch.h" -#include "OpRequest.h" +#include "global/debug.h" #include "messages/MOSDOp.h" #include "messages/MOSDOpReply.h" #include "messages/MOSDSubOp.h" -#include "global/debug.h" +#include "PG.h" +#include "OSD.h" +#include "Watch.h" +#include "OpRequest.h" class MOSDSubOpReply; diff --git a/src/osd/Watch.cc b/src/osd/Watch.cc index da90cef4103..719c8d80816 100644 --- a/src/osd/Watch.cc +++ b/src/osd/Watch.cc @@ -1,15 +1,9 @@ - -#include "PG.h" - #include "include/types.h" -#include <map> - -#include "OSD.h" +#include "PG.h" #include "ReplicatedPG.h" -#include "Watch.h" -#include "common/config.h" +#include "Watch.h" bool Watch::ack_notification(entity_name_t& watcher, Notification *notif) { diff --git a/src/osd/Watch.h b/src/osd/Watch.h index cb48de4d426..60810df7d67 100644 --- a/src/osd/Watch.h +++ b/src/osd/Watch.h @@ -18,9 +18,10 @@ #include <map> -#include "OSD.h" #include "common/config.h" +#include "OSD.h" + class MWatchNotify; /* keeps track and accounts sessions, watchers and notifiers */ diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 6fdac54aa5e..bdf045ee0c2 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -13,7 +13,9 @@ */ #include "osd_types.h" + #include "include/ceph_features.h" + #include "PG.h" #include "OSDMap.h" diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 81f1aa2962d..a8370c79693 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -15,12 +15,13 @@ #ifndef CEPH_OSD_TYPES_H #define CEPH_OSD_TYPES_H +#include "include/types.h" +#include "msg/msg_types.h" + #include <sstream> #include <stdio.h> #include <memory> -#include "msg/msg_types.h" -#include "include/types.h" #include "include/utime.h" #include "include/CompatSet.h" #include "include/interval_set.h" @@ -28,7 +29,6 @@ #include "common/Formatter.h" #include "os/hobject.h" - #define CEPH_OSD_ONDISK_MAGIC "ceph osd volume v026" #define CEPH_OSD_FEATURE_INCOMPAT_BASE CompatSet::Feature(1, "initial feature set(~v.18)") diff --git a/src/osdc/Filer.cc b/src/osdc/Filer.cc index 75bd08673fe..38430567059 100644 --- a/src/osdc/Filer.cc +++ b/src/osdc/Filer.cc @@ -13,19 +13,15 @@ */ -#include "Filer.h" -#include "osd/OSDMap.h" -#include "Striper.h" +#include "include/Context.h" +#include "common/config.h" +#include "msg/Messenger.h" #include "messages/MOSDOp.h" #include "messages/MOSDOpReply.h" #include "messages/MOSDMap.h" -#include "msg/Messenger.h" - -#include "include/Context.h" - -#include "common/config.h" +#include "Filer.h" #define dout_subsys ceph_subsys_filer #undef dout_prefix diff --git a/src/osdc/Filer.h b/src/osdc/Filer.h index 54a2196d9aa..2cb17f332ab 100644 --- a/src/osdc/Filer.h +++ b/src/osdc/Filer.h @@ -27,8 +27,8 @@ */ #include "include/types.h" - #include "osd/OSDMap.h" + #include "Objecter.h" #include "Striper.h" diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index 172b769915f..1686cd68c23 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -12,19 +12,19 @@ * */ +#include "include/Context.h" +#include "include/assert.h" #include "common/perf_counters.h" #include "common/debug.h" -#include "include/Context.h" -#include "msg/Messenger.h" -#include "osdc/Journaler.h" #include "common/errno.h" -#include "include/assert.h" +#include "msg/Messenger.h" + +#include "Journaler.h" #define dout_subsys ceph_subsys_journaler #undef dout_prefix #define dout_prefix *_dout << objecter->messenger->get_myname() << ".journaler" << (readonly ? "(ro) ":"(rw) ") - void Journaler::set_readonly() { ldout(cct, 1) << "set_readonly" << dendl; diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index 81a39d21a5b..192ee09ac0c 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -50,12 +50,12 @@ #ifndef CEPH_JOURNALER_H #define CEPH_JOURNALER_H -#include "Objecter.h" -#include "Filer.h" - #include <list> #include <map> +#include "Objecter.h" +#include "Filer.h" + class CephContext; class Context; class PerfCounters; diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 8fd7b7ed251..14d38347ce3 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -3,13 +3,14 @@ #include <limits.h> -#include "msg/Messenger.h" -#include "ObjectCacher.h" -#include "WritebackHandler.h" +#include "include/assert.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "msg/Messenger.h" -#include "include/assert.h" +#include "WritebackHandler.h" + +#include "ObjectCacher.h" /*** ObjectCacher::BufferHead ***/ diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h index 0daa9797226..4f1ae54bf9b 100644 --- a/src/osdc/ObjectCacher.h +++ b/src/osdc/ObjectCacher.h @@ -4,6 +4,7 @@ #define CEPH_OBJECTCACHER_H #include "include/types.h" + #include "include/lru.h" #include "include/Context.h" #include "include/xlist.h" diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 6abada8f5d8..5a2e4f30008 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -12,35 +12,28 @@ * */ -#include "Objecter.h" -#include "osd/OSDMap.h" -#include "Filer.h" +#include <errno.h> +#include "common/config.h" +#include "common/perf_counters.h" #include "mon/MonClient.h" - #include "msg/Messenger.h" #include "msg/Message.h" #include "messages/MPing.h" -#include "messages/MOSDOp.h" #include "messages/MOSDOpReply.h" #include "messages/MOSDMap.h" - #include "messages/MPoolOp.h" #include "messages/MPoolOpReply.h" - #include "messages/MGetPoolStats.h" #include "messages/MGetPoolStatsReply.h" #include "messages/MStatfs.h" #include "messages/MStatfsReply.h" - #include "messages/MOSDFailure.h" -#include <errno.h> - -#include "common/config.h" -#include "common/perf_counters.h" +#include "Filer.h" +#include "Objecter.h" #define dout_subsys ceph_subsys_objecter #undef dout_prefix diff --git a/src/osdc/Striper.cc b/src/osdc/Striper.cc index 7b5a402893f..756498ee7e8 100644 --- a/src/osdc/Striper.cc +++ b/src/osdc/Striper.cc @@ -12,20 +12,19 @@ * */ -#include "Striper.h" - #include "include/types.h" -#include "include/buffer.h" -#include "osd/OSDMap.h" +#include "include/buffer.h" #include "common/config.h" #include "common/debug.h" +#include "osd/OSDMap.h" + +#include "Striper.h" #define dout_subsys ceph_subsys_striper #undef dout_prefix #define dout_prefix *_dout << "striper " - void Striper::file_to_extents(CephContext *cct, const char *object_format, ceph_file_layout *layout, uint64_t offset, uint64_t len, diff --git a/src/osdc/WritebackHandler.h b/src/osdc/WritebackHandler.h index a9a035ca52f..282ee5d8722 100644 --- a/src/osdc/WritebackHandler.h +++ b/src/osdc/WritebackHandler.h @@ -3,9 +3,10 @@ #ifndef CEPH_OSDC_WRITEBACKHANDLER_H #define CEPH_OSDC_WRITEBACKHANDLER_H -#include "include/Context.h" -#include "include/types.h" #include "osd/osd_types.h" +#include "include/types.h" + +#include "include/Context.h" class WritebackHandler { public: diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc index d4705390ee3..cfcc44cc985 100644 --- a/src/osdmaptool.cc +++ b/src/osdmaptool.cc @@ -16,19 +16,18 @@ #include <sys/stat.h> #include <fcntl.h> #include <errno.h> - #include <iostream> #include <string> -using namespace std; #include "common/config.h" - #include "common/errno.h" +#include "common/ceph_argparse.h" #include "osd/OSDMap.h" #include "mon/MonMap.h" -#include "common/ceph_argparse.h" #include "global/global_init.h" -#include "global/debug.h" +#include "global/global_context.h" + +using namespace std; void usage() { diff --git a/src/perfglue/cpu_profiler.cc b/src/perfglue/cpu_profiler.cc index 8ba15b0af1a..6e6cbe9624a 100644 --- a/src/perfglue/cpu_profiler.cc +++ b/src/perfglue/cpu_profiler.cc @@ -12,10 +12,11 @@ * */ +#include <google/profiler.h> + #include "common/LogClient.h" -#include "perfglue/cpu_profiler.h" -#include <google/profiler.h> +#include "cpu_profiler.h" void cpu_profiler_handle_command(const std::vector<std::string> &cmd, ostream& out) diff --git a/src/perfglue/disabled_stubs.cc b/src/perfglue/disabled_stubs.cc index dfbc0e663d8..d51400e9496 100644 --- a/src/perfglue/disabled_stubs.cc +++ b/src/perfglue/disabled_stubs.cc @@ -12,12 +12,13 @@ * */ -#include "common/LogClient.h" -#include "perfglue/cpu_profiler.h" - #include <vector> #include <string> +#include "common/LogClient.h" + +#include "cpu_profiler.h" + void cpu_profiler_handle_command(const std::vector<std::string> &cmd, ostream& out) { diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc index 9b3eaf93798..9c232903c4d 100644 --- a/src/perfglue/heap_profiler.cc +++ b/src/perfglue/heap_profiler.cc @@ -14,12 +14,14 @@ #include <google/heap-profiler.h> #include <google/malloc_extension.h> -#include "heap_profiler.h" + #include "common/environment.h" #include "common/LogClient.h" #include "global/global_context.h" #include "global/debug.h" +#include "heap_profiler.h" + bool ceph_using_tcmalloc() { return true; diff --git a/src/perfglue/heap_profiler.h b/src/perfglue/heap_profiler.h index dac20d4fa31..efd796d20d2 100644 --- a/src/perfglue/heap_profiler.h +++ b/src/perfglue/heap_profiler.h @@ -15,6 +15,7 @@ #include <string> #include <vector> + #include "common/config.h" class LogClient; diff --git a/src/psim.cc b/src/psim.cc index b089876e090..2872d138066 100644 --- a/src/psim.cc +++ b/src/psim.cc @@ -1,10 +1,9 @@ - #include <iostream> +#include "include/buffer.h" +#include "common/config.h" #include "crush/CrushWrapper.h" #include "osd/OSDMap.h" -#include "common/config.h" -#include "include/buffer.h" int main(int argc, char **argv) { diff --git a/src/rados.cc b/src/rados.cc index f7b3c8e9a34..f0b63964b15 100644 --- a/src/rados.cc +++ b/src/rados.cc @@ -14,23 +14,6 @@ #include "include/types.h" -#include "include/rados/librados.hpp" -#include "rados_sync.h" -using namespace librados; - -#include "common/config.h" -#include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "global/debug.h" -#include "common/Cond.h" -#include "common/errno.h" -#include "common/Formatter.h" -#include "common/obj_bencher.h" -#include "mds/inode_backtrace.h" -#include "auth/Crypto.h" -#include <iostream> -#include <fstream> - #include <stdlib.h> #include <time.h> #include <sstream> @@ -39,9 +22,28 @@ using namespace librados; #include <stdexcept> #include <climits> #include <locale> +#include <iostream> +#include <fstream> + +#include "include/rados/librados.hpp" +#include "common/config.h" +#include "common/ceph_argparse.h" +#include "common/Cond.h" +#include "common/errno.h" +#include "common/Formatter.h" +#include "common/obj_bencher.h" +#include "auth/Crypto.h" +#include "mds/inode_backtrace.h" +#include "global/global_init.h" +#include "global/global_context.h" +#include "global/debug.h" #include "cls/lock/cls_lock_client.h" +#include "rados_sync.h" + +using namespace librados; + int rados_tool_sync(const std::map < std::string, std::string > &opts, std::vector<const char*> &args); diff --git a/src/rados_export.cc b/src/rados_export.cc index 15e22b9cf36..b635ebef586 100644 --- a/src/rados_export.cc +++ b/src/rados_export.cc @@ -12,11 +12,6 @@ * */ -#include "rados_sync.h" -#include "common/errno.h" -#include "common/strtol.h" -#include "include/rados/librados.hpp" - #include <dirent.h> #include <errno.h> #include <fstream> @@ -26,13 +21,17 @@ #include <stdlib.h> #include <string> #include <sys/stat.h> -#include <sys/types.h> #include <time.h> #include <unistd.h> +#include "include/rados/librados.hpp" #include "include/compat.h" +#include "common/errno.h" +#include "common/strtol.h" #include "common/xattr.h" +#include "rados_sync.h" + using namespace librados; class ExportLocalFileWQ : public RadosSyncWQ { diff --git a/src/rados_import.cc b/src/rados_import.cc index da968a7cc50..30a5fc3f4a2 100644 --- a/src/rados_import.cc +++ b/src/rados_import.cc @@ -20,14 +20,14 @@ #include <sstream> #include <stdlib.h> #include <sys/stat.h> -#include <sys/types.h> #include <time.h> #include <unistd.h> -#include "rados_sync.h" +#include "include/rados/librados.hpp" #include "common/errno.h" #include "common/strtol.h" -#include "include/rados/librados.hpp" + +#include "rados_sync.h" using namespace librados; using std::auto_ptr; diff --git a/src/rados_sync.cc b/src/rados_sync.cc index 435f8578d39..777c3d0f480 100644 --- a/src/rados_sync.cc +++ b/src/rados_sync.cc @@ -12,18 +12,6 @@ * */ -#include "common/ceph_argparse.h" -#include "common/config.h" -#include "common/errno.h" -#include "common/strtol.h" -#include "global/global_context.h" -#include "global/global_init.h" -#include "include/rados/librados.hpp" -#include "rados_sync.h" -#include "include/compat.h" - -#include "common/xattr.h" - #include <dirent.h> #include <errno.h> #include <fstream> @@ -32,12 +20,22 @@ #include <memory> #include <sstream> #include <stdlib.h> -#include <string> #include <sys/stat.h> -#include <sys/types.h> #include <time.h> #include <unistd.h> +#include "include/rados/librados.hpp" +#include "include/compat.h" +#include "common/ceph_argparse.h" +#include "common/config.h" +#include "common/errno.h" +#include "common/strtol.h" +#include "common/xattr.h" +#include "global/global_context.h" +#include "global/global_init.h" + +#include "rados_sync.h" + using namespace librados; using std::auto_ptr; diff --git a/src/rados_sync.h b/src/rados_sync.h index 7e53f491c58..ef38d9ee477 100644 --- a/src/rados_sync.h +++ b/src/rados_sync.h @@ -16,12 +16,12 @@ #define CEPH_RADOS_SYNC_H #include <stddef.h> -#include "include/atomic.h" -#include "common/WorkQueue.h" - #include <string> #include <sys/types.h> +#include "include/atomic.h" +#include "common/WorkQueue.h" + namespace librados { class IoCtx; class Rados; diff --git a/src/radosacl.cc b/src/radosacl.cc index d2f7ca5c488..361d1e481aa 100644 --- a/src/radosacl.cc +++ b/src/radosacl.cc @@ -11,17 +11,17 @@ * Foundation. See file COPYING. * */ - #include "include/types.h" -#include "include/rados/librados.hpp" -using namespace librados; #include <iostream> - #include <stdlib.h> #include <time.h> #include <errno.h> +#include "include/rados/librados.hpp" + +using namespace librados; + void buf_to_hex(const unsigned char *buf, int len, char *str) { str[0] = '\0'; diff --git a/src/rbd.cc b/src/rbd.cc index bd47ae1cfa1..0b1bb534b8b 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -12,26 +12,7 @@ * */ -#include "mon/MonClient.h" -#include "mon/MonMap.h" -#include "common/config.h" - -#include "auth/KeyRing.h" -#include "common/errno.h" -#include "common/ceph_argparse.h" -#include "global/global_context.h" -#include "global/global_init.h" -#include "common/safe_io.h" -#include "common/secret.h" -#include "include/stringify.h" -#include "include/rados/librados.hpp" -#include "include/rbd/librbd.hpp" -#include "include/byteorder.h" - -#include "include/intarith.h" - -#include "include/compat.h" -#include "common/blkdev.h" +#include "include/rbd_types.h" #include <dirent.h> #include <errno.h> @@ -45,9 +26,6 @@ #include <tr1/memory> #include <sys/ioctl.h> -#include "include/rbd_types.h" -#include "common/TextTable.h" - #if defined(__linux__) #include <linux/fs.h> #endif @@ -56,7 +34,25 @@ #include <sys/param.h> #endif +#include "include/stringify.h" +#include "include/rados/librados.hpp" +#include "include/rbd/librbd.hpp" +#include "include/byteorder.h" +#include "include/intarith.h" +#include "include/compat.h" #include "include/fiemap.h" +#include "common/config.h" +#include "common/errno.h" +#include "common/ceph_argparse.h" +#include "common/safe_io.h" +#include "common/secret.h" +#include "common/blkdev.h" +#include "common/TextTable.h" +#include "auth/KeyRing.h" +#include "mon/MonClient.h" +#include "mon/MonMap.h" +#include "global/global_context.h" +#include "global/global_init.h" #define MAX_SECRET_LEN 1000 #define MAX_POOL_NAME_SIZE 128 diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc index c8b8b8153d5..6b27a7b04f7 100644 --- a/src/rgw/librgw.cc +++ b/src/rgw/librgw.cc @@ -13,17 +13,19 @@ */ #include "include/types.h" + +#include <errno.h> +#include <sstream> +#include <string.h> + #include "include/rados/librgw.h" -#include "rgw/rgw_acl_s3.h" -#include "rgw_acl.h" #include "common/ceph_argparse.h" #include "common/ceph_context.h" #include "common/common_init.h" #include "common/debug.h" -#include <errno.h> -#include <sstream> -#include <string.h> +#include "rgw_acl.h" +#include "rgw_acl_s3.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc index 1a906495879..b2357d39ca1 100644 --- a/src/rgw/rgw_acl.cc +++ b/src/rgw/rgw_acl.cc @@ -1,21 +1,17 @@ -#include <string.h> - -#include <iostream> -#include <map> - #include "include/types.h" #include "common/Formatter.h" +#include "common/debug.h" -#include "rgw_acl.h" #include "rgw_user.h" - #include "rgw_acl_s3.h" // required for backward compatibility -#define dout_subsys ceph_subsys_rgw +#include "rgw_acl.h" using namespace std; +#define dout_subsys ceph_subsys_rgw + void RGWAccessControlList::_add_grant(ACLGrant *grant) { ACLPermission& perm = grant->get_permission(); diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h index c06e9eb3c88..a433e166767 100644 --- a/src/rgw/rgw_acl.h +++ b/src/rgw/rgw_acl.h @@ -1,16 +1,14 @@ #ifndef CEPH_RGW_ACL_H #define CEPH_RGW_ACL_H +#include <include/types.h> + #include <map> #include <string> #include <iostream> -#include <include/types.h> - -#include "common/debug.h" using namespace std; - #define RGW_PERM_READ 0x01 #define RGW_PERM_WRITE 0x02 #define RGW_PERM_READ_ACP 0x04 diff --git a/src/rgw/rgw_acl_s3.cc b/src/rgw/rgw_acl_s3.cc index e1c81e73ac8..57f3197c115 100644 --- a/src/rgw/rgw_acl_s3.cc +++ b/src/rgw/rgw_acl_s3.cc @@ -1,17 +1,16 @@ -#include <string.h> +#include "include/types.h" -#include <iostream> -#include <map> +#include <string.h> -#include "include/types.h" +#include "common/debug.h" -#include "rgw_acl_s3.h" #include "rgw_user.h" -#define dout_subsys ceph_subsys_rgw +#include "rgw_acl_s3.h" using namespace std; +#define dout_subsys ceph_subsys_rgw #define RGW_URI_ALL_USERS "http://acs.amazonaws.com/groups/global/AllUsers" #define RGW_URI_AUTH_USERS "http://acs.amazonaws.com/groups/global/AuthenticatedUsers" diff --git a/src/rgw/rgw_acl_s3.h b/src/rgw/rgw_acl_s3.h index 1e2ffe43242..29473bce004 100644 --- a/src/rgw/rgw_acl_s3.h +++ b/src/rgw/rgw_acl_s3.h @@ -1,9 +1,6 @@ #ifndef CEPH_RGW_ACL_S3_H #define CEPH_RGW_ACL_S3_H -#include <map> -#include <string> -#include <iostream> #include <include/types.h> #include <expat.h> diff --git a/src/rgw/rgw_acl_swift.cc b/src/rgw/rgw_acl_swift.cc index b02ce90f538..e9a9251d673 100644 --- a/src/rgw/rgw_acl_swift.cc +++ b/src/rgw/rgw_acl_swift.cc @@ -1,16 +1,14 @@ - -#include <string.h> - -#include <vector> +#include "common/debug.h" #include "rgw_common.h" #include "rgw_user.h" -#include "rgw_acl_swift.h" -#define dout_subsys ceph_subsys_rgw +#include "rgw_acl_swift.h" using namespace std; +#define dout_subsys ceph_subsys_rgw + #define SWIFT_PERM_READ RGW_PERM_READ_OBJS #define SWIFT_PERM_WRITE RGW_PERM_WRITE_OBJS diff --git a/src/rgw/rgw_acl_swift.h b/src/rgw/rgw_acl_swift.h index be64f58021f..87f5c95edae 100644 --- a/src/rgw/rgw_acl_swift.h +++ b/src/rgw/rgw_acl_swift.h @@ -1,12 +1,10 @@ #ifndef CEPH_RGW_ACL_SWIFT_H #define CEPH_RGW_ACL_SWIFT3_H -#include <map> -#include <string> -#include <iostream> -#include <vector> #include <include/types.h> +#include <vector> + #include "rgw_acl.h" using namespace std; diff --git a/src/rgw/rgw_aclparser.cc b/src/rgw/rgw_aclparser.cc index 414e0e31ec7..ce14f161f2d 100644 --- a/src/rgw/rgw_aclparser.cc +++ b/src/rgw/rgw_aclparser.cc @@ -1,12 +1,9 @@ -#include <string.h> - -#include "common/ceph_context.h" #include "include/types.h" -#include "rgw/rgw_acl.h" + +#include "global/global_context.h" #include "global/debug.h" -#include <iostream> -#include <map> +#include "rgw_acl.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index ae3baa20dca..4f17f499e01 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1,21 +1,20 @@ #include <errno.h> - #include <iostream> #include <sstream> #include <string> -using namespace std; - +#include "include/utime.h" +#include "include/str_list.h" #include "common/config.h" #include "common/ceph_argparse.h" #include "common/Formatter.h" +#include "common/errno.h" +#include "common/armor.h" +#include "auth/Crypto.h" #include "global/global_init.h" +#include "global/global_context.h" #include "global/debug.h" -#include "common/errno.h" -#include "include/utime.h" -#include "include/str_list.h" -#include "common/armor.h" #include "rgw_user.h" #include "rgw_rados.h" #include "rgw_acl.h" @@ -23,7 +22,8 @@ using namespace std; #include "rgw_log.h" #include "rgw_formats.h" #include "rgw_usage.h" -#include "auth/Crypto.h" + +using namespace std; #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc index e870df25c0d..662f116a5af 100644 --- a/src/rgw/rgw_cache.cc +++ b/src/rgw/rgw_cache.cc @@ -1,12 +1,13 @@ -#include "rgw_cache.h" -#include "common/debug.h" - #include <errno.h> -#define dout_subsys ceph_subsys_rgw +#include "common/debug.h" + +#include "rgw_cache.h" using namespace std; +#define dout_subsys ceph_subsys_rgw + int ObjectCache::get(string& name, ObjectCacheInfo& info, uint32_t mask) { Mutex::Locker l(lock); diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h index e4002f6af25..a0541f836a5 100644 --- a/src/rgw/rgw_cache.h +++ b/src/rgw/rgw_cache.h @@ -1,13 +1,15 @@ #ifndef CEPH_RGWCACHE_H #define CEPH_RGWCACHE_H -#include "rgw_rados.h" #include <string> #include <map> + #include "include/types.h" #include "include/utime.h" #include "include/assert.h" +#include "rgw_rados.h" + enum { UPDATE_OBJ, REMOVE_OBJ, diff --git a/src/rgw/rgw_client_io.cc b/src/rgw/rgw_client_io.cc index 46385f41f33..8e90cf7814b 100644 --- a/src/rgw/rgw_client_io.cc +++ b/src/rgw/rgw_client_io.cc @@ -1,11 +1,8 @@ - #include <stdio.h> -#include <stdlib.h> #include <stdarg.h> #include "rgw_client_io.h" - int RGWClientIO::print(const char *format, ...) { #define LARGE_ENOUGH 128 diff --git a/src/rgw/rgw_client_io.h b/src/rgw/rgw_client_io.h index 546b16d51f7..29131b3afb9 100644 --- a/src/rgw/rgw_client_io.h +++ b/src/rgw/rgw_client_io.h @@ -1,10 +1,10 @@ #ifndef CEPH_RGW_CLIENT_IO_H #define CEPH_RGW_CLIENT_IO_H -#include <stdlib.h> - #include "include/types.h" +#include <stdlib.h> + class RGWClientIO { bool account; diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index 8a1e423af95..f3eeaa0c517 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -1,20 +1,17 @@ -#include <errno.h> - -#include "rgw_common.h" -#include "rgw_acl.h" -#include "rgw_string.h" +#include <sstream> -#include "common/ceph_crypto.h" +#include "include/str_list.h" #include "common/armor.h" #include "common/errno.h" #include "common/Clock.h" #include "common/Formatter.h" -#include "common/perf_counters.h" -#include "include/str_list.h" #include "auth/Crypto.h" #include "global/debug.h" -#include <sstream> +#include "rgw_acl.h" +#include "rgw_string.h" + +#include "rgw_common.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index ea7bff0b54c..96bdfb41da0 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -15,17 +15,17 @@ #ifndef CEPH_RGW_COMMON_H #define CEPH_RGW_COMMON_H -#include "common/ceph_crypto.h" -#include "common/perf_counters.h" - #include "acconfig.h" +#include "include/types.h" #include <errno.h> #include <string.h> #include <string> #include <map> -#include "include/types.h" + #include "include/utime.h" +#include "common/ceph_crypto.h" +#include "common/perf_counters.h" using namespace std; diff --git a/src/rgw/rgw_dencoder.cc b/src/rgw/rgw_dencoder.cc index 00015ff022c..3bd720cf6a1 100644 --- a/src/rgw/rgw_dencoder.cc +++ b/src/rgw/rgw_dencoder.cc @@ -1,3 +1,4 @@ +#include "common/Formatter.h" #include "rgw_common.h" #include "rgw_rados.h" @@ -6,8 +7,6 @@ #include "rgw_acl_s3.h" #include "rgw_cache.h" -#include "common/Formatter.h" - void RGWObjManifestPart::generate_test_instances(std::list<RGWObjManifestPart*>& o) { o.push_back(new RGWObjManifestPart); diff --git a/src/rgw/rgw_env.cc b/src/rgw/rgw_env.cc index b8f6b0440cc..4698cc12e3f 100644 --- a/src/rgw/rgw_env.cc +++ b/src/rgw/rgw_env.cc @@ -1,9 +1,6 @@ #include "rgw_common.h" #include "rgw_log.h" -#include <string> -#include <map> - #define dout_subsys ceph_subsys_rgw RGWEnv::RGWEnv() diff --git a/src/rgw/rgw_fcgi.cc b/src/rgw/rgw_fcgi.cc index 70ed9961975..6c4a9db70ab 100644 --- a/src/rgw/rgw_fcgi.cc +++ b/src/rgw/rgw_fcgi.cc @@ -1,14 +1,12 @@ - - -#include "rgw_fcgi.h" - #include "acconfig.h" + #ifdef FASTCGI_INCLUDE_DIR # include "fastcgi/fcgiapp.h" #else # include "fcgiapp.h" #endif +#include "rgw_fcgi.h" int RGWFCGX::write_data(const char *buf, int len) { diff --git a/src/rgw/rgw_fcgi.h b/src/rgw/rgw_fcgi.h index ccf48f5954d..5c158674784 100644 --- a/src/rgw/rgw_fcgi.h +++ b/src/rgw/rgw_fcgi.h @@ -3,10 +3,8 @@ #include "rgw_client_io.h" - struct FCGX_Request; - class RGWFCGX : public RGWClientIO { FCGX_Request *fcgx; diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc index 61d4d04c7a4..5a0b5fe4b21 100644 --- a/src/rgw/rgw_formats.cc +++ b/src/rgw/rgw_formats.cc @@ -14,8 +14,10 @@ #include "common/escape.h" #include "common/Formatter.h" -#include "rgw/rgw_common.h" -#include "rgw/rgw_formats.h" + +#include "rgw_common.h" + +#include "rgw_formats.h" #define LARGE_SIZE 8192 diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h index 29767851d5f..28aaf008907 100644 --- a/src/rgw/rgw_formats.h +++ b/src/rgw/rgw_formats.h @@ -1,12 +1,12 @@ #ifndef CEPH_RGW_FORMATS_H #define CEPH_RGW_FORMATS_H -#include "common/Formatter.h" - #include <list> #include <stdint.h> #include <string> +#include "common/Formatter.h" + struct plain_stack_entry { int size; bool is_array; diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc index 7dbdf485b6e..8ae9eecc23f 100644 --- a/src/rgw/rgw_gc.cc +++ b/src/rgw/rgw_gc.cc @@ -1,19 +1,20 @@ -#include "rgw_gc.h" +#include <list> + #include "include/rados/librados.hpp" +#include "auth/Crypto.h" #include "cls/rgw/cls_rgw_client.h" #include "cls/refcount/cls_refcount_client.h" #include "cls/lock/cls_lock_client.h" -#include "auth/Crypto.h" - +#include "global/global_context.h" #include "global/debug.h" -#include <list> - -#define dout_subsys ceph_subsys_rgw +#include "rgw_gc.h" using namespace std; using namespace librados; +#define dout_subsys ceph_subsys_rgw + static string gc_oid_prefix = "gc"; static string gc_index_lock_name = "gc_process"; diff --git a/src/rgw/rgw_gc.h b/src/rgw/rgw_gc.h index b19afc55dd5..5d788950aaa 100644 --- a/src/rgw/rgw_gc.h +++ b/src/rgw/rgw_gc.h @@ -1,16 +1,16 @@ #ifndef CEPH_RGW_GC_H #define CEPH_RGW_GC_H - #include "include/types.h" + #include "include/atomic.h" -#include "include/rados/librados.hpp" #include "common/Mutex.h" #include "common/Cond.h" #include "common/Thread.h" +#include "cls/rgw/cls_rgw_types.h" + #include "rgw_common.h" #include "rgw_rados.h" -#include "cls/rgw/cls_rgw_types.h" class RGWGC { CephContext *cct; diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc index 1a90cc52f50..cee3042ec8e 100644 --- a/src/rgw/rgw_http_client.cc +++ b/src/rgw/rgw_http_client.cc @@ -2,7 +2,7 @@ #include <curl/easy.h> #include "global/debug.h" -#include "rgw_common.h" + #include "rgw_http_client.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_json.cc b/src/rgw/rgw_json.cc index 0f91c2279e1..6753da9a01c 100644 --- a/src/rgw/rgw_json.cc +++ b/src/rgw/rgw_json.cc @@ -1,12 +1,10 @@ #include <iostream> #include <include/types.h> +#include <fstream> // for testing DELETE ME #include "rgw_json.h" #include "rgw_common.h" -// for testing DELETE ME -#include <fstream> - using namespace std; using namespace json_spirit; diff --git a/src/rgw/rgw_json.h b/src/rgw/rgw_json.h index d0dec397c28..b2c9a5069b3 100644 --- a/src/rgw/rgw_json.h +++ b/src/rgw/rgw_json.h @@ -1,19 +1,16 @@ #ifndef RGW_JSON_H #define RGW_JSON_H -#include <iostream> #include <include/types.h> -// for testing DELETE ME -#include <fstream> +#include <iostream> +#include <fstream> // for testing DELETE ME #include "json_spirit/json_spirit.h" - using namespace std; using namespace json_spirit; - class JSONObj; class JSONObjIter { diff --git a/src/rgw/rgw_jsonparser.cc b/src/rgw/rgw_jsonparser.cc index 7a1f11c325e..d1aa07d3033 100644 --- a/src/rgw/rgw_jsonparser.cc +++ b/src/rgw/rgw_jsonparser.cc @@ -1,16 +1,14 @@ -#include <string.h> +#include "include/types.h" -#include <iostream> +#include <string.h> #include <map> -#include "include/types.h" - #include "rgw_json.h" -#define dout_subsys ceph_subsys_rgw - using namespace std; +#define dout_subsys ceph_subsys_rgw + void dump_array(JSONObj *obj) { diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc index e999f623a01..0a5f70e1448 100644 --- a/src/rgw/rgw_log.cc +++ b/src/rgw/rgw_log.cc @@ -1,14 +1,13 @@ #include "common/Clock.h" #include "common/Timer.h" #include "common/utf8.h" -#include "common/OutputDataSocket.h" -#include "common/Formatter.h" -#include "rgw_log.h" #include "rgw_acl.h" #include "rgw_rados.h" #include "rgw_client_io.h" +#include "rgw_log.h" + #define dout_subsys ceph_subsys_rgw static void set_param_str(struct req_state *s, const char *name, string& str) diff --git a/src/rgw/rgw_log.h b/src/rgw/rgw_log.h index 823f0b1767f..749fb227c3b 100644 --- a/src/rgw/rgw_log.h +++ b/src/rgw/rgw_log.h @@ -1,11 +1,11 @@ #ifndef CEPH_RGW_LOG_H #define CEPH_RGW_LOG_H -#include "rgw_common.h" -#include "include/utime.h" #include "common/Formatter.h" #include "common/OutputDataSocket.h" +#include "rgw_common.h" + class RGWRados; struct rgw_log_entry { diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index b1c0e5107da..cd500054c70 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -1,35 +1,37 @@ +#include "acconfig.h" +#include "include/types.h" + #include <stdlib.h> #include <stdio.h> -#include <string.h> #include <stdarg.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <errno.h> #include <signal.h> - +#include <vector> +#include <iostream> +#include <sstream> #include <curl/curl.h> -#include "acconfig.h" #ifdef FASTCGI_INCLUDE_DIR # include "fastcgi/fcgiapp.h" #else # include "fcgiapp.h" #endif -#include "rgw_fcgi.h" - +#include "include/str_list.h" #include "common/ceph_argparse.h" -#include "global/global_context.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/WorkQueue.h" #include "common/Timer.h" #include "common/Throttle.h" -#include "include/str_list.h" +#include "common/BackTrace.h" +#include "global/global_context.h" +#include "global/global_init.h" +#include "global/signal_handler.h" +#include "global/debug.h" + #include "rgw_common.h" #include "rgw_rados.h" #include "rgw_acl.h" @@ -45,20 +47,12 @@ #include "rgw_log.h" #include "rgw_tools.h" #include "rgw_resolve.h" +#include "rgw_fcgi.h" -#include <map> -#include <string> -#include <vector> -#include <iostream> -#include <sstream> - -#include "include/types.h" -#include "common/BackTrace.h" +using namespace std; #define dout_subsys ceph_subsys_rgw -using namespace std; - static sighandler_t sighandler_usr1; static sighandler_t sighandler_alrm; static sighandler_t sighandler_term; diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc index 8c592d3b635..a789d2335eb 100644 --- a/src/rgw/rgw_multi.cc +++ b/src/rgw/rgw_multi.cc @@ -1,17 +1,13 @@ -#include <string.h> +#include "include/types.h" +#include <string.h> #include <iostream> -#include <map> - -#include "include/types.h" -#include "rgw_xml.h" #include "rgw_multi.h" -#define dout_subsys ceph_subsys_rgw - using namespace std; +#define dout_subsys ceph_subsys_rgw bool RGWMultiPart::xml_end(const char *el) { diff --git a/src/rgw/rgw_multi_del.cc b/src/rgw/rgw_multi_del.cc index fb7a4a8a2e2..612a4fb6f94 100644 --- a/src/rgw/rgw_multi_del.cc +++ b/src/rgw/rgw_multi_del.cc @@ -1,16 +1,14 @@ -#include <string.h> +#include "include/types.h" +#include <string.h> #include <iostream> -#include "include/types.h" - -#include "rgw_xml.h" #include "rgw_multi_del.h" -#define dout_subsys ceph_subsys_rgw - using namespace std; +#define dout_subsys ceph_subsys_rgw + bool RGWMultiDelObject::xml_end(const char *el) { diff --git a/src/rgw/rgw_multiparser.cc b/src/rgw/rgw_multiparser.cc index 2f4d8d94bee..1d34243c443 100644 --- a/src/rgw/rgw_multiparser.cc +++ b/src/rgw/rgw_multiparser.cc @@ -1,15 +1,13 @@ -#include <string.h> +#include "include/types.h" +#include <string.h> #include <iostream> -#include <map> - -#include "include/types.h" #include "rgw_multi.h" -#define dout_subsys ceph_subsys_rgw - using namespace std; + +#define dout_subsys ceph_subsys_rgw int main(int argc, char **argv) { RGWMultiXMLParser parser; diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index b0e8e675fc8..26f32190ce4 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -1,7 +1,5 @@ - #include <errno.h> #include <stdlib.h> - #include <sstream> #include "common/Clock.h" @@ -10,23 +8,20 @@ #include "common/utf8.h" #include "global/debug.h" -#include "rgw_rados.h" -#include "rgw_op.h" #include "rgw_rest.h" -#include "rgw_acl.h" #include "rgw_acl_s3.h" -#include "rgw_user.h" #include "rgw_log.h" #include "rgw_multi.h" #include "rgw_multi_del.h" - #include "rgw_client_io.h" -#define dout_subsys ceph_subsys_rgw +#include "rgw_op.h" using namespace std; using ceph::crypto::MD5; +#define dout_subsys ceph_subsys_rgw + static string mp_ns = RGW_OBJ_NS_MULTIPART; static string shadow_ns = RGW_OBJ_NS_SHADOW; diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h index b3a78846cda..9a74b2f87e1 100644 --- a/src/rgw/rgw_op.h +++ b/src/rgw/rgw_op.h @@ -11,9 +11,6 @@ #include <limits.h> -#include <string> -#include <map> - #include "rgw_common.h" #include "rgw_rados.h" #include "rgw_user.h" diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc index 80137c8790c..eaa6acd5ffd 100644 --- a/src/rgw/rgw_policy_s3.cc +++ b/src/rgw/rgw_policy_s3.cc @@ -1,12 +1,10 @@ - -#include <errno.h> - #include "global/debug.h" -#include "rgw_policy_s3.h" #include "rgw_json.h" #include "rgw_common.h" +#include "rgw_policy_s3.h" + #define dout_subsys ceph_subsys_rgw class RGWPolicyCondition { diff --git a/src/rgw/rgw_policy_s3.h b/src/rgw/rgw_policy_s3.h index 84a2ee71751..9a7c4052b3d 100644 --- a/src/rgw/rgw_policy_s3.h +++ b/src/rgw/rgw_policy_s3.h @@ -1,8 +1,6 @@ #ifndef CEPH_RGW_POLICY_H #define CEPH_RGW_POLICY_H -#include <limits.h> - #include <map> #include <list> #include <string> @@ -11,7 +9,6 @@ #include "rgw_string.h" - class RGWPolicyEnv { std::map<std::string, std::string, ltstr_nocase> vars; diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index ce292540dee..223bef08c6c 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1,37 +1,29 @@ #include <errno.h> #include <stdlib.h> #include <sys/types.h> +#include <string> +#include <iostream> +#include <vector> +#include <list> +#include <map> #include "common/errno.h" #include "common/Formatter.h" - -#include "rgw_rados.h" -#include "rgw_cache.h" -#include "rgw_acl.h" - -#include "cls/rgw/cls_rgw_types.h" +#include "common/Clock.h" +#include "auth/Crypto.h" // get_random_bytes() #include "cls/rgw/cls_rgw_client.h" #include "cls/refcount/cls_refcount_client.h" +#include "global/debug.h" +#include "rgw_cache.h" +#include "rgw_acl.h" #include "rgw_tools.h" +#include "rgw_gc.h" -#include "common/Clock.h" -#include "global/debug.h" +#include "rgw_rados.h" -#include "include/rados/librados.hpp" using namespace librados; -#include <string> -#include <iostream> -#include <vector> -#include <list> -#include <map> -#include "auth/Crypto.h" // get_random_bytes() - -#include "rgw_log.h" - -#include "rgw_gc.h" - #define dout_subsys ceph_subsys_rgw using namespace std; diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index e2ab4e24499..9bd1dd326bd 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -3,8 +3,9 @@ #include "include/rados/librados.hpp" #include "include/Context.h" -#include "rgw_common.h" #include "cls/rgw/cls_rgw_types.h" + +#include "rgw_common.h" #include "rgw_log.h" class RGWWatcher; diff --git a/src/rgw/rgw_resolve.cc b/src/rgw/rgw_resolve.cc index 21b72adfcf9..f5cba6a6a11 100644 --- a/src/rgw/rgw_resolve.cc +++ b/src/rgw/rgw_resolve.cc @@ -4,7 +4,7 @@ #include <resolv.h> #include "global/debug.h" -#include "rgw_common.h" + #include "rgw_resolve.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index 7163f50d156..c42039be2d0 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -1,24 +1,21 @@ -#include <errno.h> #include <limits.h> +#include "include/str_list.h" #include "common/Formatter.h" #include "common/utf8.h" -#include "include/str_list.h" #include "global/debug.h" + #include "rgw_common.h" #include "rgw_rados.h" -#include "rgw_formats.h" -#include "rgw_op.h" -#include "rgw_rest.h" #include "rgw_rest_swift.h" #include "rgw_rest_s3.h" #include "rgw_swift_auth.h" - #include "rgw_client_io.h" #include "rgw_resolve.h" -#define dout_subsys ceph_subsys_rgw +#include "rgw_rest.h" +#define dout_subsys ceph_subsys_rgw struct rgw_http_attr { const char *rgw_attr; diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index 00ad584575e..6df20c0f766 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -5,7 +5,6 @@ #include "rgw_op.h" #include "rgw_formats.h" - extern std::map<std::string, std::string> rgw_to_http_attrs; extern void rgw_rest_init(CephContext *cct); diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 9ac533b5fa0..81227844e63 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -4,21 +4,19 @@ #include "common/ceph_crypto.h" #include "common/Formatter.h" #include "common/utf8.h" +#include "common/armor.h" #include "global/debug.h" #include "rgw_rest.h" -#include "rgw_rest_s3.h" #include "rgw_acl.h" -#include "rgw_policy_s3.h" - -#include "common/armor.h" - #include "rgw_client_io.h" -#define dout_subsys ceph_subsys_rgw +#include "rgw_rest_s3.h" using namespace ceph::crypto; +#define dout_subsys ceph_subsys_rgw + void dump_common_s3_headers(struct req_state *s, const char *etag, size_t content_len, const char *conn_status) { diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index e8a6ac66add..b27152a1dc9 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -1,14 +1,15 @@ +#include <sstream> #include "common/Formatter.h" #include "common/utf8.h" #include "global/debug.h" + #include "rgw_swift.h" -#include "rgw_rest_swift.h" #include "rgw_acl_swift.h" #include "rgw_formats.h" #include "rgw_client_io.h" -#include <sstream> +#include "rgw_rest_swift.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_usage.cc b/src/rgw/rgw_rest_usage.cc index e087bcc512c..afa83089d77 100644 --- a/src/rgw/rgw_rest_usage.cc +++ b/src/rgw/rgw_rest_usage.cc @@ -1,8 +1,9 @@ +#include "include/str_list.h" + #include "rgw_op.h" #include "rgw_usage.h" -#include "rgw_rest_usage.h" -#include "include/str_list.h" +#include "rgw_rest_usage.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_rest_usage.h b/src/rgw/rgw_rest_usage.h index a6eb3d57200..f7332766a20 100644 --- a/src/rgw/rgw_rest_usage.h +++ b/src/rgw/rgw_rest_usage.h @@ -4,7 +4,6 @@ #include "rgw_rest.h" #include "rgw_rest_s3.h" - class RGWHandler_Usage : public RGWHandler_Auth_S3 { protected: RGWOp *op_get(); diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h index 3c881a10a91..9716fe66fb4 100644 --- a/src/rgw/rgw_string.h +++ b/src/rgw/rgw_string.h @@ -3,6 +3,7 @@ #include <stdlib.h> #include <limits.h> +#include <errno.h> struct ltstr_nocase { diff --git a/src/rgw/rgw_swift.cc b/src/rgw/rgw_swift.cc index 988e6742a20..dd4e0c1fb9f 100644 --- a/src/rgw/rgw_swift.cc +++ b/src/rgw/rgw_swift.cc @@ -2,19 +2,18 @@ #include <stdlib.h> #include <unistd.h> +#include "include/str_list.h" +#include "common/ceph_crypto_cms.h" +#include "common/armor.h" +#include "global/global_context.h" +#include "global/debug.h" + #include "rgw_json.h" -#include "rgw_common.h" -#include "rgw_swift.h" #include "rgw_swift_auth.h" #include "rgw_user.h" #include "rgw_http_client.h" -#include "include/str_list.h" - -#include "global/global_context.h" -#include "global/debug.h" -#include "common/ceph_crypto_cms.h" -#include "common/armor.h" +#include "rgw_swift.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_swift.h b/src/rgw/rgw_swift.h index febc2675c27..67b3977cd3c 100644 --- a/src/rgw/rgw_swift.h +++ b/src/rgw/rgw_swift.h @@ -1,10 +1,10 @@ - #ifndef CEPH_RGW_SWIFT_H #define CEPH_RGW_SWIFT_H -#include "rgw_common.h" #include "common/Cond.h" +#include "rgw_common.h" + class RGWRados; struct rgw_swift_auth_info { diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc index 991132f9c75..18f7d164dc3 100644 --- a/src/rgw/rgw_swift_auth.cc +++ b/src/rgw/rgw_swift_auth.cc @@ -1,20 +1,18 @@ -#include "rgw_swift_auth.h" -#include "rgw_rest.h" - -#include "global/debug.h" #include "common/ceph_crypto.h" #include "common/Clock.h" - #include "auth/Crypto.h" +#include "global/debug.h" #include "rgw_client_io.h" +#include "rgw_swift_auth.h" + +using namespace ceph::crypto; + #define dout_subsys ceph_subsys_rgw #define DEFAULT_SWIFT_PREFIX "swift" -using namespace ceph::crypto; - static int build_token(string& swift_user, string& key, uint64_t nonce, utime_t& expiration, bufferlist& bl) { ::encode(swift_user, bl); diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc index e83e49a0652..4c8e3b71579 100644 --- a/src/rgw/rgw_tools.cc +++ b/src/rgw/rgw_tools.cc @@ -1,11 +1,9 @@ -#include <errno.h> +#include "include/types.h" #include "common/errno.h" -#include "include/types.h" - -#include "rgw_common.h" #include "rgw_rados.h" + #include "rgw_tools.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/rgw/rgw_tools.h b/src/rgw/rgw_tools.h index 6553d9d1465..86cbca72544 100644 --- a/src/rgw/rgw_tools.h +++ b/src/rgw/rgw_tools.h @@ -1,9 +1,8 @@ #ifndef CEPH_RGW_TOOLS_H #define CEPH_RGW_TOOLS_H -#include <string> - #include "include/types.h" + #include "rgw_common.h" class RGWRados; diff --git a/src/rgw/rgw_usage.cc b/src/rgw/rgw_usage.cc index 054abc2c334..bef8f6012f0 100644 --- a/src/rgw/rgw_usage.cc +++ b/src/rgw/rgw_usage.cc @@ -1,14 +1,10 @@ -#include <string> -#include <map> - #include "rgw_rados.h" + #include "rgw_usage.h" -#include "rgw_formats.h" using namespace std; - static void dump_usage_categories_info(Formatter *formatter, const rgw_usage_log_entry& entry, map<string, bool> *categories) { formatter->open_array_section("categories"); diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index 68c91534e04..9d9f660ecbe 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -1,19 +1,15 @@ -#include <errno.h> - -#include <string> -#include <map> +#include "include/types.h" #include "common/errno.h" + #include "rgw_rados.h" #include "rgw_acl.h" -#include "include/types.h" #include "rgw_user.h" -#define dout_subsys ceph_subsys_rgw - using namespace std; +#define dout_subsys ceph_subsys_rgw /** * Get the anonymous (ie, unauthenticated) user info. diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h index 3ae6b38a156..1dd49f15947 100644 --- a/src/rgw/rgw_user.h +++ b/src/rgw/rgw_user.h @@ -1,9 +1,8 @@ #ifndef CEPH_RGW_USER_H #define CEPH_RGW_USER_H -#include <string> - #include "include/types.h" + #include "rgw_common.h" #include "rgw_tools.h" diff --git a/src/rgw/rgw_xml.cc b/src/rgw/rgw_xml.cc index 4347b06115c..eb2c1708b73 100644 --- a/src/rgw/rgw_xml.cc +++ b/src/rgw/rgw_xml.cc @@ -1,11 +1,7 @@ -#include <string.h> - -#include <iostream> -#include <map> - #include "include/types.h" #include "rgw_common.h" + #include "rgw_xml.h" #define dout_subsys ceph_subsys_rgw diff --git a/src/scratchtoolpp.cc b/src/scratchtoolpp.cc index 01db29e9f2b..59d9b7a2483 100644 --- a/src/scratchtoolpp.cc +++ b/src/scratchtoolpp.cc @@ -11,18 +11,17 @@ * Foundation. See file COPYING. * */ - #include "include/types.h" -#include "include/rados/librados.hpp" - -using namespace librados; #include <iostream> - #include <errno.h> #include <stdlib.h> #include <time.h> +#include "include/rados/librados.hpp" + +using namespace librados; + void buf_to_hex(const unsigned char *buf, int len, char *str) { str[0] = '\0'; diff --git a/src/streamtest.cc b/src/streamtest.cc index f3c53a3c45b..e0ff03d6e07 100644 --- a/src/streamtest.cc +++ b/src/streamtest.cc @@ -13,11 +13,12 @@ */ #include <iostream> + +#include "common/ceph_argparse.h" +#include "common/debug.h" #include "os/FileStore.h" #include "global/global_context.h" #include "global/global_init.h" -#include "common/ceph_argparse.h" -#include "common/debug.h" #undef dout_prefix #define dout_prefix *_dout 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; diff --git a/src/test_trans.cc b/src/test_trans.cc index 2c69c7b6581..f97ea14c58a 100644 --- a/src/test_trans.cc +++ b/src/test_trans.cc @@ -13,11 +13,13 @@ */ #include <iostream> + +#include "include/assert.h" #include "common/ceph_argparse.h" #include "os/FileStore.h" #include "global/global_init.h" +#include "global/global_context.h" #include "global/debug.h" -#include "include/assert.h" #define dout_subsys ceph_subsys_filestore #undef dout_prefix diff --git a/src/testclass.cc b/src/testclass.cc index 22a97be6dcb..ef46547902e 100644 --- a/src/testclass.cc +++ b/src/testclass.cc @@ -1,6 +1,4 @@ - - #include <iostream> #include <string.h> #include <stdlib.h> diff --git a/src/testcrypto.cc b/src/testcrypto.cc index b04463c9f92..424b9bfdc8a 100644 --- a/src/testcrypto.cc +++ b/src/testcrypto.cc @@ -1,8 +1,6 @@ -#include "auth/Crypto.h" #include "common/Clock.h" - #include "common/config.h" - +#include "auth/Crypto.h" #include "global/global_context.h" #include "global/debug.h" diff --git a/src/testkeys.cc b/src/testkeys.cc index 2f1e0328e65..4ed2fb94051 100644 --- a/src/testkeys.cc +++ b/src/testkeys.cc @@ -1,9 +1,9 @@ -#include "auth/cephx/CephxKeyServer.h" #include "common/ceph_argparse.h" +#include "common/config.h" +#include "auth/cephx/CephxKeyServer.h" #include "global/global_context.h" #include "global/global_init.h" #include "global/debug.h" -#include "common/config.h" #define AES_KEY_LEN 16 diff --git a/src/testmsgr.cc b/src/testmsgr.cc index 6bc831ce256..3d44eb67d11 100644 --- a/src/testmsgr.cc +++ b/src/testmsgr.cc @@ -15,28 +15,27 @@ #include <sys/stat.h> #include <iostream> #include <string> -using namespace std; +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> -#include "common/config.h" +#ifndef DARWIN +#include <envz.h> +#endif // DARWIN +#include "common/config.h" +#include "common/Timer.h" +#include "common/ceph_argparse.h" #include "mon/MonMap.h" #include "mon/MonClient.h" #include "msg/Messenger.h" -#include "messages/MPing.h" - -#include "common/Timer.h" #include "global/global_context.h" #include "global/global_init.h" #include "global/debug.h" -#include "common/ceph_argparse.h" -#ifndef DARWIN -#include <envz.h> -#endif // DARWIN +#include "messages/MPing.h" -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> +using namespace std; #define dout_subsys ceph_subsys_ms diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc index b36bf1d6edf..ae767f19083 100644 --- a/src/tools/ceph.cc +++ b/src/tools/ceph.cc @@ -27,16 +27,16 @@ #include <unistd.h> #include <string.h> +#include "include/compat.h" +#include "include/assert.h" #include "common/ceph_argparse.h" -#include "global/global_init.h" -#include "global/debug.h" #include "common/errno.h" #include "common/safe_io.h" #include "common/config.h" -#include "tools/common.h" +#include "global/global_init.h" +#include "global/debug.h" -#include "include/compat.h" -#include "include/assert.h" +#include "common.h" using std::vector; diff --git a/src/tools/common.cc b/src/tools/common.cc index b51c75523d7..031d2e3a507 100644 --- a/src/tools/common.cc +++ b/src/tools/common.cc @@ -12,41 +12,35 @@ * */ +#include "acconfig.h" + #include <sys/stat.h> #include <iostream> #include <string> -using namespace std; +#include <memory> +#include <sys/types.h> +#include <fcntl.h> #if !defined(DARWIN) && !defined(__FreeBSD__) #include <envz.h> #endif // DARWIN -#include <memory> -#include <sys/types.h> -#include <fcntl.h> - extern "C" { #include <histedit.h> } -#include "acconfig.h" -#include "messages/MMonCommand.h" -#include "messages/MMonCommandAck.h" -#include "messages/MLog.h" -#include "mon/MonClient.h" +#include "include/assert.h" +#include "common/errno.h" #include "mon/MonMap.h" -#include "osd/OSDMap.h" #include "msg/SimpleMessenger.h" -#include "tools/common.h" - -#include "common/errno.h" -#include "common/Cond.h" -#include "common/Mutex.h" -#include "common/Timer.h" #include "global/global_init.h" #include "global/debug.h" -#include "include/assert.h" +#include "messages/MMonCommand.h" + +#include "common.h" + +using namespace std; #define dout_subsys ceph_subsys_ diff --git a/src/tools/common.h b/src/tools/common.h index 2a303675a15..cb0a1b43856 100644 --- a/src/tools/common.h +++ b/src/tools/common.h @@ -3,28 +3,28 @@ #ifndef CEPH_TOOLS_COMMON_DOT_H #define CEPH_TOOLS_COMMON_DOT_H +#include "mon/mon_types.h" + #include <iosfwd> #include <stdint.h> #include <map> #include "common/Cond.h" #include "common/Mutex.h" +#include "common/Timer.h" +#include "common/LogEntry.h" #include "mon/MonClient.h" #include "mon/PGMap.h" #include "mds/MDSMap.h" #include "osd/OSDMap.h" -#include "common/Timer.h" +#include "global/global_context.h" - -#include "common/LogEntry.h" -#include "mon/mon_types.h" #include "messages/MOSDMap.h" #include "messages/MLog.h" #include "messages/MCommand.h" #include "messages/MCommandReply.h" #include "messages/MMonCommandAck.h" - #define OSD_MON_UPDATE (1<<0) #define MDS_MON_UPDATE (1<<1) #define PG_MON_UPDATE (1<<2) diff --git a/src/tools/rest_bench.cc b/src/tools/rest_bench.cc index a57e9a8688d..049b30a861e 100644 --- a/src/tools/rest_bench.cc +++ b/src/tools/rest_bench.cc @@ -13,22 +13,22 @@ */ #include "include/types.h" -#include "include/atomic.h" +#include <deque> +#include <errno.h> + +#include "include/atomic.h" #include "common/obj_bencher.h" #include "common/config.h" #include "common/ceph_argparse.h" #include "common/WorkQueue.h" #include "msg/Message.h" #include "global/global_init.h" +#include "global/global_context.h" #include "global/debug.h" #include "libs3.h" -#include <deque> - -#include <errno.h> - #define DEFAULT_USER_AGENT "rest-bench" #define DEFAULT_BUCKET "rest-bench-bucket" |