Merge pull request ceph#61001 from MaxKellermann/common_includes

common: add missing includes

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

Author: idryomov

src/common/EventTrace.cc

@@ -19,6 +19,8 @@
 #include "common/TracepointProvider.h"
 #include "messages/MOSDOpReply.h"
 
+#include <sstream>
+
 #ifdef WITH_LTTNG
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE

src/common/Finisher.cc

@@ -3,6 +3,13 @@
 
 #include "Finisher.h"
 #include "common/perf_counters.h"
+#include "include/types.h" // for operator<<(std::vector)
+
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
 
 #include <fmt/core.h>
 

src/common/Finisher.h

@@ -20,6 +20,7 @@
 #include "common/Thread.h"
 #include "common/ceph_mutex.h"
 #include "common/Cond.h"
+#include "common/perf_counters.h" // for class PerfCounters
 
 /// Finisher queue length performance counter ID.
 enum {

src/common/Graylog.h

@@ -11,6 +11,8 @@
 
 #include "include/ceph_assert.h"  // boost clobbers this
 
+#include <sstream>
+
 struct uuid_d;
 class LogEntry;
 

src/common/LogClient.cc

@@ -20,6 +20,8 @@
 #include "mon/MonMap.h"
 #include "common/Graylog.h"
 
+#include <sstream>
+
 #define dout_subsys ceph_subsys_monc
 
 using std::map;

src/common/LogClient.h

@@ -16,6 +16,10 @@
 #define CEPH_LOGCLIENT_H
 
 #include <atomic>
+#include <deque>
+#include <map>
+#include <string>
+
 #include "common/LogEntry.h"
 #include "common/ceph_mutex.h"
 #include "common/ostream_temp.h"

src/common/LogEntry.h

@@ -17,6 +17,8 @@
 
 #include <fmt/format.h>
 
+#include "include/types.h" // for version_t
+#include "include/unordered_set.h"
 #include "include/utime.h"
 #include "include/utime_fmt.h"
 #include "msg/msg_fmt.h"
@@ -25,6 +27,12 @@
 #include "ostream_temp.h"
 #include "LRUSet.h"
 
+#include <cstdint>
+#include <iostream>
+#include <list>
+#include <map>
+#include <string>
+
 namespace ceph {
   class Formatter;
 }

src/common/OutputDataSocket.cc

@@ -12,11 +12,12 @@
  * 
  */
 
+#include "common/OutputDataSocket.h"
+
 #include <poll.h>
 #include <sys/un.h>
 #include <unistd.h>
 
-#include "common/OutputDataSocket.h"
 #include "common/errno.h"
 #include "common/debug.h"
 #include "common/safe_io.h"
@@ -26,6 +27,8 @@
 // re-include our assert to clobber the system one; fix dout:
 #include "include/ceph_assert.h"
 
+#include <sstream>
+
 #define dout_subsys ceph_subsys_asok
 #undef dout_prefix
 #define dout_prefix *_dout << "asok(" << (void*)m_cct << ") "

src/common/OutputDataSocket.h

@@ -20,6 +20,8 @@
 #include "include/common_fwd.h"
 #include "include/buffer.h"
 
+#include <string>
+#include <vector>
 
 class OutputDataSocket : public Thread
 {

src/common/Throttle.cc

@@ -1,9 +1,10 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "common/Throttle.h"
+
 #include "include/scope_guard.h"
 
-#include "common/Throttle.h"
 #include "common/ceph_time.h"
 #include "common/perf_counters.h"
 

src/common/Throttle.h

@@ -6,6 +6,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <condition_variable>
 #include <iosfwd>
 #include <list>
 #include <map>
@@ -14,7 +15,6 @@
 #include "include/Context.h"
 #include "common/ThrottleInterface.h"
 #include "common/Timer.h"
-#include "common/convenience.h"
 #if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
 #include "crimson/common/perf_counters_collection.h"
 #else

src/common/TrackedOp.cc

@@ -12,6 +12,9 @@
 
 #include "TrackedOp.h"
 
+#include <shared_mutex> // for std::shared_lock
+#include <sstream>
+
 #define dout_context cct
 #define dout_subsys ceph_subsys_optracker
 #undef dout_prefix

src/common/TrackedOp.h

@@ -18,11 +18,18 @@
 #include "common/StackStringStream.h"
 #include "common/ceph_mutex.h"
 #include "common/histogram.h"
+#include "common/perf_counters.h" // for class PerfCountersBuilder
 #include "common/Thread.h"
 #include "common/Clock.h"
 #include "include/spinlock.h"
 #include "msg/Message.h"
 
+#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
 #define OPTRACKER_PREALLOC_EVENTS 20
 
 class TrackedOp;

src/common/WorkQueue.cc

@@ -16,6 +16,8 @@
 #include "include/compat.h"
 #include "common/errno.h"
 
+#include <sstream>
+
 #define dout_subsys ceph_subsys_tp
 #undef dout_prefix
 #define dout_prefix *_dout << name << " "

src/common/admin_finisher.h

@@ -16,6 +16,6 @@
 #include <functional>
 #include <string_view>
 
-#include "include/buffer.h"
+#include "include/buffer_fwd.h"
 
 typedef std::function<void(int,std::string_view,ceph::buffer::list&)> asok_finisher;

src/common/admin_socket.cc

@@ -11,6 +11,9 @@
  * Foundation.  See file COPYING.
  *
  */
+
+#include "common/admin_socket.h"
+
 #include <poll.h>
 #include <signal.h>
 #include <sys/un.h>
@@ -19,11 +22,11 @@
 #include <sys/wait.h>
 #endif
 
+#include <iomanip>
 #include <optional>
 
 #include <stdlib.h>
 
-#include "common/admin_socket.h"
 #include "common/admin_socket_client.h"
 #include "common/dout.h"
 #include "common/errno.h"
@@ -47,6 +50,10 @@
 #include "include/sock_compat.h"
 #include "fmt/format.h"
 
+#ifdef _WIN32
+#include "include/util.h" // for get_windows_version()
+#endif
+
 #define dout_subsys ceph_subsys_asok
 #undef dout_prefix
 #define dout_prefix *_dout << "asok(" << (void*)m_cct << ") "

src/common/admin_socket.h

@@ -20,7 +20,9 @@
 #else
 
 #include <condition_variable>
+#include <list>
 #include <mutex>
+#include <sstream>
 #include <string>
 #include <string_view>
 #include <thread>
@@ -31,6 +33,10 @@
 #include "common/ref.h"
 #include "common/cmdparse.h"
 
+#ifdef WIN32
+#include "include/win32/fs_compat.h" // for uid_t, gid_t
+#endif
+
 class MCommand;
 class MMonCommand;
 

src/common/admin_socket_client.cc

@@ -12,6 +12,8 @@
  *
  */
 
+#include "common/admin_socket_client.h"
+
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -21,11 +23,12 @@
 #include "common/admin_socket.h"
 #include "common/errno.h"
 #include "common/safe_io.h"
-#include "common/admin_socket_client.h"
 
 #include "include/compat.h"
 #include "include/sock_compat.h"
 
+#include <sstream>
+
 using std::ostringstream;
 
 const char* get_rand_socket_path()

src/common/assert.cc

@@ -12,8 +12,17 @@
  *
  */
 
+#include "include/ceph_assert.h"
+
+#include <sstream>
+
 #include "include/compat.h"
+#include "common/BackTrace.h"
+#include "common/Clock.h" // for ceph_clock_now()
 #include "common/debug.h"
+#include "log/Log.h"
+
+#include <stdarg.h>
 
 using std::ostringstream;
 

src/common/bit_str.cc

@@ -15,6 +15,8 @@
 #include "common/Formatter.h"
 #include "include/ceph_assert.h"
 
+#include <iostream>
+
 static void _dump_bit_str(
     uint64_t bits,
     std::ostream *out,

src/common/buffer.cc

@@ -19,7 +19,9 @@
 
 #include <sys/uio.h>
 
+#include <iomanip> // for std::setw()
 #include <iostream>
+#include <sstream>
 
 #include "include/ceph_assert.h"
 #include "include/types.h"

src/common/ceph_argparse.cc

@@ -11,15 +11,18 @@
  * Foundation.  See file COPYING.
  *
  */
+#include "common/ceph_argparse.h"
+
 #include <stdarg.h>
 
 #include "auth/Auth.h"
-#include "common/ceph_argparse.h"
 #include "common/config.h"
 #include "common/strtol.h" // for strict_strtof()
 #include "common/version.h"
 #include "include/str_list.h"
 
+#include <sstream>
+
 /*
  * Ceph argument parsing library
  *

src/common/ceph_argparse.h

@@ -23,11 +23,13 @@
  * stuff to live.
  */
 
+#include <iosfwd>
 #include <string>
 #include <vector>
 
 #include "common/entity_name.h"
 #include "include/encoding.h"
+#include "msg/msg_types.h" // for struct entity_addr_t
 
 class entity_addrvec_t;
 

src/common/ceph_json.h

@@ -1,11 +1,16 @@
 #ifndef CEPH_JSON_H
 #define CEPH_JSON_H
 
+#include <deque>
+#include <map>
+#include <set>
 #include <stdexcept>
+#include <string>
 #include <typeindex>
 #include <include/types.h>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <boost/optional.hpp>
 #include <include/ceph_fs.h>
 #include "common/ceph_time.h"
 

src/common/ceph_time.cc

@@ -22,6 +22,9 @@
 #include "config.h"
 #include "strtol.h"
 
+#include <iomanip> // for std::setw()
+#include <sstream>
+
 #if defined(__APPLE__)
 #include <mach/mach.h>
 #include <mach/mach_time.h>

src/common/common_init.cc

@@ -12,7 +12,6 @@
  *
  */
 
-#include "include/compat.h"
 #include "common/common_init.h"
 #include "common/admin_socket.h"
 #include "common/ceph_argparse.h"
@@ -23,6 +22,8 @@
 #include "common/strtol.h"
 #include "common/valgrind.h"
 #include "common/zipkin_trace.h"
+#include "include/compat.h"
+#include "log/Log.h"
 
 #define dout_subsys ceph_subsys_
 

src/common/common_init.h

@@ -15,11 +15,11 @@
 #ifndef CEPH_COMMON_INIT_H
 #define CEPH_COMMON_INIT_H
 
-#include <deque>
-
 #include "include/common_fwd.h"
 #include "common/code_environment.h"
 
+#include <string>
+
 enum common_init_flags_t {
   // Set up defaults that make sense for an unprivileged daemon
   CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS = 0x1,