uhd: Remove tcp_zero_copy

This removes the tcp_zero_copy interface, which is not supported by any
USRP.

4 files changed, 0 insertions, 295 deletions

diff --git a/host/include/uhd/transport/CMakeLists.txt b/host/include/uhd/transport/CMakeLists.txt
index a74f025bf..85956fade 100644
--- a/host/include/uhd/transport/CMakeLists.txt
+++ b/host/include/uhd/transport/CMakeLists.txt
@@ -16,7 +16,6 @@ UHD_INSTALL(FILES
     udp_constants.hpp
     udp_simple.hpp
     udp_zero_copy.hpp
-    tcp_zero_copy.hpp
     usb_control.hpp
     usb_zero_copy.hpp
     usb_device_handle.hpp
diff --git a/host/include/uhd/transport/tcp_zero_copy.hpp b/host/include/uhd/transport/tcp_zero_copy.hpp
deleted file mode 100644
index d55a87a48..000000000
--- a/host/include/uhd/transport/tcp_zero_copy.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright 2010-2015 Ettus Research LLC
-// Copyright 2018 Ettus Research, a National Instruments Company
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-
-#pragma once
-
-#include <uhd/config.hpp>
-#include <uhd/transport/zero_copy.hpp>
-#include <uhd/types/device_addr.hpp>
-#include <memory>
-
-namespace uhd { namespace transport {
-
-/*!
- * The zero copy TCP transport.
- * This transport provides the uhd zero copy interface
- * on top of a standard tcp socket from boost asio.
- */
-struct UHD_API tcp_zero_copy : public virtual zero_copy_if
-{
-    ~tcp_zero_copy(void) override;
-
-    /*!
-     * Make a new zero copy TCP transport:
-     * This transport is for sending and receiving
-     * between this host and a single endpoint.
-     * The primary usage for this transport will be data transactions.
-     *
-     * The address will be resolved, it can be a host name or ipv4.
-     * The port will be resolved, it can be a port type or number.
-     *
-     * \param addr a string representing the destination address
-     * \param port a string representing the destination port
-     * \param hints optional parameters to pass to the underlying transport
-     */
-    static zero_copy_if::sptr make(const std::string& addr,
-        const std::string& port,
-        const device_addr_t& hints = device_addr_t());
-};
-
-}} // namespace uhd::transport
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt
index 3c60414e0..89ed62bb6 100644
--- a/host/lib/transport/CMakeLists.txt
+++ b/host/lib/transport/CMakeLists.txt
@@ -115,7 +115,6 @@ LIBUHD_PYTHON_GEN_SOURCE(
 
 LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/zero_copy_flow_ctrl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/tcp_zero_copy.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/buffer_pool.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/if_addrs.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/udp_simple.cpp
diff --git a/host/lib/transport/tcp_zero_copy.cpp b/host/lib/transport/tcp_zero_copy.cpp
deleted file mode 100644
index 89e8eb4ff..000000000
--- a/host/lib/transport/tcp_zero_copy.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-//
-// Copyright 2010-2014 Ettus Research LLC
-// Copyright 2018 Ettus Research, a National Instruments Company
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-//
-
-#include <uhd/transport/buffer_pool.hpp>
-#include <uhd/transport/tcp_zero_copy.hpp>
-#include <uhd/utils/log.hpp>
-#include <uhdlib/transport/udp_common.hpp>
-#include <uhdlib/utils/atomic.hpp>
-#include <boost/format.hpp>
-#include <chrono>
-#include <memory>
-#include <thread>
-#include <vector>
-
-using namespace uhd;
-using namespace uhd::transport;
-namespace asio = boost::asio;
-
-static const size_t DEFAULT_NUM_FRAMES = 32;
-static const size_t DEFAULT_FRAME_SIZE = 2048;
-
-/***********************************************************************
- * Reusable managed receiver buffer:
- *  - get_new performs the recv operation
- **********************************************************************/
-class tcp_zero_copy_asio_mrb : public managed_recv_buffer
-{
-public:
-    tcp_zero_copy_asio_mrb(void* mem, int sock_fd, const size_t frame_size)
-        : _mem(mem), _sock_fd(sock_fd), _frame_size(frame_size)
-    { /*NOP*/
-    }
-
-    void release(void) override
-    {
-        _claimer.release();
-    }
-
-    UHD_INLINE sptr get_new(const double timeout, size_t& index)
-    {
-        if (not _claimer.claim_with_wait(timeout))
-            return sptr();
-
-#ifdef MSG_DONTWAIT // try a non-blocking recv() if supported
-        _len = ::recv(_sock_fd, (char*)_mem, _frame_size, MSG_DONTWAIT);
-        if (_len > 0) {
-            index++; // advances the caller's buffer
-            return make(this, _mem, size_t(_len));
-        }
-#endif
-        const int32_t timeout_ms = static_cast<int32_t>(timeout * 1000);
-
-        if (wait_for_recv_ready(_sock_fd, timeout_ms)) {
-            _len = ::recv(_sock_fd, (char*)_mem, _frame_size, 0);
-            index++; // advances the caller's buffer
-            return make(this, _mem, size_t(_len));
-        }
-
-        _claimer.release(); // undo claim
-        return sptr(); // null for timeout
-    }
-
-private:
-    void* _mem;
-    int _sock_fd;
-    size_t _frame_size;
-    ssize_t _len;
-    simple_claimer _claimer;
-};
-
-/***********************************************************************
- * Reusable managed send buffer:
- *  - commit performs the send operation
- **********************************************************************/
-class tcp_zero_copy_asio_msb : public managed_send_buffer
-{
-public:
-    tcp_zero_copy_asio_msb(void* mem, int sock_fd, const size_t frame_size)
-        : _mem(mem), _sock_fd(sock_fd), _frame_size(frame_size)
-    { /*NOP*/
-    }
-
-    void release(void) override
-    {
-        // Retry logic because send may fail with ENOBUFS.
-        // This is known to occur at least on some OSX systems.
-        // But it should be safe to always check for the error.
-        while (true) {
-            this->commit(_frame_size); // always full size frames to avoid pkt coalescing
-            const ssize_t ret = ::send(_sock_fd, (const char*)_mem, size(), 0);
-            if (ret == ssize_t(size()))
-                break;
-            if (ret == -1 and errno == ENOBUFS) {
-                std::this_thread::sleep_for(std::chrono::microseconds(1));
-                continue; // try to send again
-            }
-            UHD_ASSERT_THROW(ret == ssize_t(size()));
-        }
-        _claimer.release();
-    }
-
-    UHD_INLINE sptr get_new(const double timeout, size_t& index)
-    {
-        if (not _claimer.claim_with_wait(timeout))
-            return sptr();
-        index++; // advances the caller's buffer
-        return make(this, _mem, _frame_size);
-    }
-
-private:
-    void* _mem;
-    int _sock_fd;
-    size_t _frame_size;
-    simple_claimer _claimer;
-};
-
-tcp_zero_copy::~tcp_zero_copy(void)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * Zero Copy TCP implementation with ASIO:
- *   This is the portable zero copy implementation for systems
- *   where a faster, platform specific solution is not available.
- *   However, it is not a true zero copy implementation as each
- *   send and recv requires a copy operation to/from userspace.
- **********************************************************************/
-class tcp_zero_copy_asio_impl : public tcp_zero_copy
-{
-public:
-    typedef std::shared_ptr<tcp_zero_copy_asio_impl> sptr;
-
-    tcp_zero_copy_asio_impl(
-        const std::string& addr, const std::string& port, const device_addr_t& hints)
-        : _recv_frame_size(
-              size_t(hints.cast<double>("recv_frame_size", DEFAULT_FRAME_SIZE)))
-        , _num_recv_frames(
-              size_t(hints.cast<double>("num_recv_frames", DEFAULT_NUM_FRAMES)))
-        , _send_frame_size(
-              size_t(hints.cast<double>("send_frame_size", DEFAULT_FRAME_SIZE)))
-        , _num_send_frames(
-              size_t(hints.cast<double>("num_send_frames", DEFAULT_NUM_FRAMES)))
-        , _recv_buffer_pool(buffer_pool::make(_num_recv_frames, _recv_frame_size))
-        , _send_buffer_pool(buffer_pool::make(_num_send_frames, _send_frame_size))
-        , _next_recv_buff_index(0)
-        , _next_send_buff_index(0)
-    {
-        UHD_LOGGER_TRACE("TCP")
-            << boost::format("Creating tcp transport for %s %s") % addr % port;
-
-        // resolve the address
-        asio::ip::tcp::resolver resolver(_io_service);
-        asio::ip::tcp::resolver::query query(asio::ip::tcp::v4(), addr, port);
-        asio::ip::tcp::endpoint receiver_endpoint = *resolver.resolve(query);
-
-        // create, open, and connect the socket
-        _socket.reset(new asio::ip::tcp::socket(_io_service));
-        _socket->connect(receiver_endpoint);
-        _sock_fd = _socket->native_handle();
-
-        // packets go out ASAP
-        asio::ip::tcp::no_delay option(true);
-        _socket->set_option(option);
-
-        // allocate re-usable managed receive buffers
-        for (size_t i = 0; i < get_num_recv_frames(); i++) {
-            _mrb_pool.push_back(std::make_shared<tcp_zero_copy_asio_mrb>(
-                _recv_buffer_pool->at(i), _sock_fd, get_recv_frame_size()));
-        }
-
-        // allocate re-usable managed send buffers
-        for (size_t i = 0; i < get_num_send_frames(); i++) {
-            _msb_pool.push_back(std::make_shared<tcp_zero_copy_asio_msb>(
-                _send_buffer_pool->at(i), _sock_fd, get_send_frame_size()));
-        }
-    }
-
-    /*******************************************************************
-     * Receive implementation:
-     * Block on the managed buffer's get call and advance the index.
-     ******************************************************************/
-    managed_recv_buffer::sptr get_recv_buff(double timeout) override
-    {
-        if (_next_recv_buff_index == _num_recv_frames)
-            _next_recv_buff_index = 0;
-        return _mrb_pool[_next_recv_buff_index]->get_new(timeout, _next_recv_buff_index);
-    }
-
-    size_t get_num_recv_frames(void) const override
-    {
-        return _num_recv_frames;
-    }
-    size_t get_recv_frame_size(void) const override
-    {
-        return _recv_frame_size;
-    }
-
-    /*******************************************************************
-     * Send implementation:
-     * Block on the managed buffer's get call and advance the index.
-     ******************************************************************/
-    managed_send_buffer::sptr get_send_buff(double timeout) override
-    {
-        if (_next_send_buff_index == _num_send_frames)
-            _next_send_buff_index = 0;
-        return _msb_pool[_next_send_buff_index]->get_new(timeout, _next_send_buff_index);
-    }
-
-    size_t get_num_send_frames(void) const override
-    {
-        return _num_send_frames;
-    }
-    size_t get_send_frame_size(void) const override
-    {
-        return _send_frame_size;
-    }
-
-private:
-    // memory management -> buffers and fifos
-    const size_t _recv_frame_size, _num_recv_frames;
-    const size_t _send_frame_size, _num_send_frames;
-    buffer_pool::sptr _recv_buffer_pool, _send_buffer_pool;
-    std::vector<std::shared_ptr<tcp_zero_copy_asio_msb>> _msb_pool;
-    std::vector<std::shared_ptr<tcp_zero_copy_asio_mrb>> _mrb_pool;
-    size_t _next_recv_buff_index, _next_send_buff_index;
-
-    // asio guts -> socket and service
-    asio::io_service _io_service;
-    std::shared_ptr<asio::ip::tcp::socket> _socket;
-    int _sock_fd;
-};
-
-/***********************************************************************
- * TCP zero copy make function
- **********************************************************************/
-zero_copy_if::sptr tcp_zero_copy::make(
-    const std::string& addr, const std::string& port, const device_addr_t& hints)
-{
-    zero_copy_if::sptr xport;
-    xport.reset(new tcp_zero_copy_asio_impl(addr, port, hints));
-    while (xport->get_recv_buff(0.0)) {
-    } // flush
-    return xport;
-}