neorados: use granular includes instead of boost/asio.hpp

avoid the boost/asio.hpp convenience header, as it pulls in a dependency
on liburing

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

diff --git a/src/common/async/bind_handler.h b/src/common/async/bind_handler.h
index 516d8a5e8b41fc665af235b2014a910816c5ed6a..69128501a07f7d4cd01193d5501eb8765dbe07b1 100644 (file)
--- a/src/common/async/bind_handler.h
+++ b/src/common/async/bind_handler.h
@@ -16,7 +16,8 @@
 #define CEPH_ASYNC_BIND_HANDLER_H
 
 #include <tuple>
-#include <boost/asio.hpp>
+#include <boost/asio/associated_allocator.hpp>
+#include <boost/asio/associated_executor.hpp>
 
 namespace ceph::async {
 

diff --git a/src/common/async/completion.h b/src/common/async/completion.h
index 6af9109d547931e3a6636e652ebd086e4c44b83f..384c85f0fe380657568e4cc482c23510e55dd960 100644 (file)
--- a/src/common/async/completion.h
+++ b/src/common/async/completion.h
@@ -17,6 +17,8 @@
 
 #include <memory>
 
+#include <boost/asio/executor_work_guard.hpp>
+
 #include "bind_handler.h"
 #include "forward_handler.h"
 

diff --git a/src/common/async/forward_handler.h b/src/common/async/forward_handler.h
index ae88cc83f46478ed99eb8298ce8f4a6b21b3c075..1491ef6085d4fa6ace198fc3069481ae0c7de7a9 100644 (file)
--- a/src/common/async/forward_handler.h
+++ b/src/common/async/forward_handler.h
@@ -15,7 +15,8 @@
 #ifndef CEPH_ASYNC_FORWARD_HANDLER_H
 #define CEPH_ASYNC_FORWARD_HANDLER_H
 
-#include <boost/asio.hpp>
+#include <boost/asio/associated_allocator.hpp>
+#include <boost/asio/associated_executor.hpp>
 
 namespace ceph::async {
 

diff --git a/src/include/neorados/RADOS.hpp b/src/include/neorados/RADOS.hpp
index fa1ac92ae518f625b1a1bf84ca6a54431fc7c049..b4f48d12ffc1855395e872c240d4754f46d9d2aa 100644 (file)
--- a/src/include/neorados/RADOS.hpp
+++ b/src/include/neorados/RADOS.hpp
@@ -24,7 +24,8 @@
 #include <type_traits>
 #include <variant>
 
-#include <boost/asio.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/io_context.hpp>
 
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index c60268701970830c368fd32d323e910b04ec2972..909d964c6658ac0f79d23d64d9a95f194a8ee106 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <iterator>
 #include <random>
+
+#include <boost/asio/post.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/algorithm/copy.hpp>

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index b72bf1f65749f750efd0d4c06361d2a156f540e3..081893ae9c4a48546247068af8f489b9edd0c264 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -22,6 +22,10 @@
 #include <string>
 #include <vector>
 
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_context_strand.hpp>
+#include <boost/asio/steady_timer.hpp>
+
 #include "msg/Messenger.h"
 
 #include "MonMap.h"

diff --git a/src/neorados/RADOSImpl.h b/src/neorados/RADOSImpl.h
index d45ca948123ed34cf7152049b74ed5819529ac72..53853e37e96948be018319cd3e6fd7a6f459109c 100644 (file)
--- a/src/neorados/RADOSImpl.h
+++ b/src/neorados/RADOSImpl.h
@@ -18,7 +18,7 @@
 #include <memory>
 #include <string>
 
-#include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 #include "common/ceph_context.h"

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index d9d723dca747a861a49bb9b08630d8f6e995c22c..a0d9d0b32e767199824ebecd0d3a17d23510efb7 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -27,7 +27,11 @@
 #include <variant>
 
 #include <boost/container/small_vector.hpp>
-#include <boost/asio.hpp>
+#include <boost/asio/async_result.hpp>
+#include <boost/asio/defer.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_context_strand.hpp>
+#include <boost/asio/post.hpp>
 
 #include <fmt/format.h>
 

diff --git a/src/test/common/test_async_completion.cc b/src/test/common/test_async_completion.cc
index 4cf4394e1cc08ce0d62bc718c78e23c7e2debd54..6ea516d1058b890fa3f3d071e0530d249fd7a041 100644 (file)
--- a/src/test/common/test_async_completion.cc
+++ b/src/test/common/test_async_completion.cc
@@ -13,6 +13,8 @@
  */
 
 #include "common/async/completion.h"
+#include <boost/asio/error.hpp>
+#include <boost/asio/io_context.hpp>
 #include <optional>
 #include <boost/intrusive/list.hpp>
 #include <gtest/gtest.h>

diff --git a/src/test/common/test_blocked_completion.cc b/src/test/common/test_blocked_completion.cc
index 71e5784af7e4ac0c32b3b10943f3ad0659f058ce..9a694de79e2814a7405c93bb100c796a8e452119 100644 (file)
--- a/src/test/common/test_blocked_completion.cc
+++ b/src/test/common/test_blocked_completion.cc
@@ -13,7 +13,9 @@
  */
 
 
-#include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/post.hpp>
+#include <boost/asio/steady_timer.hpp>
 #include <boost/system/error_code.hpp>
 
 #include <gtest/gtest.h>

diff --git a/src/test/neorados/completions.cc b/src/test/neorados/completions.cc
index d9c0e087005efb72a9f0b9a80993b99683a2e2a7..b6286130bbea0d5b97f4527097b00c7aeb7e00c6 100644 (file)
--- a/src/test/neorados/completions.cc
+++ b/src/test/neorados/completions.cc
@@ -1,6 +1,4 @@
-#include <cassert>
-#include <boost/asio.hpp>
-#include <boost/system/system_error.hpp>
+#include <boost/asio/io_context.hpp>
 
 constexpr int max_completions = 10'000'000;
 int completed = 0;

diff --git a/src/test/neorados/start_stop.cc b/src/test/neorados/start_stop.cc
index 4ea0ae5644fb1238a03102066c1f51e35401fa7d..12ef9b5aa50b07a1023c6df373b4d17a8ac1b818 100644 (file)
--- a/src/test/neorados/start_stop.cc
+++ b/src/test/neorados/start_stop.cc
@@ -16,6 +16,8 @@
 #include <thread>
 #include <vector>
 
+#include <boost/asio/use_future.hpp>
+
 #include "include/neorados/RADOS.hpp"
 
 #include "common/async/context_pool.h"

diff --git a/src/tools/neorados.cc b/src/tools/neorados.cc
index 16eed9ba9ff7f240a68557556e4c316596192f6e..4c5f8475d394d9d37a86e3a57920a7e402ffabd8 100644 (file)
--- a/src/tools/neorados.cc
+++ b/src/tools/neorados.cc
@@ -23,7 +23,6 @@
 #include <tuple>
 #include <vector>
 
-#include <boost/asio.hpp>
 #include <boost/io/ios_state.hpp>
 #include <boost/program_options.hpp>
 #include <boost/system/system_error.hpp>