From d7326f0d59f90f5df9698fd9730cf67524456e8a Mon Sep 17 00:00:00 2001 From: jadamcrain Date: Mon, 20 May 2019 14:09:08 -0700 Subject: [PATCH] upgrade default ASIO version to 1-12-2 and migrate to new names for io_context (previously io_service) and asio::io_context::string (previously asio::strand) --- cpp/libs/include/asiopal/Executor.h | 2 +- cpp/libs/include/asiopal/IO.h | 4 ++-- cpp/libs/include/asiopal/SerialChannel.h | 2 +- cpp/libs/include/asiopal/ThreadPool.h | 2 +- cpp/libs/include/asiopal/Timer.h | 2 +- cpp/libs/src/asiopal/Executor.cpp | 2 +- cpp/libs/src/asiopal/SerialChannel.cpp | 2 +- cpp/libs/src/asiopal/TCPClient.cpp | 4 ++-- cpp/libs/src/asiopal/TCPServer.cpp | 4 ++-- cpp/libs/src/asiopal/Timer.cpp | 2 +- cpp/tests/asiopal/src/TestASIO.cpp | 2 +- cpp/tests/asiopal/src/mocks/MockIO.cpp | 2 +- cpp/tests/asiopal/src/mocks/MockIO.h | 2 +- deps/asio | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cpp/libs/include/asiopal/Executor.h b/cpp/libs/include/asiopal/Executor.h index 39f01dbcea..262c96e91d 100644 --- a/cpp/libs/include/asiopal/Executor.h +++ b/cpp/libs/include/asiopal/Executor.h @@ -81,7 +81,7 @@ class Executor final : return Create(this->io); } - asio::strand strand; + asio::io_context::strand strand; private: diff --git a/cpp/libs/include/asiopal/IO.h b/cpp/libs/include/asiopal/IO.h index e5eafaa313..19bec6a45b 100644 --- a/cpp/libs/include/asiopal/IO.h +++ b/cpp/libs/include/asiopal/IO.h @@ -27,7 +27,7 @@ namespace asiopal { /** -* Container class for an asio::io_service +* Container class for an asio::io_context */ class IO { @@ -36,7 +36,7 @@ class IO virtual ~IO() {} - asio::io_service service; + asio::io_context service; }; diff --git a/cpp/libs/include/asiopal/SerialChannel.h b/cpp/libs/include/asiopal/SerialChannel.h index d01b1f4dbf..7ea6b28222 100644 --- a/cpp/libs/include/asiopal/SerialChannel.h +++ b/cpp/libs/include/asiopal/SerialChannel.h @@ -50,7 +50,7 @@ class SerialChannel final : public IAsyncChannel virtual void BeginWriteImpl(const openpal::RSlice& buffer) override; virtual void ShutdownImpl() override; - asio::basic_serial_port<> port; + asio::serial_port port; }; diff --git a/cpp/libs/include/asiopal/ThreadPool.h b/cpp/libs/include/asiopal/ThreadPool.h index e18e1ece76..85d17a7c78 100644 --- a/cpp/libs/include/asiopal/ThreadPool.h +++ b/cpp/libs/include/asiopal/ThreadPool.h @@ -34,7 +34,7 @@ namespace asiopal { /** -* A thread pool that calls asio::io_service::run +* A thread pool that calls asio::io_context::run */ class ThreadPool { diff --git a/cpp/libs/include/asiopal/Timer.h b/cpp/libs/include/asiopal/Timer.h index 3f47aab7fc..3a248ad329 100644 --- a/cpp/libs/include/asiopal/Timer.h +++ b/cpp/libs/include/asiopal/Timer.h @@ -43,7 +43,7 @@ class Timer final : public openpal::ITimer, private openpal::Uncopyable public: - Timer(asio::io_service& service); + Timer(asio::io_context& service); virtual void Cancel() override; diff --git a/cpp/libs/src/asiopal/Executor.cpp b/cpp/libs/src/asiopal/Executor.cpp index 6c3b70f945..7d99239b9f 100644 --- a/cpp/libs/src/asiopal/Executor.cpp +++ b/cpp/libs/src/asiopal/Executor.cpp @@ -59,7 +59,7 @@ ITimer* Executor::Start(const MonotonicTimestamp& time, const action_t& runnable openpal::ITimer* Executor::Start(const steady_clock_t::time_point& expiration, const openpal::action_t& runnable) { - auto timer = std::make_shared(this->strand.get_io_service()); + auto timer = std::make_shared(this->strand.get_io_context()); timer->timer.expires_at(expiration); diff --git a/cpp/libs/src/asiopal/SerialChannel.cpp b/cpp/libs/src/asiopal/SerialChannel.cpp index 338a2fdf75..b954fbed78 100644 --- a/cpp/libs/src/asiopal/SerialChannel.cpp +++ b/cpp/libs/src/asiopal/SerialChannel.cpp @@ -31,7 +31,7 @@ namespace asiopal { -SerialChannel::SerialChannel(std::shared_ptr executor) : IAsyncChannel(executor), port(executor->strand.get_io_service()) +SerialChannel::SerialChannel(std::shared_ptr executor) : IAsyncChannel(executor), port(executor->strand.get_io_context()) {} bool SerialChannel::Open(const SerialSettings& settings, std::error_code& ec) diff --git a/cpp/libs/src/asiopal/TCPClient.cpp b/cpp/libs/src/asiopal/TCPClient.cpp index b399e71012..4ec3767574 100644 --- a/cpp/libs/src/asiopal/TCPClient.cpp +++ b/cpp/libs/src/asiopal/TCPClient.cpp @@ -34,9 +34,9 @@ TCPClient::TCPClient( condition(logger), executor(executor), adapter(adapter), - socket(executor->strand.get_io_service()), + socket(executor->strand.get_io_context()), localEndpoint(), - resolver(executor->strand.get_io_service()) + resolver(executor->strand.get_io_context()) {} diff --git a/cpp/libs/src/asiopal/TCPServer.cpp b/cpp/libs/src/asiopal/TCPServer.cpp index 08548bd3fe..0864ef2b0c 100644 --- a/cpp/libs/src/asiopal/TCPServer.cpp +++ b/cpp/libs/src/asiopal/TCPServer.cpp @@ -41,8 +41,8 @@ TCPServer::TCPServer( logger(logger), executor(executor), endpoint(ip::tcp::v4(), endpoint.port), - acceptor(executor->strand.get_io_service()), - socket(executor->strand.get_io_service()) + acceptor(executor->strand.get_io_context()), + socket(executor->strand.get_io_context()) { this->Configure(endpoint.address, ec); } diff --git a/cpp/libs/src/asiopal/Timer.cpp b/cpp/libs/src/asiopal/Timer.cpp index 6e9df7eb9d..82702d0622 100644 --- a/cpp/libs/src/asiopal/Timer.cpp +++ b/cpp/libs/src/asiopal/Timer.cpp @@ -39,7 +39,7 @@ MonotonicTimestamp Timer::ExpiresAt() return MonotonicTimestamp(millisec); } -Timer::Timer(asio::io_service& service) : timer(service) +Timer::Timer(asio::io_context& service) : timer(service) {} } diff --git a/cpp/tests/asiopal/src/TestASIO.cpp b/cpp/tests/asiopal/src/TestASIO.cpp index cc385af795..86b11228e7 100644 --- a/cpp/tests/asiopal/src/TestASIO.cpp +++ b/cpp/tests/asiopal/src/TestASIO.cpp @@ -49,7 +49,7 @@ TEST_CASE(SUITE("TimerCancel")) { bool flag = false; - io_service io; + io_context io; steady_timer t1(io, std::chrono::seconds(0)); steady_timer t2(io, std::chrono::seconds(1)); diff --git a/cpp/tests/asiopal/src/mocks/MockIO.cpp b/cpp/tests/asiopal/src/mocks/MockIO.cpp index bfc3814a64..5edafa143f 100644 --- a/cpp/tests/asiopal/src/mocks/MockIO.cpp +++ b/cpp/tests/asiopal/src/mocks/MockIO.cpp @@ -26,7 +26,7 @@ namespace asiopal { -MockIO::Timeout::Timeout(asio::io_service& service, std::chrono::steady_clock::duration timeout) : +MockIO::Timeout::Timeout(asio::io_context& service, std::chrono::steady_clock::duration timeout) : timer(std::make_shared>(service, timeout)) { auto callback = [t = timer](const std::error_code & ec) diff --git a/cpp/tests/asiopal/src/mocks/MockIO.h b/cpp/tests/asiopal/src/mocks/MockIO.h index 9cc5c0036e..c2128ab9c6 100644 --- a/cpp/tests/asiopal/src/mocks/MockIO.h +++ b/cpp/tests/asiopal/src/mocks/MockIO.h @@ -36,7 +36,7 @@ class MockIO final : public IO, public std::enable_shared_from_this public: - Timeout(asio::io_service& service, std::chrono::steady_clock::duration timeout); + Timeout(asio::io_context& service, std::chrono::steady_clock::duration timeout); ~Timeout(); diff --git a/deps/asio b/deps/asio index 28d9b8d6df..22afb86087 160000 --- a/deps/asio +++ b/deps/asio @@ -1 +1 @@ -Subproject commit 28d9b8d6df708024af5227c551673fdb2519f5bf +Subproject commit 22afb86087a77037cd296d27134756c9b0d2cb75