This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 9a46e7d GEODE-8847: Change boost::asio name resolution to synchronous
(#726)
9a46e7d is described below
commit 9a46e7d89918c192c3edd5ff57dbfee078419883
Author: Alberto Gomez <[email protected]>
AuthorDate: Mon Jan 25 23:26:31 2021 +0100
GEODE-8847: Change boost::asio name resolution to synchronous (#726)
When creating a TCP connection and name resolution is needed, the
synchronous version of the boost::asio::ip::tcp::resolver class
is used instead of the asynchronous one.
The reason is that the asynchronous one does not offer any advantage
over the synchronous one because even if a timeout is set when
using the async one it is later required by the io_service to wait for the
thread launched by the asynchronous call to finish.
---
cppcache/src/TcpConn.cpp | 54 ++++++++++--------------------------------------
cppcache/src/TcpConn.hpp | 3 +--
2 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/cppcache/src/TcpConn.cpp b/cppcache/src/TcpConn.cpp
index 9bc71a9..e279870 100644
--- a/cppcache/src/TcpConn.cpp
+++ b/cppcache/src/TcpConn.cpp
@@ -113,16 +113,11 @@ TcpConn::TcpConn(const std::string ipaddr,
TcpConn::TcpConn(const std::string host, uint16_t port,
std::chrono::microseconds timeout, int32_t maxBuffSizePool)
: socket_{io_context_} {
- auto beforeResolvePoint = std::chrono::system_clock::now();
- auto results = resolve(host, port, timeout);
- auto elapsedTime = std::chrono::duration<double, std::micro>(
- std::chrono::system_clock::now() - beforeResolvePoint);
+ auto results = resolve(host, port);
// We must connect first so we have a valid file descriptor to set options
// on.
- auto connectTimeout = std::chrono::duration_cast<std::chrono::microseconds>(
- timeout - elapsedTime);
- connect(results, connectTimeout);
+ connect(results, timeout);
socket_.set_option(::boost::asio::ip::tcp::no_delay{true});
socket_.set_option(
@@ -206,7 +201,7 @@ size_t TcpConn::receive(char *buff, const size_t len,
boost::optional<boost::system::error_code> read_result;
std::size_t bytes_read = 0;
- auto beforeResolvePoint = std::chrono::system_clock::now();
+ auto beforeReadPoint = std::chrono::system_clock::now();
try {
prepareAsyncRead(buff, len, read_result, bytes_read);
@@ -228,7 +223,7 @@ size_t TcpConn::receive(char *buff, const size_t len,
if (bytes_read == 0) {
auto elapsedTime = std::chrono::duration<double, std::micro>(
- std::chrono::system_clock::now() - beforeResolvePoint);
+ std::chrono::system_clock::now() - beforeReadPoint);
if (elapsedTime < timeout) {
LOGDEBUG("Throwing an IO exception");
socket_.cancel();
@@ -338,44 +333,17 @@ void
TcpConn::connect(boost::asio::ip::tcp::resolver::results_type r,
}
boost::asio::ip::tcp::resolver::results_type TcpConn::resolve(
- const std::string host, uint16_t port, std::chrono::microseconds timeout) {
- boost::optional<boost::system::error_code> resolve_result;
+ const std::string host, uint16_t port) {
+ boost::system::error_code resolve_result;
boost::asio::ip::tcp::resolver::results_type results;
- try {
- boost::asio::ip::tcp::resolver resolver(io_context_);
- resolver.async_resolve(host, std::to_string(port),
- [&resolve_result, &results](
- const boost::system::error_code &ec,
- boost::asio::ip::tcp::resolver::results_type r)
{
- if (ec) {
- resolve_result = ec;
- } else {
- resolve_result = boost::system::error_code{};
- results = r;
- }
- });
-
- io_context_.restart();
- io_context_.run_for(timeout);
- } catch (...) {
- LOGDEBUG("Throwing an unexpected resolve exception");
- throw;
- }
+ boost::asio::ip::tcp::resolver resolver(io_context_);
+ results = resolver.resolve(host, std::to_string(port), resolve_result);
- if (resolve_result && *resolve_result) {
+ if (resolve_result) {
LOGDEBUG("Throwing a resolve exception: %s",
- resolve_result->message().c_str());
- throw boost::system::system_error{*resolve_result};
- }
-
- if (!resolve_result) {
- LOGDEBUG("Throwing a resolve timeout exception");
- socket_.cancel();
- // Get the abort
- io_context_.restart();
- io_context_.run();
- throw boost::system::system_error{boost::asio::error::operation_aborted};
+ resolve_result.message().c_str());
+ throw boost::system::system_error{resolve_result};
}
return results;
diff --git a/cppcache/src/TcpConn.hpp b/cppcache/src/TcpConn.hpp
index 9113dd4..028214f 100644
--- a/cppcache/src/TcpConn.hpp
+++ b/cppcache/src/TcpConn.hpp
@@ -43,8 +43,7 @@ class TcpConn : public Connector {
boost::asio::ip::tcp::socket socket_;
boost::asio::ip::tcp::resolver::results_type resolve(
- const std::string hostname, uint16_t port,
- std::chrono::microseconds timeout);
+ const std::string hostname, uint16_t port);
void connect(boost::asio::ip::tcp::resolver::results_type r,
std::chrono::microseconds connect_timeout);
