common/config: cleanup config_fwd.h

* define an alias for ceph::common::ConfigProxy
* remove obs bits from config_fwd.h, as the users of obs will always
  need to include config_obs.h anyway.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/common/config.h b/src/common/config.h
index 503e57b14739a06629cd86bc990be2a238399a11..76886cd2d1d8d7014ddd8abba67ed05f861f5bc7 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -23,7 +23,6 @@
 #include "log/SubsystemMap.h"
 #include "common/options.h"
 #include "common/subsys_types.h"
-#include "common/config_fwd.h"
 #include "common/config_tracker.h"
 #include "common/config_values.h"
 

diff --git a/src/common/config_fwd.h b/src/common/config_fwd.h
index 7b7ff28e5366e442fa738feb537cc1b282a61d54..817d1a0f8b033768644fa702e836137b9339c396 100644 (file)
--- a/src/common/config_fwd.h
+++ b/src/common/config_fwd.h
@@ -2,12 +2,11 @@
 
 #pragma once
 
-#include "lock_policy.h"
-
-namespace ceph {
-template<class ConfigProxy> class md_config_obs_impl;
+#ifdef WITH_SEASTAR
+namespace ceph::common {
+  class ConfigProxy;
 }
-
-struct md_config_t;
+using ConfigProxy = ceph::common::ConfigProxy;
+#else
 class ConfigProxy;
-using md_config_obs_t = ceph::md_config_obs_impl<ConfigProxy>;
+#endif

diff --git a/src/common/config_obs.h b/src/common/config_obs.h
index 0cbbdb37397a79740e0cfd699a7c08cc15f2ca7c..20d12ad83343a2c57fd9ac48924a40bcd38cac47 100644 (file)
--- a/src/common/config_obs.h
+++ b/src/common/config_obs.h
@@ -44,4 +44,7 @@ public:
                                    const std::set<int>& changed) { }
 };
 }
+
+using md_config_obs_t = ceph::md_config_obs_impl<ConfigProxy>;
+
 #endif

diff --git a/src/common/config_proxy.h b/src/common/config_proxy.h
index d6f75b10b87f481bdf056291536f7e2199c9fa09..e9b6b39b6263ab39c3ba54b98e177c074e0a3837 100644 (file)
--- a/src/common/config_proxy.h
+++ b/src/common/config_proxy.h
@@ -4,7 +4,6 @@
 
 #include <type_traits>
 #include "common/config.h"
-#include "common/config_fwd.h"
 #include "common/config_obs.h"
 #include "common/config_obs_mgr.h"
 #include "common/Mutex.h"
@@ -17,6 +16,7 @@ class ConfigProxy {
    * The current values of all settings described by the schema
    */
   ConfigValues values;
+  using md_config_obs_t = ceph::md_config_obs_impl<ConfigProxy>;
   ObserverMgr<md_config_obs_t> obs_mgr;
   md_config_t config;
   /** A lock that protects the md_config_t internals. It is

diff --git a/src/common/config_values.h b/src/common/config_values.h
index b5f10b6cb47efa417f4e0f8a998d736d24772584..2614d2ef15978b28ca6a87d9516c4f1376cb5500 100644 (file)
--- a/src/common/config_values.h
+++ b/src/common/config_values.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <utility>
 
-#include "common/config_fwd.h"
 #include "common/entity_name.h"
 #include "common/options.h"
 #include "log/SubsystemMap.h"

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index 5b6e2702c502310426404a911d6f4638b4f9ebf0..0bde9f014ba380540df70a84f3a830976abe5f3e 100644 (file)
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -15,11 +15,15 @@
 #ifndef CEPH_MONMAP_H
 #define CEPH_MONMAP_H
 
-#include "include/err.h"
 
-#include "msg/Message.h"
+#include "common/config_fwd.h"
+
+#include "include/err.h"
 #include "include/types.h"
+
 #include "mon/mon_types.h"
+#include "msg/Message.h"
+
 
 namespace ceph {
   class Formatter;