mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-29 02:14:51 +00:00
Code Issues Releases Wiki Activity

Replace boost::asio::io_service (deprecated since Boost 1.66) by boost::asio::io_context

Browse Source
This commit is contained in:
Carles Fernandez 2019-05-08 15:23:55 +02:00
parent 64968fc5f4
commit 40f0a93695
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
View File

@ -35,7 +35,7 @@
#include <sstream> #include <sstream>
Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port, bool protobuf_enabled) : socket{io_service} Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port, bool protobuf_enabled) : socket{io_context}
{ {
for (const auto& address : addresses) for (const auto& address : addresses)
{ {

2
src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
View File

@ -43,7 +43,7 @@ public:
bool write_monitor_pvt(const Monitor_Pvt &monitor_pvt); bool write_monitor_pvt(const Monitor_Pvt &monitor_pvt);
private: private:
boost::asio::io_service io_service; boost::asio::io_context io_context;
boost::asio::ip::udp::socket socket; boost::asio::ip::udp::socket socket;
boost::system::error_code error; boost::system::error_code error;
std::vector<boost::asio::ip::udp::endpoint> endpoints; std::vector<boost::asio::ip::udp::endpoint> endpoints;

10
src/algorithms/PVT/libs/rtcm.h
View File

@ -757,7 +757,7 @@ private:
: public std::enable_shared_from_this<Tcp_Internal_Client> : public std::enable_shared_from_this<Tcp_Internal_Client>
{ {
public: public:
Tcp_Internal_Client(boost::asio::io_service& io_context, Tcp_Internal_Client(boost::asio::io_context& io_context,
boost::asio::ip::tcp::resolver::iterator endpoint_iterator) boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
: io_context_(io_context), socket_(io_context) : io_context_(io_context), socket_(io_context)
{ {
@ -835,7 +835,7 @@ private:
}); });
} }
boost::asio::io_service& io_context_; boost::asio::io_context& io_context_;
boost::asio::ip::tcp::socket socket_; boost::asio::ip::tcp::socket socket_;
Rtcm_Message read_msg_; Rtcm_Message read_msg_;
std::deque<Rtcm_Message> write_msgs_; std::deque<Rtcm_Message> write_msgs_;
@ -845,7 +845,7 @@ private:
class Queue_Reader class Queue_Reader
{ {
public: public:
Queue_Reader(boost::asio::io_service& io_context, std::shared_ptr<Concurrent_Queue<std::string> >& queue, int32_t port) : queue_(queue) Queue_Reader(boost::asio::io_context& io_context, std::shared_ptr<Concurrent_Queue<std::string> >& queue, int32_t port) : queue_(queue)
{ {
boost::asio::ip::tcp::resolver resolver(io_context); boost::asio::ip::tcp::resolver resolver(io_context);
std::string host("localhost"); std::string host("localhost");
@ -883,7 +883,7 @@ private:
class Tcp_Server class Tcp_Server
{ {
public: public:
Tcp_Server(boost::asio::io_service& io_context, const boost::asio::ip::tcp::endpoint& endpoint) Tcp_Server(boost::asio::io_context& io_context, const boost::asio::ip::tcp::endpoint& endpoint)
: acceptor_(io_context), socket_(io_context) : acceptor_(io_context), socket_(io_context)
{ {
acceptor_.open(endpoint.protocol()); acceptor_.open(endpoint.protocol());
@ -950,7 +950,7 @@ private:
bool start_session = true; bool start_session = true;
}; };
boost::asio::io_service io_context; boost::asio::io_context io_context;
std::shared_ptr<Concurrent_Queue<std::string> > rtcm_message_queue; std::shared_ptr<Concurrent_Queue<std::string> > rtcm_message_queue;
std::thread t; std::thread t;
std::thread tq; std::thread tq;

10
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
View File

@ -65,7 +65,7 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
: gr::sync_block("rtl_tcp_signal_source_c", : gr::sync_block("rtl_tcp_signal_source_c",
gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0),
gr::io_signature::make(1, 1, sizeof(gr_complex))), gr::io_signature::make(1, 1, sizeof(gr_complex))),
socket_(io_service_), socket_(io_context_),
data_(RTL_TCP_PAYLOAD_SIZE), data_(RTL_TCP_PAYLOAD_SIZE),
flip_iq_(flip_iq), flip_iq_(flip_iq),
buffer_(RTL_TCP_BUFFER_SIZE), buffer_(RTL_TCP_BUFFER_SIZE),
@ -147,14 +147,14 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
boost::asio::async_read(socket_, boost::asio::buffer(data_), boost::asio::async_read(socket_, boost::asio::buffer(data_),
boost::bind(&rtl_tcp_signal_source_c::handle_read, boost::bind(&rtl_tcp_signal_source_c::handle_read,
this, _1, _2)); this, _1, _2));
boost::thread(boost::bind(&boost::asio::io_service::run, &io_service_)); boost::thread(boost::bind(&boost::asio::io_context::run, &io_context_));
} }
rtl_tcp_signal_source_c::~rtl_tcp_signal_source_c() // NOLINT(modernize-use-equals-default) rtl_tcp_signal_source_c::~rtl_tcp_signal_source_c() // NOLINT(modernize-use-equals-default)
{ {
mutex_.unlock(); mutex_.unlock();
io_service_.stop(); io_context_.stop();
not_empty_.notify_one(); not_empty_.notify_one();
not_full_.notify_one(); not_full_.notify_one();
} }
@ -289,7 +289,7 @@ void rtl_tcp_signal_source_c::handle_read(const boost::system::error_code &ec,
std::cout << "Error during read: " << ec << std::endl; std::cout << "Error during read: " << ec << std::endl;
LOG(WARNING) << "Error during read: " << ec; LOG(WARNING) << "Error during read: " << ec;
boost::mutex::scoped_lock lock(mutex_); boost::mutex::scoped_lock lock(mutex_);
io_service_.stop(); io_context_.stop();
not_empty_.notify_one(); not_empty_.notify_one();
} }
else else
@ -334,7 +334,7 @@ int rtl_tcp_signal_source_c::work(int noutput_items,
{ {
auto *out = reinterpret_cast<gr_complex *>(output_items[0]); auto *out = reinterpret_cast<gr_complex *>(output_items[0]);
int i = 0; int i = 0;
if (io_service_.stopped()) if (io_context_.stopped())
{ {
return -1; return -1;
} }

4
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
View File

@ -91,7 +91,7 @@ private:
Rtl_Tcp_Dongle_Info info_; Rtl_Tcp_Dongle_Info info_;
// IO members // IO members
boost::asio::io_service io_service_; boost::asio::io_context io_context_;
boost::asio::ip::tcp::socket socket_; boost::asio::ip::tcp::socket socket_;
std::vector<unsigned char> data_; std::vector<unsigned char> data_;
bool flip_iq_; bool flip_iq_;
@ -117,7 +117,7 @@ private:
inline bool not_empty() const inline bool not_empty() const
{ {
return unread_ > 0 || io_service_.stopped(); return unread_ > 0 || io_context_.stopped();
} }
}; };

4
src/algorithms/tracking/libs/tcp_communication.cc
View File

@ -35,7 +35,7 @@
#include <string> #include <string>
Tcp_Communication::Tcp_Communication() : tcp_socket_(io_service_) {} // NOLINT Tcp_Communication::Tcp_Communication() : tcp_socket_(io_context_) {} // NOLINT
Tcp_Communication::~Tcp_Communication() = default; Tcp_Communication::~Tcp_Communication() = default;
@ -47,7 +47,7 @@ int Tcp_Communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
{ {
// Specify IP type and port // Specify IP type and port
boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(), d_port_); boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(), d_port_);
boost::asio::ip::tcp::acceptor acceptor(io_service_, endpoint); boost::asio::ip::tcp::acceptor acceptor(io_context_, endpoint);
if (d_port_ == d_port_ch0_) if (d_port_ == d_port_ch0_)
{ {

2
src/algorithms/tracking/libs/tcp_communication.h
View File

@ -55,7 +55,7 @@ public:
void close_tcp_connection(size_t d_port_); void close_tcp_connection(size_t d_port_);
private: private:
boost::asio::io_service io_service_; boost::asio::io_context io_context_;
boost::asio::ip::tcp::socket tcp_socket_; boost::asio::ip::tcp::socket tcp_socket_;
}; };

2
src/core/monitor/gnss_synchro_udp_sink.cc
View File

@ -35,7 +35,7 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port, bool enable_protobuf) : socket{io_service} Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port, bool enable_protobuf) : socket{io_context}
{ {
use_protobuf = enable_protobuf; use_protobuf = enable_protobuf;
if (enable_protobuf) if (enable_protobuf)

2
src/core/monitor/gnss_synchro_udp_sink.h
View File

@ -52,7 +52,7 @@ public:
bool write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks); bool write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks);
private: private:
boost::asio::io_service io_service; boost::asio::io_context io_context;
boost::asio::ip::udp::socket socket; boost::asio::ip::udp::socket socket;
boost::system::error_code error; boost::system::error_code error;
std::vector<boost::asio::ip::udp::endpoint> endpoints; std::vector<boost::asio::ip::udp::endpoint> endpoints;

6
src/core/receiver/tcp_cmd_interface.cc
View File

@ -305,10 +305,10 @@ void TcpCmdInterface::run_cmd_server(int tcp_port)
boost::system::error_code not_throw; boost::system::error_code not_throw;
// Socket and acceptor // Socket and acceptor
boost::asio::io_service service; boost::asio::io_context context;
try try
{ {
boost::asio::ip::tcp::acceptor acceptor(service, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)); boost::asio::ip::tcp::acceptor acceptor(context, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port));
while (keep_running_) while (keep_running_)
{ {
@ -316,7 +316,7 @@ void TcpCmdInterface::run_cmd_server(int tcp_port)
{ {
std::cout << "TcpCmdInterface: Telecommand TCP interface listening on port " << tcp_port << std::endl; std::cout << "TcpCmdInterface: Telecommand TCP interface listening on port " << tcp_port << std::endl;
boost::asio::ip::tcp::socket socket(service); boost::asio::ip::tcp::socket socket(context);
acceptor.accept(socket, not_throw); acceptor.accept(socket, not_throw);
if (not_throw) if (not_throw)
{ {