From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 26 Apr 2023 14:29:13 +0000 (-0400)
Subject: neorados: use granular includes instead of boost/asio.hpp
X-Git-Tag: v19.0.0~216^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49998361f9a3117559f78b7a66ec299c8568542d;p=ceph.git

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 516d8a5e8b41..69128501a07f 100644
--- 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 6af9109d5479..384c85f0fe38 100644
--- 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 ae88cc83f464..1491ef6085d4 100644
--- 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 fa1ac92ae518..b4f48d12ffc1 100644
--- 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 c60268701970..909d964c6658 100644
--- 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 b72bf1f65749..081893ae9c4a 100644
--- 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 d45ca948123e..53853e37e969 100644
--- 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 d9d723dca747..a0d9d0b32e76 100644
--- 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 4cf4394e1cc0..6ea516d1058b 100644
--- 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 71e5784af7e4..9a694de79e28 100644
--- 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 d9c0e087005e..b6286130bbea 100644
--- 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 4ea0ae5644fb..12ef9b5aa50b 100644
--- 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 16eed9ba9ff7..4c5f8475d394 100644
--- 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>