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>

1 files changed, 13 insertions, 14 deletions

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"