Skip to content

Commit 59aa8bb

Browse files
CarlosespicurEugenioCollado
Carlosespicur
and
EugenioCollado
authored
Bump to asio 1.34.2 (#5896) (#5907)
* Bump to asio 1.34.2 (#5896) * Refs #22970: Bump to asio 1.34 Signed-off-by: Carlosespicur <[email protected]> * Refs #22970: Update thirdparty module to 1.34.2 release Signed-off-by: Carlosespicur <[email protected]> * Refs #22970: Update versions.md Signed-off-by: Carlosespicur <[email protected]> * Refs #22970: Uncrustify Signed-off-by: Carlosespicur <[email protected]> * Refs #22970: Update Asio minimum version in CMakeLists Signed-off-by: Carlosespicur <[email protected]> --------- Signed-off-by: Carlosespicur <[email protected]> * Uncrustify Signed-off-by: Eugenio Collado <[email protected]> --------- Signed-off-by: Carlosespicur <[email protected]> Signed-off-by: Eugenio Collado <[email protected]> Co-authored-by: Eugenio Collado <[email protected]>
1 parent 9cf0594 commit 59aa8bb

27 files changed

+191
-203
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ if(NOT BUILD_SHARED_LIBS)
234234
set(FASTDDS_STATIC ON)
235235
endif()
236236

237-
eprosima_find_package(fastcdr REQUIRED)
238-
eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
237+
eprosima_find_package(fastcdr 2 REQUIRED)
238+
eprosima_find_thirdparty(Asio asio VERSION 1.13.0)
239239
eprosima_find_thirdparty(TinyXML2 tinyxml2)
240240

241241
find_package(foonathan_memory REQUIRED)

‎src/cpp/rtps/transport/TCPAcceptor.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ namespace rtps {
2424
using IPLocator = fastrtps::rtps::IPLocator;
2525

2626
TCPAcceptor::TCPAcceptor(
27-
asio::io_service& io_service,
27+
asio::io_context& io_context,
2828
TCPTransportInterface* parent,
2929
const Locator& locator)
30-
: acceptor_(io_service, parent->generate_endpoint(IPLocator::getPhysicalPort(locator)))
30+
: acceptor_(io_context, parent->generate_endpoint(IPLocator::getPhysicalPort(locator)))
3131
, locator_(locator)
32-
, io_service_(&io_service)
32+
, io_context_(&io_context)
3333
{
3434
locator_.port = acceptor_.local_endpoint().port();
3535
endpoint_ = asio::ip::tcp::endpoint(parent->generate_protocol(), IPLocator::getPhysicalPort(locator_));
3636
}
3737

3838
TCPAcceptor::TCPAcceptor(
39-
asio::io_service& io_service,
39+
asio::io_context& io_context,
4040
const std::string& iface,
4141
const Locator& locator)
42-
: acceptor_(io_service, asio::ip::tcp::endpoint(asio::ip::address::from_string(iface),
42+
: acceptor_(io_context, asio::ip::tcp::endpoint(asio::ip::make_address(iface),
4343
IPLocator::getPhysicalPort(locator)))
4444
, locator_(locator)
45-
, io_service_(&io_service)
45+
, io_context_(&io_context)
4646
{
4747
locator_.port = acceptor_.local_endpoint().port();
48-
endpoint_ = asio::ip::tcp::endpoint(asio::ip::address::from_string(iface),
48+
endpoint_ = asio::ip::tcp::endpoint(asio::ip::make_address(iface),
4949
IPLocator::getPhysicalPort(locator_));
5050
}
5151

‎src/cpp/rtps/transport/TCPAcceptor.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ class TCPAcceptor
3535
Locator locator_;
3636
asio::ip::tcp::endpoint endpoint_;
3737
std::vector<Locator> pending_out_locators_;
38-
asio::io_service* io_service_;
38+
asio::io_context* io_context_;
3939

4040
public:
4141

4242
TCPAcceptor(
43-
asio::io_service& io_service,
43+
asio::io_context& io_context,
4444
TCPTransportInterface* parent,
4545
const Locator& locator);
4646

4747
TCPAcceptor(
48-
asio::io_service& io_service,
48+
asio::io_context& io_context,
4949
const std::string& iface,
5050
const Locator& locator);
5151

‎src/cpp/rtps/transport/TCPAcceptorBasic.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ namespace rtps {
2424
using IPLocator = fastrtps::rtps::IPLocator;
2525

2626
TCPAcceptorBasic::TCPAcceptorBasic(
27-
asio::io_service& io_service,
27+
asio::io_context& io_context,
2828
TCPTransportInterface* parent,
2929
const Locator& locator)
30-
: TCPAcceptor(io_service, parent, locator)
31-
, socket_(*io_service_)
30+
: TCPAcceptor(io_context, parent, locator)
31+
, socket_(*io_context_)
3232
{
3333
endpoint_ = asio::ip::tcp::endpoint(parent->generate_protocol(), IPLocator::getPhysicalPort(locator_));
3434
}
3535

3636
TCPAcceptorBasic::TCPAcceptorBasic(
37-
asio::io_service& io_service,
37+
asio::io_context& io_context,
3838
const std::string& iface,
3939
const Locator& locator)
40-
: TCPAcceptor(io_service, iface, locator)
41-
, socket_(*io_service_)
40+
: TCPAcceptor(io_context, iface, locator)
41+
, socket_(*io_context_)
4242
{
43-
endpoint_ = asio::ip::tcp::endpoint(asio::ip::address::from_string(iface),
43+
endpoint_ = asio::ip::tcp::endpoint(asio::ip::make_address(iface),
4444
IPLocator::getPhysicalPort(locator_));
4545
}
4646

‎src/cpp/rtps/transport/TCPAcceptorBasic.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ class TCPAcceptorBasic : public TCPAcceptor
3131

3232
/**
3333
* Constructor
34-
* @param io_service Reference to the ASIO service.
34+
* @param io_context Reference to the ASIO context.
3535
* @param parent Pointer to the transport that is going to manage the acceptor.
3636
* @param locator Locator with the information about where to accept connections.
3737
*/
3838
TCPAcceptorBasic(
39-
asio::io_service& io_service,
39+
asio::io_context& io_context,
4040
TCPTransportInterface* parent,
4141
const Locator& locator);
4242

4343
/**
4444
* Constructor
45-
* @param io_service Reference to the ASIO service.
45+
* @param io_context Reference to the ASIO context.
4646
* @param iface Network interface to bind the socket
4747
* @param locator Locator with the information about where to accept connections.
4848
*/
4949
TCPAcceptorBasic(
50-
asio::io_service& io_service,
50+
asio::io_context& io_context,
5151
const std::string& iface,
5252
const Locator& locator);
5353

‎src/cpp/rtps/transport/TCPAcceptorSecure.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ using Log = fastdds::dds::Log;
2727
using namespace asio;
2828

2929
TCPAcceptorSecure::TCPAcceptorSecure(
30-
io_service& io_service,
30+
io_context& io_context,
3131
TCPTransportInterface* parent,
3232
const Locator_t& locator)
33-
: TCPAcceptor(io_service, parent, locator)
33+
: TCPAcceptor(io_context, parent, locator)
3434
{
3535
}
3636

3737
TCPAcceptorSecure::TCPAcceptorSecure(
38-
io_service& io_service,
38+
io_context& io_context,
3939
const std::string& iface,
4040
const Locator_t& locator)
41-
: TCPAcceptor(io_service, iface, locator)
41+
: TCPAcceptor(io_context, iface, locator)
4242
{
4343
}
4444

@@ -83,7 +83,7 @@ void TCPAcceptorSecure::accept(
8383
}
8484
});
8585
#else
86-
auto secure_socket = std::make_shared<asio::ssl::stream<asio::ip::tcp::socket>>(*io_service_, ssl_context);
86+
auto secure_socket = std::make_shared<asio::ssl::stream<asio::ip::tcp::socket>>(*io_context_, ssl_context);
8787

8888
acceptor_.async_accept(secure_socket->lowest_layer(),
8989
[locator, parent, secure_socket](const std::error_code& error)

‎src/cpp/rtps/transport/TCPAcceptorSecure.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ class TCPAcceptorSecure : public TCPAcceptor
3434

3535
/**
3636
* Constructor
37-
* @param io_service Reference to the ASIO service.
37+
* @param io_context Reference to the ASIO context.
3838
* @param parent Pointer to the transport that is going to manage the acceptor.
3939
* @param locator Locator with the information about where to accept connections.
4040
*/
4141
TCPAcceptorSecure(
42-
asio::io_service& io_service,
42+
asio::io_context& io_context,
4343
TCPTransportInterface* parent,
4444
const Locator& locator);
4545

4646
/**
4747
* Constructor
48-
* @param io_service Reference to the ASIO service.
48+
* @param io_context Reference to the ASIO context.
4949
* @param iface Network interface to bind the socket
5050
* @param locator Locator with the information about where to accept connections.
5151
*/
5252
TCPAcceptorSecure(
53-
asio::io_service& io_service,
53+
asio::io_context& io_context,
5454
const std::string& iface,
5555
const Locator& locator);
5656

‎src/cpp/rtps/transport/TCPChannelResourceBasic.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ using Log = fastdds::dds::Log;
3333

3434
TCPChannelResourceBasic::TCPChannelResourceBasic(
3535
TCPTransportInterface* parent,
36-
asio::io_service& service,
36+
asio::io_context& context,
3737
const Locator& locator,
3838
uint32_t maxMsgSize)
3939
: TCPChannelResource(parent, locator, maxMsgSize)
40-
, service_(service)
40+
, context_(context)
4141
{
4242
}
4343

4444
TCPChannelResourceBasic::TCPChannelResourceBasic(
4545
TCPTransportInterface* parent,
46-
asio::io_service& service,
46+
asio::io_context& context,
4747
std::shared_ptr<asio::ip::tcp::socket> socket,
4848
uint32_t maxMsgSize)
4949
: TCPChannelResource(parent, maxMsgSize)
50-
, service_(service)
50+
, context_(context)
5151
, socket_(socket)
5252
{
5353
}
@@ -66,14 +66,14 @@ void TCPChannelResourceBasic::connect(
6666
{
6767
try
6868
{
69-
ip::tcp::resolver resolver(service_);
69+
ip::tcp::resolver resolver(context_);
7070

71-
auto endpoints = resolver.resolve({
72-
IPLocator::hasWan(locator_) ? IPLocator::toWanstring(locator_) : IPLocator::ip_to_string(
73-
locator_),
74-
std::to_string(IPLocator::getPhysicalPort(locator_))});
71+
auto endpoints = resolver.resolve(
72+
IPLocator::hasWan(locator_) ? IPLocator::toWanstring(locator_) : IPLocator::ip_to_string(
73+
locator_),
74+
std::to_string(IPLocator::getPhysicalPort(locator_)));
7575

76-
socket_ = std::make_shared<asio::ip::tcp::socket>(service_);
76+
socket_ = std::make_shared<asio::ip::tcp::socket>(context_);
7777
std::weak_ptr<TCPChannelResource> channel_weak_ptr = myself;
7878

7979
asio::async_connect(
@@ -111,7 +111,7 @@ void TCPChannelResourceBasic::disconnect()
111111
std::error_code ec;
112112
socket->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
113113

114-
service_.post([&, socket]()
114+
asio::post(context_, [&, socket]()
115115
{
116116
try
117117
{

‎src/cpp/rtps/transport/TCPChannelResourceBasic.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace rtps {
2525

2626
class TCPChannelResourceBasic : public TCPChannelResource
2727
{
28-
asio::io_service& service_;
28+
asio::io_context& context_;
2929

3030
std::mutex send_mutex_;
3131
std::shared_ptr<asio::ip::tcp::socket> socket_;
@@ -35,14 +35,14 @@ class TCPChannelResourceBasic : public TCPChannelResource
3535
// Constructor called when trying to connect to a remote server
3636
TCPChannelResourceBasic(
3737
TCPTransportInterface* parent,
38-
asio::io_service& service,
38+
asio::io_context& context,
3939
const Locator& locator,
4040
uint32_t maxMsgSize);
4141

4242
// Constructor called when local server accepted connection
4343
TCPChannelResourceBasic(
4444
TCPTransportInterface* parent,
45-
asio::io_service& service,
45+
asio::io_context& context,
4646
std::shared_ptr<asio::ip::tcp::socket> socket,
4747
uint32_t maxMsgSize);
4848

‎src/cpp/rtps/transport/TCPChannelResourceSecure.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,29 @@ using namespace asio;
3434

3535
TCPChannelResourceSecure::TCPChannelResourceSecure(
3636
TCPTransportInterface* parent,
37-
asio::io_service& service,
37+
asio::io_context& context,
3838
asio::ssl::context& ssl_context,
3939
const Locator_t& locator,
4040
uint32_t maxMsgSize)
4141
: TCPChannelResource(parent, locator, maxMsgSize)
42-
, service_(service)
42+
, context_(context)
4343
, ssl_context_(ssl_context)
44-
, strand_read_(service)
45-
, strand_write_(service)
44+
, strand_read_(make_strand(context))
45+
, strand_write_(make_strand(context))
4646
{
4747
}
4848

4949
TCPChannelResourceSecure::TCPChannelResourceSecure(
5050
TCPTransportInterface* parent,
51-
asio::io_service& service,
51+
asio::io_context& context,
5252
asio::ssl::context& ssl_context,
5353
std::shared_ptr<asio::ssl::stream<asio::ip::tcp::socket>> socket,
5454
uint32_t maxMsgSize)
5555
: TCPChannelResource(parent, maxMsgSize)
56-
, service_(service)
56+
, context_(context)
5757
, ssl_context_(ssl_context)
58-
, strand_read_(service)
59-
, strand_write_(service)
58+
, strand_read_(make_strand(context))
59+
, strand_write_(make_strand(context))
6060
, secure_socket_(socket)
6161
{
6262
set_tls_verify_mode(parent->configuration());
@@ -79,15 +79,15 @@ void TCPChannelResourceSecure::connect(
7979
{
8080
try
8181
{
82-
ip::tcp::resolver resolver(service_);
82+
ip::tcp::resolver resolver(context_);
8383

84-
auto endpoints = resolver.resolve({
85-
IPLocator::hasWan(locator_) ? IPLocator::toWanstring(locator_) : IPLocator::ip_to_string(
86-
locator_),
87-
std::to_string(IPLocator::getPhysicalPort(locator_))});
84+
auto endpoints = resolver.resolve(
85+
IPLocator::hasWan(locator_) ? IPLocator::toWanstring(locator_) : IPLocator::ip_to_string(
86+
locator_),
87+
std::to_string(IPLocator::getPhysicalPort(locator_)));
8888

8989
TCPTransportInterface* parent = parent_;
90-
secure_socket_ = std::make_shared<asio::ssl::stream<asio::ip::tcp::socket>>(service_, ssl_context_);
90+
secure_socket_ = std::make_shared<asio::ssl::stream<asio::ip::tcp::socket>>(context_, ssl_context_);
9191
set_tls_verify_mode(parent->configuration());
9292
set_tls_sni(parent->configuration());
9393
std::weak_ptr<TCPChannelResource> channel_weak_ptr = myself;
@@ -145,7 +145,7 @@ void TCPChannelResourceSecure::disconnect()
145145
{
146146
auto socket = secure_socket_;
147147

148-
service_.post([&, socket]()
148+
post(context_, [&, socket]()
149149
{
150150
std::error_code ec;
151151
socket->lowest_layer().close(ec);
@@ -169,7 +169,7 @@ uint32_t TCPChannelResourceSecure::read(
169169
auto bytes_future = read_bytes_promise.get_future();
170170
auto socket = secure_socket_;
171171

172-
strand_read_.post([&, socket]()
172+
asio::post(strand_read_, [&, socket]()
173173
{
174174
if (socket->lowest_layer().is_open())
175175
{
@@ -229,7 +229,7 @@ size_t TCPChannelResourceSecure::send(
229229
auto bytes_future = write_bytes_promise.get_future();
230230
auto socket = secure_socket_;
231231

232-
strand_write_.post([&, socket]()
232+
asio::post(strand_write_, [&, socket]()
233233
{
234234
if (socket->lowest_layer().is_open())
235235
{

0 commit comments

Comments
 (0)