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 /src/mds/MDS.cc | |
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>
Diffstat (limited to 'src/mds/MDS.cc')
-rw-r--r-- | src/mds/MDS.cc | 62 |
1 files changed, 21 insertions, 41 deletions
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), |