OSD: optimize header file dependency to decreace compile time when modify any file

    OSD's left header dependency optimize.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>

diff --git a/src/osd/ClassHandler.cc b/src/osd/ClassHandler.cc
index 5b39f96a569d2fea0b12d00cc7c4714912cd70d4..64b6c51febdb59b69d5da483dfd13418042664bd 100644 (file)
--- a/src/osd/ClassHandler.cc
+++ b/src/osd/ClassHandler.cc
@@ -2,10 +2,9 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "include/types.h"
-#include "msg/Message.h"
-#include "osd/OSD.h"
 #include "ClassHandler.h"
 #include "common/errno.h"
+#include "common/ceph_context.h"
 
 #include <dlfcn.h>
 
@@ -16,6 +15,7 @@
 #endif
 
 #include "common/config.h"
+#include "common/debug.h"
 
 #define dout_subsys ceph_subsys_osd
 #undef dout_prefix

diff --git a/src/osd/ClassHandler.h b/src/osd/ClassHandler.h
index 3fe1f98d1a7ab671022656114641454f05a1aa42..74f5b69e7653b78076d77e568f7fe9a1be599497 100644 (file)
--- a/src/osd/ClassHandler.h
+++ b/src/osd/ClassHandler.h
@@ -2,13 +2,11 @@
 #define CEPH_CLASSHANDLER_H
 
 #include "include/types.h"
-
 #include "objclass/objclass.h"
-
-#include "common/Cond.h"
 #include "common/Mutex.h"
-#include "common/ceph_context.h"
 
+//forward declaration
+class CephContext;
 
 class ClassHandler
 {

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 646a2aebadf478cd9ce89539fa79e63f240bad53..bac252818cfe10658e37d4101c2a77ce18676911 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -113,8 +113,10 @@
 #include "common/perf_counters.h"
 #include "common/Timer.h"
 #include "common/LogClient.h"
+#include "common/AsyncReserver.h"
 #include "common/HeartbeatMap.h"
 #include "common/admin_socket.h"
+#include "common/ceph_context.h"
 
 #include "global/signal_handler.h"
 #include "global/pidfile.h"
@@ -123,11 +125,9 @@
 #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"

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 14fb6fb25ec0e78eff2436005157319ac336d413..ba3caaca032898d47af783c0c7fac43479691114 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -15,8 +15,6 @@
 #ifndef CEPH_OSD_H
 #define CEPH_OSD_H
 
-#include "boost/tuple/tuple.hpp"
-
 #include "PG.h"
 
 #include "msg/Dispatcher.h"
@@ -25,19 +23,15 @@
 #include "common/RWLock.h"
 #include "common/Timer.h"
 #include "common/WorkQueue.h"
-#include "common/LogClient.h"
 #include "common/AsyncReserver.h"
-#include "common/ceph_context.h"
-
 #include "os/ObjectStore.h"
-#include "OSDCap.h"
-
+#include "OSDCap.h" 
+ 
+#include "auth/KeyRing.h"
 #include "osd/ClassHandler.h"
 
 #include "include/CompatSet.h"
 
-#include "auth/KeyRing.h"
-#include "messages/MOSDRepScrub.h"
 #include "OpRequest.h"
 
 #include <atomic>
@@ -48,13 +42,11 @@ using namespace std;
 
 #include "include/unordered_map.h"
 
-#include "Watch.h"
 #include "common/shared_cache.hpp"
 #include "common/simple_cache.hpp"
 #include "common/sharedptr_registry.hpp"
 #include "common/WeightedPriorityQueue.h"
 #include "common/PrioritizedQueue.h"
-#include "common/OpQueue.h"
 #include "messages/MOSDOp.h"
 #include "include/Spinlock.h"
 
@@ -222,8 +214,10 @@ class OpsFlightSocketHook;
 class HistoricOpsSocketHook;
 class TestOpsSocketHook;
 struct C_CompleteSplits;
-
+class LogChannel;
+class CephContext;
 typedef ceph::shared_ptr<ObjectStore::Sequencer> SequencerRef;
+class MOSDOp;
 
 class DeletingState {
   Mutex lock;

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index cf1c21528cb864a7d2ee715c0934d5add650740d..25a47c53bddce7638e8ceab15d1c78d7a8fd4c4e 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -22,12 +22,12 @@
 #include "common/TextTable.h"
 #include "include/ceph_features.h"
 #include "include/str_map.h"
-#include "include/stringify.h"
 
 #include "common/code_environment.h"
 
 #include "crush/CrushTreeDumper.h"
-
+#include "common/Clock.h"
+ 
 #define dout_subsys ceph_subsys_osd
 
 // ----------------------------------

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 5446e3863cdb763d5b6a228c56e8e3b4aa649692..a358678c4a351b9c00cb93e276f3181d7f1eaa18 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -24,16 +24,11 @@
  *   disks, disk groups, total # osds,
  *
  */
-#include "common/config.h"
 #include "include/types.h"
 #include "osd_types.h"
 
-#include "include/ceph_features.h"
-
+//#include "include/ceph_features.h"
 #include "crush/CrushWrapper.h"
-
-#include "include/interval_set.h"
-
 #include <vector>
 #include <list>
 #include <set>
@@ -41,7 +36,9 @@
 #include "include/memory.h"
 using namespace std;
 
-
+//forward declaration
+class CephContext;
+class CrushWrapper;
 /*
  * we track up to two intervals during which the osd was alive and
  * healthy.  the most recent is [up_from,up_thru), where up_thru is

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index e8f2a3ac49ef36e358d4bb6018ce70276b9a8055..551638d6135cc8c92c2b296adf65be94f9c7aadf 100644 (file)
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -16,9 +16,8 @@
  */
 
 #include "PGLog.h"
-#include "PG.h"
-#include "SnapMapper.h"
-#include "../include/unordered_map.h"
+#include "include/unordered_map.h"
+#include "common/ceph_context.h"
 
 #define dout_subsys ceph_subsys_osd
 #undef dout_prefix

diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 0083303bb7275d32f34b1d76d5f60ec0a4691fb6..27c0f38c57653dca72ae8cbfc712a4b792f719e3 100644 (file)
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -21,7 +21,6 @@
 #include "include/assert.h" 
 #include "osd_types.h"
 #include "os/ObjectStore.h"
-#include "common/ceph_context.h"
 #include <list>
 using namespace std;
 
@@ -30,6 +29,8 @@ using namespace std;
 #define PGLOG_INDEXED_EXTRA_CALLER_OPS (1 << 2)
 #define PGLOG_INDEXED_ALL              (PGLOG_INDEXED_OBJECTS | PGLOG_INDEXED_CALLER_OPS | PGLOG_INDEXED_EXTRA_CALLER_OPS)
 
+class CephContext;
+
 struct PGLog : DoutPrefixProvider {
   DoutPrefixProvider *prefix_provider;
   string gen_prefix() const {

diff --git a/src/osd/Watch.h b/src/osd/Watch.h
index c6843ee785de3376a8d8f68842797cc204a8aa92..79b58e0dc9e1c73a7742d21087db78e0ea68f895 100644 (file)
--- a/src/osd/Watch.h
+++ b/src/osd/Watch.h
@@ -14,13 +14,11 @@
 #ifndef CEPH_WATCH_H
 #define CEPH_WATCH_H
 
-#include <boost/intrusive_ptr.hpp>
 #include "include/memory.h"
 #include <set>
 
 #include "msg/Messenger.h"
 #include "include/Context.h"
-#include "common/Mutex.h"
 
 enum WatcherState {
   WATCHER_PENDING,