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/mon/MDSMonitor.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/mon/MDSMonitor.cc')
-rw-r--r-- | src/mon/MDSMonitor.cc | 25 |
1 files changed, 12 insertions, 13 deletions
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 |