rgw: use granular asio includes

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/driver/rados/rgw_notify.cc b/src/rgw/driver/rados/rgw_notify.cc
index 46b3a2302cd4c39f410aa5dbf7154bd4587352b5..6e5eeeb2fabbf2535ffd23ebe65811c2be69d123 100644 (file)
--- a/src/rgw/driver/rados/rgw_notify.cc
+++ b/src/rgw/driver/rados/rgw_notify.cc
@@ -6,6 +6,9 @@
 #include "cls/lock/cls_lock_client.h"
 #include <memory>
 #include <boost/algorithm/hex.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/executor_work_guard.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/context/protected_fixedsize_stack.hpp>
 #include <spawn/spawn.hpp>
 #include "rgw_sal_rados.h"

diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
index e373e4b4cf77143b2e490c02d99f94331a251f7e..e7d39d7cece619e938612de3b76daae9ee183c81 100644 (file)
--- a/src/rgw/rgw_asio_frontend.cc
+++ b/src/rgw/rgw_asio_frontend.cc
@@ -6,7 +6,13 @@
 #include <thread>
 #include <vector>
 
-#include <boost/asio.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/ip/v6_only.hpp>
+#include <boost/asio/read.hpp>
+#include <boost/asio/write.hpp>
+
 #include <boost/intrusive/list.hpp>
 #include <boost/smart_ptr/intrusive_ref_counter.hpp>
 

diff --git a/src/rgw/rgw_coroutine.h b/src/rgw/rgw_coroutine.h
index eb3216640c6410255946650ffc7d799e015da7ee..9c0915a3b1e499f860c79af068bdb69bc012a860 100644 (file)
--- a/src/rgw/rgw_coroutine.h
+++ b/src/rgw/rgw_coroutine.h
@@ -8,7 +8,7 @@
 #pragma push_macro("_ASSERT_H")
 #endif
 
-#include <boost/asio.hpp>
+#include <boost/asio/coroutine.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 #ifdef NEED_ASSERT_H

diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h
index 7bde75870a5a2d8711d5f21439bfd4623b4650e0..f18318f302981b9ae70ecd2e8e8a09777c05bee9 100644 (file)
--- a/src/rgw/rgw_dmclock_async_scheduler.h
+++ b/src/rgw/rgw_dmclock_async_scheduler.h
@@ -16,7 +16,8 @@
 
 #include "common/async/completion.h"
 
-#include <boost/asio.hpp>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/io_context.hpp>
 #include "rgw_dmclock_scheduler.h"
 #include "rgw_dmclock_scheduler_ctx.h"
 

diff --git a/src/test/common/test_async_shared_mutex.cc b/src/test/common/test_async_shared_mutex.cc
index aed6e7b00ee009f41b4ae145810231dd6af061c2..ed3a55a70edc93ba572d8050f8980c6b3570f90d 100644 (file)
--- a/src/test/common/test_async_shared_mutex.cc
+++ b/src/test/common/test_async_shared_mutex.cc
@@ -13,7 +13,10 @@
  */
 
 #include "common/async/shared_mutex.h"
+#include <future>
 #include <optional>
+#include <boost/asio/bind_executor.hpp>
+#include <boost/asio/io_context.hpp>
 #include <gtest/gtest.h>
 
 namespace ceph::async {

diff --git a/src/test/rgw/bench_rgw_ratelimit.cc b/src/test/rgw/bench_rgw_ratelimit.cc
index 2bf7753ad3e64a2b9a75982c5295b6a9b8b43233..1ea8714f9df00f83e96ea55ebc7a650d3e3943bd 100644 (file)
--- a/src/test/rgw/bench_rgw_ratelimit.cc
+++ b/src/test/rgw/bench_rgw_ratelimit.cc
@@ -3,9 +3,10 @@
 #include "random"
 #include <cstdlib>
 #include <string>
-#include <boost/asio.hpp>
-#include <spawn/spawn.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/executor_work_guard.hpp>
 #include <boost/asio/steady_timer.hpp>
+#include <spawn/spawn.hpp>
 #include <chrono>
 #include <mutex>
 #include <unordered_map>

diff --git a/src/test/rgw/test_rgw_throttle.cc b/src/test/rgw/test_rgw_throttle.cc
index 72dae286cdd694ab8051a7cc772bc143737d5d34..5e18fc3c185464f3945e5ce962a02170c57efdca 100644 (file)
--- a/src/test/rgw/test_rgw_throttle.cc
+++ b/src/test/rgw/test_rgw_throttle.cc
@@ -16,6 +16,10 @@
 
 #include <optional>
 #include <thread>
+#include <boost/asio/basic_waitable_timer.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/executor_work_guard.hpp>
+#include <boost/asio/io_context.hpp>
 #include "include/scope_guard.h"
 
 #include <spawn/spawn.hpp>