diff options
Diffstat (limited to 'host/lib/include/uhdlib/transport')
7 files changed, 34 insertions, 34 deletions
diff --git a/host/lib/include/uhdlib/transport/dpdk_simple.hpp b/host/lib/include/uhdlib/transport/dpdk_simple.hpp index 072edbf9f..229e6b0be 100644 --- a/host/lib/include/uhdlib/transport/dpdk_simple.hpp +++ b/host/lib/include/uhdlib/transport/dpdk_simple.hpp @@ -13,7 +13,7 @@ namespace uhd { namespace transport { class dpdk_simple : public udp_simple { public: - virtual ~dpdk_simple(void) = 0; + ~dpdk_simple(void) override = 0; static udp_simple::sptr make_connected( const std::string& addr, const std::string& port); @@ -27,7 +27,7 @@ public: * \param buff single asio buffer * \return the number of bytes sent */ - virtual size_t send(const boost::asio::const_buffer& buff) = 0; + size_t send(const boost::asio::const_buffer& buff) override = 0; /*! * Receive into the provided buffer. @@ -36,19 +36,19 @@ public: * \param timeout the timeout in seconds * \return the number of bytes received or zero on timeout */ - virtual size_t recv( - const boost::asio::mutable_buffer& buff, double timeout = 0.1) = 0; + size_t recv( + const boost::asio::mutable_buffer& buff, double timeout = 0.1) override = 0; /*! * Get the last IP address as seen by recv(). * Only use this with the broadcast socket. */ - virtual std::string get_recv_addr(void) = 0; + std::string get_recv_addr(void) override = 0; /*! * Get the IP address for the destination */ - virtual std::string get_send_addr(void) = 0; + std::string get_send_addr(void) override = 0; }; }} // namespace uhd::transport diff --git a/host/lib/include/uhdlib/transport/inline_io_service.hpp b/host/lib/include/uhdlib/transport/inline_io_service.hpp index a9616dd86..b44b0bad5 100644 --- a/host/lib/include/uhdlib/transport/inline_io_service.hpp +++ b/host/lib/include/uhdlib/transport/inline_io_service.hpp @@ -33,18 +33,18 @@ public: ~inline_io_service(); - void attach_recv_link(recv_link_if::sptr link); - void attach_send_link(send_link_if::sptr link); + void attach_recv_link(recv_link_if::sptr link) override; + void attach_send_link(send_link_if::sptr link) override; - void detach_recv_link(recv_link_if::sptr link); - void detach_send_link(send_link_if::sptr link); + void detach_recv_link(recv_link_if::sptr link) override; + void detach_send_link(send_link_if::sptr link) override; recv_io_if::sptr make_recv_client(recv_link_if::sptr data_link, size_t num_recv_frames, recv_callback_t cb, send_link_if::sptr fc_link, size_t num_send_frames, - recv_io_if::fc_callback_t fc_cb); + recv_io_if::fc_callback_t fc_cb) override; send_io_if::sptr make_send_client(send_link_if::sptr send_link, size_t num_send_frames, @@ -52,7 +52,7 @@ public: recv_link_if::sptr recv_link, size_t num_recv_frames, recv_callback_t recv_cb, - send_io_if::fc_callback_t fc_cb); + send_io_if::fc_callback_t fc_cb) override; private: friend class inline_recv_io; diff --git a/host/lib/include/uhdlib/transport/link_base.hpp b/host/lib/include/uhdlib/transport/link_base.hpp index 078b82fc6..e2b0425bd 100644 --- a/host/lib/include/uhdlib/transport/link_base.hpp +++ b/host/lib/include/uhdlib/transport/link_base.hpp @@ -74,17 +74,17 @@ public: { } - virtual size_t get_num_send_frames() const + size_t get_num_send_frames() const override { return _num_send_frames; } - virtual size_t get_send_frame_size() const + size_t get_send_frame_size() const override { return _send_frame_size; } - virtual frame_buff::uptr get_send_buff(int32_t timeout_ms) + frame_buff::uptr get_send_buff(int32_t timeout_ms) override { frame_buff* buff = _free_send_buffs.pop(); @@ -99,7 +99,7 @@ public: return frame_buff::uptr(buff); } - virtual void release_send_buff(frame_buff::uptr buff) + void release_send_buff(frame_buff::uptr buff) override { frame_buff* buff_ptr = buff.release(); assert(buff_ptr); @@ -164,17 +164,17 @@ public: { } - virtual size_t get_num_recv_frames() const + size_t get_num_recv_frames() const override { return _num_recv_frames; } - virtual size_t get_recv_frame_size() const + size_t get_recv_frame_size() const override { return _recv_frame_size; } - virtual frame_buff::uptr get_recv_buff(int32_t timeout_ms) + frame_buff::uptr get_recv_buff(int32_t timeout_ms) override { frame_buff* buff = _free_recv_buffs.pop(); @@ -192,7 +192,7 @@ public: } } - virtual void release_recv_buff(frame_buff::uptr buff) + void release_recv_buff(frame_buff::uptr buff) override { frame_buff* buff_ptr = buff.release(); assert(buff_ptr); diff --git a/host/lib/include/uhdlib/transport/nirio_link.hpp b/host/lib/include/uhdlib/transport/nirio_link.hpp index 84d55113d..33e22cf1a 100644 --- a/host/lib/include/uhdlib/transport/nirio_link.hpp +++ b/host/lib/include/uhdlib/transport/nirio_link.hpp @@ -48,7 +48,7 @@ public: ~nirio_adapter_info() {} - std::string to_string() + std::string to_string() override { return std::string("NIRIO:") + _resource; } @@ -92,7 +92,7 @@ public: /*! * Get the physical adapter ID used for this link */ - adapter_id_t get_send_adapter_id() const + adapter_id_t get_send_adapter_id() const override { return _adapter_id; } @@ -100,7 +100,7 @@ public: /*! * Get the physical adapter ID used for this link */ - adapter_id_t get_recv_adapter_id() const + adapter_id_t get_recv_adapter_id() const override { return _adapter_id; } @@ -109,7 +109,7 @@ public: * Returns whether this link type supports releasing the frame buffers * in an order different from that in which they were acquired. */ - bool supports_send_buff_out_of_order() const + bool supports_send_buff_out_of_order() const override { return false; } @@ -118,7 +118,7 @@ public: * Returns whether this link type supports releasing the frame buffers * in an order different from that in which they were acquired. */ - bool supports_recv_buff_out_of_order() const + bool supports_recv_buff_out_of_order() const override { return false; } diff --git a/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp b/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp index ce66d2ccb..00ce558b8 100644 --- a/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp +++ b/host/lib/include/uhdlib/transport/rx_streamer_impl.hpp @@ -106,13 +106,13 @@ public: } //! Implementation of rx_streamer API method - size_t get_num_channels() const + size_t get_num_channels() const override { return _zero_copy_streamer.get_num_channels(); } //! Implementation of rx_streamer API method - size_t get_max_num_samps() const + size_t get_max_num_samps() const override { return _spp; } @@ -130,7 +130,7 @@ public: const size_t nsamps_per_buff, uhd::rx_metadata_t& metadata, const double timeout, - const bool one_packet) + const bool one_packet) override { if (_error_metadata_cache.check(metadata)) { return 0; diff --git a/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp b/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp index ae6a1b867..4cb5c032b 100644 --- a/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp +++ b/host/lib/include/uhdlib/transport/tx_streamer_impl.hpp @@ -127,12 +127,12 @@ public: } } - size_t get_num_channels() const + size_t get_num_channels() const override { return _zero_copy_streamer.get_num_channels(); } - size_t get_max_num_samps() const + size_t get_max_num_samps() const override { return _spp; } @@ -148,7 +148,7 @@ public: size_t send(const uhd::tx_streamer::buffs_type& buffs, const size_t nsamps_per_buff, const uhd::tx_metadata_t& metadata_, - const double timeout) + const double timeout) override { uhd::tx_metadata_t metadata(metadata_); diff --git a/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp b/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp index a5ba976c7..34fbf3edd 100644 --- a/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp +++ b/host/lib/include/uhdlib/transport/udp_boost_asio_link.hpp @@ -38,7 +38,7 @@ public: ~udp_boost_asio_adapter_info() {} - std::string to_string() + std::string to_string() override { return std::string("Ethernet(kernel):") + _src_ip.to_string(); } @@ -90,7 +90,7 @@ public: /*! * Get the physical adapter ID used for this link */ - adapter_id_t get_send_adapter_id() const + adapter_id_t get_send_adapter_id() const override { return _adapter_id; } @@ -98,7 +98,7 @@ public: /*! * Get the physical adapter ID used for this link */ - adapter_id_t get_recv_adapter_id() const + adapter_id_t get_recv_adapter_id() const override { return _adapter_id; } |