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/MDBalancer.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/MDBalancer.cc')
| -rw-r--r-- | src/mds/MDBalancer.cc | 30 |
1 files changed, 15 insertions, 15 deletions
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 |