diff options
| author | Thomas Habets <thomas@habets.se> | 2020-08-11 11:18:07 +0100 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-08-14 04:19:58 -0700 |
| commit | 65cc420b46b8c4d715be0fe8f70e6a54f8ee0166 (patch) | |
| tree | 1de0552dc4c99218aceac95935c23148123f6e1e | |
| parent | 487da72790363937c20f93500a1883ac0fc93582 (diff) | |
blocks/tcp_server_sink: Remove manual memory management
| -rw-r--r-- | gr-blocks/lib/tcp_server_sink_impl.cc | 38 | ||||
| -rw-r--r-- | gr-blocks/lib/tcp_server_sink_impl.h | 6 |
2 files changed, 17 insertions, 27 deletions
diff --git a/gr-blocks/lib/tcp_server_sink_impl.cc b/gr-blocks/lib/tcp_server_sink_impl.cc index d306dffac6..1cd6c2b14d 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.cc +++ b/gr-blocks/lib/tcp_server_sink_impl.cc @@ -20,6 +20,7 @@ #include <boost/array.hpp> #include <boost/asio.hpp> #include <boost/format.hpp> +#include <boost/make_unique.hpp> #include <algorithm> #include <stdexcept> @@ -41,7 +42,6 @@ tcp_server_sink_impl::tcp_server_sink_impl(size_t itemsize, io_signature::make(0, 0, 0)), d_itemsize(itemsize), d_acceptor(d_io_service), - d_buf(new uint8_t[BUF_SIZE]), d_writing(0) { std::string s__port = (boost::format("%d") % port).str(); @@ -57,12 +57,12 @@ tcp_server_sink_impl::tcp_server_sink_impl(size_t itemsize, d_acceptor.listen(); if (!noblock) { - d_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); - d_acceptor.accept(*d_socket, d_endpoint); - d_sockets.insert(d_socket.release()); + auto sock = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); + d_acceptor.accept(*sock, d_endpoint); + d_sockets.insert(std::move(sock)); } - d_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); + d_socket = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.async_accept(*d_socket, boost::bind(&tcp_server_sink_impl::do_accept, this, @@ -75,8 +75,8 @@ void tcp_server_sink_impl::do_accept(const boost::system::error_code& error) { if (!error) { gr::thread::scoped_lock guard(d_writing_mut); - d_sockets.insert(d_socket.release()); - d_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); + d_sockets.insert(std::move(d_socket)); + d_socket = boost::make_unique<boost::asio::ip::tcp::socket>(d_io_service); d_acceptor.async_accept(*d_socket, boost::bind(&tcp_server_sink_impl::do_accept, this, @@ -84,15 +84,15 @@ void tcp_server_sink_impl::do_accept(const boost::system::error_code& error) } } -void tcp_server_sink_impl::do_write(const boost::system::error_code& error, - size_t len, - std::set<boost::asio::ip::tcp::socket*>::iterator i) +void tcp_server_sink_impl::do_write( + const boost::system::error_code& error, + size_t len, + std::set<std::unique_ptr<boost::asio::ip::tcp::socket>>::iterator i) { { gr::thread::scoped_lock guard(d_writing_mut); --d_writing; if (error) { - delete *i; d_sockets.erase(i); } } @@ -105,14 +105,6 @@ tcp_server_sink_impl::~tcp_server_sink_impl() while (d_writing) { d_writing_cond.wait(guard); } - - for (std::set<boost::asio::ip::tcp::socket*>::iterator i = d_sockets.begin(); - i != d_sockets.end(); - ++i) { - delete *i; - } - d_sockets.clear(); - d_io_service.reset(); d_io_service.stop(); d_io_serv_thread.join(); @@ -131,12 +123,10 @@ int tcp_server_sink_impl::work(int noutput_items, size_t data_len = std::min(size_t(BUF_SIZE), noutput_items * d_itemsize); data_len -= data_len % d_itemsize; - memcpy(d_buf.get(), in, data_len); - for (std::set<boost::asio::ip::tcp::socket*>::iterator i = d_sockets.begin(); - i != d_sockets.end(); - ++i) { + memcpy(d_buf.data(), in, data_len); + for (auto i = std::begin(d_sockets); i != std::end(d_sockets); ++i) { boost::asio::async_write(**i, - boost::asio::buffer(d_buf.get(), data_len), + boost::asio::buffer(d_buf.data(), data_len), boost::bind(&tcp_server_sink_impl::do_write, this, boost::asio::placeholders::error, diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h index 6e75432302..47e157f84a 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.h +++ b/gr-blocks/lib/tcp_server_sink_impl.h @@ -28,13 +28,13 @@ private: gr::thread::thread d_io_serv_thread; boost::asio::ip::tcp::endpoint d_endpoint; std::unique_ptr<boost::asio::ip::tcp::socket> d_socket; - std::set<boost::asio::ip::tcp::socket*> d_sockets; + std::set<std::unique_ptr<boost::asio::ip::tcp::socket>> d_sockets; boost::asio::ip::tcp::acceptor d_acceptor; - std::shared_ptr<uint8_t[]> d_buf; enum { BUF_SIZE = 256 * 1024, }; + std::array<uint8_t, BUF_SIZE> d_buf; int d_writing; boost::condition_variable d_writing_cond; @@ -43,7 +43,7 @@ private: void do_accept(const boost::system::error_code& error); void do_write(const boost::system::error_code& error, std::size_t len, - std::set<boost::asio::ip::tcp::socket*>::iterator); + std::set<std::unique_ptr<boost::asio::ip::tcp::socket>>::iterator); public: tcp_server_sink_impl(size_t itemsize, |