Merge pull request ceph#61791 from MaxKellermann/common_includes

common: add missing includes

Reviewed-By: Adam Emerson <[email protected]>

Author: MaxKellermann

src/common/Finisher.h

@@ -16,7 +16,6 @@
 #define CEPH_FINISHER_H
 
 #include "include/Context.h"
-#include "include/common_fwd.h"
 #include "common/Thread.h"
 #include "common/ceph_mutex.h"
 #include "common/Cond.h"

src/common/Formatter.h

@@ -3,7 +3,6 @@
 #ifndef CEPH_FORMATTER_H
 #define CEPH_FORMATTER_H
 
-#include "include/int_types.h"
 #include "include/buffer_fwd.h"
 
 #include <deque>

src/common/PriorityCache.cc

@@ -15,6 +15,13 @@
 #include "PriorityCache.h"
 #include "common/dout.h"
 #include "perfglue/heap_profiler.h"
+
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
 #define dout_context cct
 #define dout_subsys ceph_subsys_prioritycache
 #undef dout_prefix

src/common/SloppyCRCMap.h

@@ -4,6 +4,8 @@
 #ifndef CEPH_COMMON_SLOPPYCRCMAP_H
 #define CEPH_COMMON_SLOPPYCRCMAP_H
 
+#include <map>
+
 #include "include/encoding.h"
 
 namespace ceph {

src/common/TrackedOp.h

@@ -16,11 +16,15 @@
 
 #include <atomic>
 #include "common/StackStringStream.h"
+#include "common/ceph_context.h"
 #include "common/ceph_mutex.h"
+#include "common/debug.h"
+#include "common/Formatter.h"
 #include "common/histogram.h"
 #include "common/perf_counters.h" // for class PerfCountersBuilder
 #include "common/Thread.h"
 #include "common/Clock.h"
+#include "common/zipkin_trace.h"
 #include "include/spinlock.h"
 #include "msg/Message.h"
 
@@ -30,6 +34,14 @@
 #include "common/perf_counters_collection.h"
 #endif
 
+#include <boost/intrusive/list.hpp>
+#include <boost/intrusive_ptr.hpp>
+
+#include <atomic>
+#include <list>
+#include <set>
+#include <vector>
+
 #define OPTRACKER_PREALLOC_EVENTS 20
 
 class TrackedOp;

src/common/ceph_time.h

@@ -20,9 +20,6 @@
 #include <string>
 #include <optional>
 #include <fmt/chrono.h>
-#if FMT_VERSION >= 90000
-#include <fmt/ostream.h>
-#endif
 #include <sys/time.h>
 
 #if defined(__APPLE__)

src/common/cmdparse.cc

@@ -13,12 +13,18 @@
  */
 
 #include "include/common_fwd.h"
+#include "common/BackTrace.h"
 #include "common/cmdparse.h"
 #include "common/Formatter.h"
 #include "common/debug.h"
 #include "common/strtol.h"
+#include "include/ceph_assert.h"	// boost clobbers this
+#include "include/types.h" // for operator<<(std::vector)
 #include "json_spirit/json_spirit.h"
 
+#include <ostream>
+#include <sstream>
+
 using std::is_same_v;
 using std::ostringstream;
 using std::string;

src/common/cmdparse.h

@@ -4,14 +4,15 @@
 #define CEPH_COMMON_CMDPARSE_H
 
 #include <vector>
-#include <stdexcept>
+#include <exception>
+#include <map>
+#include <string>
 #include <optional>
-#include <ostream>
+#include <iosfwd>
 #include <boost/variant.hpp>
-#include "include/ceph_assert.h"	// boost clobbers this
 #include "include/common_fwd.h"
-#include "common/Formatter.h"
-#include "common/BackTrace.h"
+
+namespace ceph { class Formatter; }
 
 typedef boost::variant<std::string,
 		       bool,

src/common/convenience.h

@@ -12,10 +12,7 @@
  *
  */
 
-#include <mutex>
-#include <memory>
 #include <optional>
-#include <shared_mutex>
 #include <type_traits>
 #include <utility>
 

src/common/fair_mutex.h

@@ -4,7 +4,10 @@
 
 #include "common/ceph_mutex.h"
 
-#include <thread>
+#ifdef CEPH_DEBUG_MUTEX
+#include <thread> // for std::this_thread::get_id()
+#endif
+
 #include <string>
 
 namespace ceph {