From 32bff51f072ef59b240de3eaf271ae09b7daebb3 Mon Sep 17 00:00:00 2001 From: cxwshawn Date: Thu, 19 May 2016 13:03:29 +0800 Subject: [PATCH] MON: optimize header file dependency. same work as PR: https://github.com/ceph/ceph/pull/9161 Signed-off-by: Xiaowei Chen --- src/mon/AuthMonitor.cc | 9 +-------- src/mon/AuthMonitor.h | 3 +-- src/mon/ConfigKeyService.cc | 4 ---- src/mon/ConfigKeyService.h | 10 ++++------ src/mon/DataHealthService.cc | 4 ---- src/mon/DataHealthService.h | 5 ++--- src/mon/Elector.cc | 1 - src/mon/Elector.h | 4 ---- src/mon/HealthMonitor.cc | 10 +++++----- src/mon/HealthMonitor.h | 7 ++----- src/mon/LogMonitor.cc | 5 ----- src/mon/LogMonitor.h | 4 ++-- src/mon/MDSMonitor.cc | 7 ++----- src/mon/MDSMonitor.h | 7 ++----- src/mon/MonCap.cc | 1 - src/mon/MonClient.cc | 9 +-------- src/mon/MonClient.h | 13 ++++--------- src/mon/MonMap.h | 1 - src/mon/Monitor.cc | 12 +++--------- src/mon/Monitor.h | 13 ------------- src/mon/MonmapMonitor.cc | 10 ++-------- src/mon/OSDMonitor.cc | 1 + src/mon/OSDMonitor.h | 10 ++-------- src/mon/PGMap.cc | 2 -- src/mon/PGMap.h | 3 --- src/mon/PGMonitor.cc | 7 +------ src/mon/PGMonitor.h | 4 +--- src/mon/Paxos.cc | 5 ++--- src/mon/Paxos.h | 4 ---- src/mon/PaxosService.cc | 7 +------ src/mon/PaxosService.h | 3 --- 31 files changed, 39 insertions(+), 146 deletions(-) diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 10003a10afe..9bfc81434f8 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -22,18 +22,11 @@ #include "messages/MAuth.h" #include "messages/MAuthReply.h" #include "messages/MMonGlobalID.h" - -#include "common/Timer.h" -#include "common/config.h" -#include "common/cmdparse.h" +#include "msg/Messenger.h" #include "auth/AuthServiceHandler.h" #include "auth/KeyRing.h" - -#include "osd/osd_types.h" - #include "include/assert.h" -#include "include/str_list.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h index 44202902718..f40b5dc4680 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -21,9 +21,7 @@ using namespace std; #include "include/ceph_features.h" #include "include/types.h" -#include "msg/Messenger.h" #include "mon/PaxosService.h" -#include "mon/Monitor.h" #include "mon/MonitorDBStore.h" class MMonCommand; @@ -31,6 +29,7 @@ struct MAuth; class MAuthMon; struct MMonGlobalID; class KeyRing; +class Monitor; #define MIN_GLOBAL_ID 0x1000 diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc index 59798f2bbc5..f88d4b60aa9 100644 --- a/src/mon/ConfigKeyService.cc +++ b/src/mon/ConfigKeyService.cc @@ -17,12 +17,8 @@ #include #include "mon/Monitor.h" -#include "mon/QuorumService.h" #include "mon/ConfigKeyService.h" #include "mon/MonitorDBStore.h" - -#include "common/config.h" -#include "common/cmdparse.h" #include "common/errno.h" #define dout_subsys ceph_subsys_mon diff --git a/src/mon/ConfigKeyService.h b/src/mon/ConfigKeyService.h index fe1d54d5ea5..e03b92e27db 100644 --- a/src/mon/ConfigKeyService.h +++ b/src/mon/ConfigKeyService.h @@ -14,15 +14,13 @@ #ifndef CEPH_MON_CONFIG_KEY_SERVICE_H #define CEPH_MON_CONFIG_KEY_SERVICE_H -#include "mon/Monitor.h" #include "mon/QuorumService.h" -#include "messages/MMonHealth.h" - -#include "common/config.h" -#include "common/Formatter.h" - class Paxos; +class Monitor; +namespace ceph { +class Formatter; +} class ConfigKeyService : public QuorumService { diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc index 3056a5edc8f..521adfdb026 100644 --- a/src/mon/DataHealthService.cc +++ b/src/mon/DataHealthService.cc @@ -11,7 +11,6 @@ * Foundation. See file COPYING. * */ -#include #include "include/memory.h" #include #include @@ -34,14 +33,11 @@ #endif #include "messages/MMonHealth.h" -#include "include/types.h" -#include "include/Context.h" #include "include/assert.h" #include "common/Formatter.h" #include "common/errno.h" #include "mon/Monitor.h" -#include "mon/QuorumService.h" #include "mon/DataHealthService.h" #define dout_subsys ceph_subsys_mon diff --git a/src/mon/DataHealthService.h b/src/mon/DataHealthService.h index a986d18fe98..a11ef82a77a 100644 --- a/src/mon/DataHealthService.h +++ b/src/mon/DataHealthService.h @@ -17,15 +17,14 @@ #include #include "include/types.h" -#include "include/Context.h" #include "mon/mon_types.h" -#include "mon/QuorumService.h" #include "mon/HealthService.h" -#include "common/Formatter.h" #include "common/config.h" #include "global/signal_handler.h" struct MMonHealth; +namespace ceph { class Formatter; } + class DataHealthService : public HealthService diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index 2ad1161e73b..99049a3e931 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -17,7 +17,6 @@ #include "common/Timer.h" #include "MonitorDBStore.h" -#include "MonmapMonitor.h" #include "messages/MMonElection.h" #include "common/config.h" diff --git a/src/mon/Elector.h b/src/mon/Elector.h index 03a9d17d9b2..1c2157eb331 100644 --- a/src/mon/Elector.h +++ b/src/mon/Elector.h @@ -20,11 +20,7 @@ using namespace std; #include "include/types.h" -#include "msg/Message.h" - #include "include/Context.h" - -#include "common/Timer.h" #include "mon/MonOpRequest.h" class Monitor; diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc index 24ac84c850f..bfa4ca02bb3 100644 --- a/src/mon/HealthMonitor.cc +++ b/src/mon/HealthMonitor.cc @@ -16,19 +16,19 @@ #include #include -#include +// #include // Because intusive_ptr clobbers our assert... #include "include/assert.h" #include "mon/Monitor.h" -#include "mon/QuorumService.h" -#include "mon/HealthService.h" +// #include "mon/QuorumService.h" +// #include "mon/HealthService.h" #include "mon/HealthMonitor.h" #include "mon/DataHealthService.h" #include "messages/MMonHealth.h" - -#include "common/config.h" +#include "common/Formatter.h" +// #include "common/config.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/HealthMonitor.h b/src/mon/HealthMonitor.h index 43898762f06..215ed0436ca 100644 --- a/src/mon/HealthMonitor.h +++ b/src/mon/HealthMonitor.h @@ -14,14 +14,11 @@ #ifndef CEPH_HEALTH_MONITOR_H #define CEPH_HEALTH_MONITOR_H -#include "mon/Monitor.h" #include "mon/QuorumService.h" #include "mon/HealthService.h" -#include "messages/MMonHealth.h" - -#include "common/config.h" -#include "common/Formatter.h" +//forward declaration +namespace ceph { class Formatter; } class HealthMonitor : public QuorumService { diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 391a3380b79..65d3db66724 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -24,13 +24,8 @@ #include "messages/MMonCommand.h" #include "messages/MLog.h" #include "messages/MLogAck.h" - -#include "common/Timer.h" #include "common/Graylog.h" - -#include "osd/osd_types.h" #include "common/errno.h" -#include "common/config.h" #include "common/strtol.h" #include "include/assert.h" #include "include/str_list.h" diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h index 678c5ff3fc9..99daff69acb 100644 --- a/src/mon/LogMonitor.h +++ b/src/mon/LogMonitor.h @@ -20,13 +20,13 @@ using namespace std; #include "include/types.h" -#include "msg/Messenger.h" #include "PaxosService.h" #include "common/LogEntry.h" -#include "messages/MLog.h" +#include "include/str_map.h" class MMonCommand; +class MLog; static const string LOG_META_CHANNEL = "$channel"; diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 9d72a0f9ad6..504e3fb72b0 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -21,23 +21,20 @@ #include "OSDMonitor.h" #include "common/strtol.h" -#include "common/ceph_argparse.h" #include "common/perf_counters.h" -#include "common/Timer.h" #include "common/config.h" #include "common/cmdparse.h" - #include "messages/MMDSMap.h" #include "messages/MFSMap.h" -#include "messages/MMDSBeacon.h" #include "messages/MMDSLoadTargets.h" #include "messages/MMonCommand.h" #include "messages/MGenericMessage.h" #include "include/assert.h" #include "include/str_list.h" - +#include "include/stringify.h" #include "mds/mdstypes.h" +#include "Session.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index 419deaa19d7..2c70aff24fd 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -23,13 +23,10 @@ using namespace std; #include "include/types.h" -#include "msg/Messenger.h" - #include "mds/FSMap.h" - +#include "mds/MDSMap.h" #include "PaxosService.h" -#include "Session.h" - +#include "msg/Messenger.h" #include "messages/MMDSBeacon.h" class MMonCommand; diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc index a2540b56411..55f7bebe8f6 100644 --- a/src/mon/MonCap.cc +++ b/src/mon/MonCap.cc @@ -22,7 +22,6 @@ #include "MonCap.h" #include "include/stringify.h" -#include "common/config.h" #include "common/debug.h" #include "common/Formatter.h" diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index f906406f33d..6ae7b457406 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -12,7 +12,6 @@ * */ -#include "msg/Messenger.h" #include "messages/MMonGetMap.h" #include "messages/MMonGetVersion.h" #include "messages/MMonGetVersionReply.h" @@ -26,8 +25,6 @@ #include "messages/MMonSubscribe.h" #include "messages/MMonSubscribeAck.h" -#include "common/ConfUtils.h" -#include "common/ceph_argparse.h" #include "common/errno.h" #include "common/LogClient.h" @@ -37,11 +34,7 @@ #include "auth/Auth.h" #include "auth/KeyRing.h" #include "auth/AuthMethodList.h" - -#include "include/str_list.h" -#include "include/addr_parsing.h" - -#include "common/config.h" +#include "auth/RotatingKeyRing.h" #define dout_subsys ceph_subsys_monc diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index 2efa1ff48fa..4e08ceb6d6c 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -15,25 +15,18 @@ #ifndef CEPH_MONCLIENT_H #define CEPH_MONCLIENT_H -#include "msg/Dispatcher.h" #include "msg/Messenger.h" #include "MonMap.h" #include "common/Timer.h" #include "common/Finisher.h" - +#include "common/config.h" #include "auth/AuthClientHandler.h" #include "auth/RotatingKeyRing.h" - -#include "messages/MMonSubscribe.h" - #include "common/SimpleRNG.h" -#include "osd/osd_types.h" -#include -class MonMap; class MMonMap; class MMonGetVersion; class MMonGetVersionReply; @@ -47,7 +40,9 @@ class LogClient; class AuthSupported; class AuthAuthorizeHandlerRegistry; class AuthMethodList; - +class Messenger; +// class RotatingKeyRing; +class KeyRing; enum MonClientState { MC_STATE_NONE, MC_STATE_NEGOTIATING, diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 390d88a7ca2..68597f3328c 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -19,7 +19,6 @@ #include "msg/Message.h" #include "include/types.h" -//#include "common/config.h" namespace ceph { class Formatter; diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 719d5aae14d..5800e603037 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -27,8 +27,6 @@ #include "MonitorDBStore.h" -#include "msg/Messenger.h" - #include "messages/PaxosServiceMessage.h" #include "messages/MMonMap.h" #include "messages/MMonGetMap.h" @@ -62,13 +60,12 @@ #include "common/errno.h" #include "common/perf_counters.h" #include "common/admin_socket.h" - #include "global/signal_handler.h" - +#include "common/Formatter.h" +#include "include/stringify.h" #include "include/color.h" #include "include/ceph_fs.h" #include "include/str_list.h" -#include "include/str_map.h" #include "OSDMonitor.h" #include "MDSMonitor.h" @@ -79,14 +76,11 @@ #include "mon/QuorumService.h" #include "mon/HealthMonitor.h" #include "mon/ConfigKeyService.h" - -#include "auth/AuthMethodList.h" -#include "auth/KeyRing.h" - #include "common/config.h" #include "common/cmdparse.h" #include "include/assert.h" #include "include/compat.h" +#include "perfglue/heap_profiler.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index add1c3ed676..d3d0a6b45be 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -33,29 +33,16 @@ #include "Paxos.h" #include "Session.h" -#include "osd/OSDMap.h" - #include "common/LogClient.h" -#include "common/SimpleRNG.h" -#include "common/cmdparse.h" - #include "auth/cephx/CephxKeyServer.h" #include "auth/AuthMethodList.h" #include "auth/KeyRing.h" - -#include "perfglue/heap_profiler.h" - #include "messages/MMonCommand.h" -#include "messages/MPing.h" #include "mon/MonitorDBStore.h" - -#include #include "include/memory.h" -#include "include/str_map.h" #include #include -#include "common/TrackedOp.h" #include "mon/MonOpRequest.h" diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 1ff6e06b88b..3cd61a26ec5 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -14,23 +14,17 @@ #include "MonmapMonitor.h" #include "Monitor.h" -#include "MonitorDBStore.h" - #include "messages/MMonCommand.h" #include "messages/MMonJoin.h" -#include "common/Timer.h" #include "common/ceph_argparse.h" #include "common/errno.h" -#include "mon/MDSMonitor.h" -#include "mon/OSDMonitor.h" -#include "mon/PGMonitor.h" - #include #include "common/config.h" #include "common/cmdparse.h" -#include "include/str_list.h" + #include "include/assert.h" +#include "include/stringify.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 1dcc2a1d9a3..c9f46f054e1 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -26,6 +26,7 @@ #include "PGMonitor.h" #include "MonitorDBStore.h" +#include "Session.h" #include "crush/CrushWrapper.h" #include "crush/CrushTester.h" diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 548e13ca676..75d15944a5c 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -32,19 +32,13 @@ using namespace std; #include "osd/OSDMap.h" #include "PaxosService.h" -#include "Session.h" class Monitor; class PGMap; - -#include "messages/MOSDBoot.h" -#include "messages/MMonCommand.h" -#include "messages/MOSDMap.h" -#include "messages/MPoolOp.h" +class MonSession; +class MOSDMap; #include "erasure-code/ErasureCodeInterface.h" - -#include "common/TrackedOp.h" #include "mon/MonOpRequest.h" #define OSD_METADATA_PREFIX "osd_metadata" diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 4407814c8cb..df7d6c79929 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -6,10 +6,8 @@ #define dout_subsys ceph_subsys_mon #include "common/debug.h" #include "common/TextTable.h" -#include "include/stringify.h" #include "common/Formatter.h" #include "include/ceph_features.h" -#include "mon/MonitorDBStore.h" #include "osd/osd_types.h" // -- diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h index 335c1207bc9..20f86db9269 100644 --- a/src/mon/PGMap.h +++ b/src/mon/PGMap.h @@ -23,11 +23,8 @@ #include "common/debug.h" #include "osd/osd_types.h" -#include "common/config.h" #include -#include "MonitorDBStore.h" - namespace ceph { class Formatter; } class PGMap { diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 3055fad9911..741e06db3fb 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -17,7 +17,6 @@ #include "common/debug.h" // undo damage #include "PGMonitor.h" #include "Monitor.h" -#include "MDSMonitor.h" #include "OSDMonitor.h" #include "MonitorDBStore.h" @@ -32,11 +31,9 @@ #include "messages/MMonCommand.h" #include "messages/MOSDScrub.h" -#include "common/Timer.h" #include "common/Formatter.h" -#include "common/ceph_argparse.h" -#include "common/perf_counters.h" #include "common/TextTable.h" +#include "common/config.h" #include "include/stringify.h" @@ -47,8 +44,6 @@ #include "common/strtol.h" #include "include/str_list.h" #include -#include -#include "common/cmdparse.h" #define dout_subsys ceph_subsys_mon #undef dout_prefix diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h index e4081f1aba0..b02003b5e8c 100644 --- a/src/mon/PGMonitor.h +++ b/src/mon/PGMonitor.h @@ -30,17 +30,15 @@ using namespace std; #include "include/utime.h" #include "common/histogram.h" #include "msg/Messenger.h" -#include "common/config.h" #include "mon/MonitorDBStore.h" -#include "messages/MPGStats.h" -#include "messages/MPGStatsAck.h" class MStatfs; class MMonCommand; class MGetPoolStats; class RatioMonitor; class TextTable; +class MPGStats; class PGMonitor : public PaxosService { public: diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index b0df122804c..be44f3479c1 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -15,14 +15,13 @@ #include #include "Paxos.h" #include "Monitor.h" -#include "MonitorDBStore.h" - #include "messages/MMonPaxos.h" #include "common/config.h" #include "include/assert.h" #include "include/stringify.h" -#include "common/Formatter.h" +#include "common/Timer.h" +#include "messages/PaxosServiceMessage.h" #define dout_subsys ceph_subsys_paxos #undef dout_prefix diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index f2b0a3059e3..db6438f1a19 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -112,12 +112,8 @@ e 12v #include "include/types.h" #include "mon_types.h" #include "include/buffer.h" -#include "messages/PaxosServiceMessage.h" #include "msg/msg_types.h" - #include "include/Context.h" - -#include "common/Timer.h" #include "common/perf_counters.h" #include diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index cde3faa3546..0ab10869421 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -14,14 +14,9 @@ #include "PaxosService.h" #include "common/Clock.h" -#include "Monitor.h" -#include "MonitorDBStore.h" - - #include "common/config.h" +#include "include/stringify.h" #include "include/assert.h" -#include "common/Formatter.h" - #include "mon/MonOpRequest.h" #define dout_subsys ceph_subsys_paxos diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h index 2d2cbe7620d..4f74e0cbe5c 100644 --- a/src/mon/PaxosService.h +++ b/src/mon/PaxosService.h @@ -15,10 +15,7 @@ #ifndef CEPH_PAXOSSERVICE_H #define CEPH_PAXOSSERVICE_H -#include "messages/PaxosServiceMessage.h" #include "include/Context.h" -#include "include/stringify.h" -#include #include "Paxos.h" #include "Monitor.h" #include "MonitorDBStore.h" -- 2.39.5