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

hmm, everytime modify any file, then compile, then wait&wait&wait, so trying to optimize
this part, wish to decrease header dependency, try to improve compile speed.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 975c49b8d90bfaa0202465eb26231867c245f37f..cbdd675db099139b20d79c0c5cc07da99ba70da9 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -12,18 +12,19 @@
  *
  */
 
-#include <boost/variant.hpp>
-#include <boost/optional/optional_io.hpp>
 #include <iostream>
 #include <sstream>
 
-#include "ECUtil.h"
 #include "ECBackend.h"
 #include "messages/MOSDPGPush.h"
 #include "messages/MOSDPGPushReply.h"
-#include "ReplicatedPG.h"
+#include "messages/MOSDECSubOpWrite.h"
+#include "messages/MOSDECSubOpWriteReply.h"
+#include "messages/MOSDECSubOpRead.h"
+#include "messages/MOSDECSubOpReadReply.h"
+#include "ECMsgTypes.h"
 
-class ReplicatedPG;
+#include "ReplicatedPG.h"
 
 #define dout_subsys ceph_subsys_osd
 #define DOUT_PREFIX_ARGS this

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index a0bf62dde994c35c60c60124679e77cdb33172d1..91aa7fd8fa74d722f7320c5225f9c0e87b0d7a39 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -18,13 +18,15 @@
 #include "OSD.h"
 #include "PGBackend.h"
 #include "erasure-code/ErasureCodeInterface.h"
-#include "ECTransaction.h"
-#include "ECMsgTypes.h"
 #include "ECUtil.h"
-#include "messages/MOSDECSubOpWrite.h"
-#include "messages/MOSDECSubOpWriteReply.h"
-#include "messages/MOSDECSubOpRead.h"
-#include "messages/MOSDECSubOpReadReply.h"
+#include "ECTransaction.h"
+
+//forward declaration
+struct ECSubWrite;
+struct ECSubWriteReply;
+struct ECSubRead;
+struct ECSubReadReply;
+class ECTransaction;
 
 struct RecoveryMessages;
 class ECBackend : public PGBackend {

diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
index 64dd89feac2c93bfd58d1d8f3ea6853afaf7e181..efad66d5aef90150e8f582bcc3f81a487eda51db 100644 (file)
--- a/src/osd/ECTransaction.cc
+++ b/src/osd/ECTransaction.cc
@@ -12,13 +12,11 @@
  *
  */
 
-#include <boost/variant.hpp>
-#include <boost/optional/optional_io.hpp>
 #include <iostream>
 #include <vector>
 #include <sstream>
 
-#include "ECBackend.h"
+#include "ECTransaction.h"
 #include "ECUtil.h"
 #include "os/ObjectStore.h"
 

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 409dbca4aef8ce00824e90148a9f02e03533506e..4819ea04414cd7823b8830a3a3bb5d6d4baf033a 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -24,6 +24,9 @@
 #include "PGBackend.h"
 #include "OSD.h"
 #include "erasure-code/ErasureCodePlugin.h"
+#include "OSDMap.h"
+#include "PGLog.h"
+#include "common/LogClient.h"
 
 #define dout_subsys ceph_subsys_osd
 #define DOUT_PREFIX_ARGS this

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index f88c1a08af76441a523760c933d6bfed156eeb0f..deaddfed4af33936d95d9b27459509cb0bfbe399 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -18,8 +18,6 @@
 #ifndef PGBACKEND_H
 #define PGBACKEND_H
 
-#include "OSDMap.h"
-#include "PGLog.h"
 #include "osd_types.h"
 #include "common/WorkQueue.h"
 #include "include/Context.h"
@@ -32,6 +30,11 @@ namespace Scrub {
 }
 struct shard_info_wrapper;
 
+//forward declaration
+class OSDMap;
+class PGLog;
+typedef ceph::shared_ptr<const OSDMap> OSDMapRef;
+
  /**
   * PGBackend
   *