test/librados: include io_context.hpp and rename io_service

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

diff --git a/src/test/librados/asio.cc b/src/test/librados/asio.cc
index 9f86b4472b5a0621a5d815dd5bb0ca008d8546b5..459ce6896a54001d907216ab66373afc6c9e1894 100644 (file)
--- a/src/test/librados/asio.cc
+++ b/src/test/librados/asio.cc
@@ -22,6 +22,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <spawn/spawn.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/use_future.hpp>
 
 #define dout_subsys ceph_subsys_rados
@@ -74,7 +75,7 @@ librados::IoCtx AsioRados::snapio;
 
 TEST_F(AsioRados, AsyncReadCallback)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   auto success_cb = [&] (boost::system::error_code ec, bufferlist bl) {
     EXPECT_FALSE(ec);
@@ -92,7 +93,7 @@ TEST_F(AsioRados, AsyncReadCallback)
 
 TEST_F(AsioRados, AsyncReadFuture)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   std::future<bufferlist> f1 = librados::async_read(service, io, "exist", 256,
                                                     0, boost::asio::use_future);
@@ -110,7 +111,7 @@ TEST_F(AsioRados, AsyncReadFuture)
 
 TEST_F(AsioRados, AsyncReadYield)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   auto success_cr = [&] (spawn::yield_context yield) {
     boost::system::error_code ec;
@@ -132,7 +133,7 @@ TEST_F(AsioRados, AsyncReadYield)
 
 TEST_F(AsioRados, AsyncWriteCallback)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   bufferlist bl;
   bl.append("hello");
@@ -154,7 +155,7 @@ TEST_F(AsioRados, AsyncWriteCallback)
 
 TEST_F(AsioRados, AsyncWriteFuture)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   bufferlist bl;
   bl.append("hello");
@@ -172,7 +173,7 @@ TEST_F(AsioRados, AsyncWriteFuture)
 
 TEST_F(AsioRados, AsyncWriteYield)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   bufferlist bl;
   bl.append("hello");
@@ -199,7 +200,7 @@ TEST_F(AsioRados, AsyncWriteYield)
 
 TEST_F(AsioRados, AsyncReadOperationCallback)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
   {
     librados::ObjectReadOperation op;
     op.read(0, 0, nullptr, nullptr);
@@ -222,7 +223,7 @@ TEST_F(AsioRados, AsyncReadOperationCallback)
 
 TEST_F(AsioRados, AsyncReadOperationFuture)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
   std::future<bufferlist> f1;
   {
     librados::ObjectReadOperation op;
@@ -248,7 +249,7 @@ TEST_F(AsioRados, AsyncReadOperationFuture)
 
 TEST_F(AsioRados, AsyncReadOperationYield)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   auto success_cr = [&] (spawn::yield_context yield) {
     librados::ObjectReadOperation op;
@@ -276,7 +277,7 @@ TEST_F(AsioRados, AsyncReadOperationYield)
 
 TEST_F(AsioRados, AsyncWriteOperationCallback)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   bufferlist bl;
   bl.append("hello");
@@ -302,7 +303,7 @@ TEST_F(AsioRados, AsyncWriteOperationCallback)
 
 TEST_F(AsioRados, AsyncWriteOperationFuture)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   bufferlist bl;
   bl.append("hello");
@@ -329,7 +330,7 @@ TEST_F(AsioRados, AsyncWriteOperationFuture)
 
 TEST_F(AsioRados, AsyncWriteOperationYield)
 {
-  boost::asio::io_service service;
+  boost::asio::io_context service;
 
   bufferlist bl;
   bl.append("hello");