usrp-e: implemented tx policy and handling of async messages

2 files changed, 114 insertions, 19 deletions

diff --git a/host/lib/usrp/usrp_e/io_impl.cpp b/host/lib/usrp/usrp_e/io_impl.cpp
index 1bb67d9aa..31ea4c6c0 100644
--- a/host/lib/usrp/usrp_e/io_impl.cpp
+++ b/host/lib/usrp/usrp_e/io_impl.cpp
@@ -18,6 +18,8 @@
 #include "usrp_e_impl.hpp"
 #include "usrp_e_regs.hpp"
 #include <uhd/usrp/dsp_utils.hpp>
+#include <uhd/utils/thread_priority.hpp>
+#include <uhd/transport/bounded_buffer.hpp>
 #include "../../transport/vrt_packet_handler.hpp"
 #include <boost/bind.hpp>
 #include <fcntl.h> //read, write
@@ -28,12 +30,15 @@
 
 using namespace uhd;
 using namespace uhd::usrp;
+using namespace uhd::transport;
 
 /***********************************************************************
  * Constants
  **********************************************************************/
 static const size_t MAX_BUFF_SIZE = 2048;
 static const bool usrp_e_io_impl_verbose = false;
+static const size_t tx_async_report_sid = 1;
+static const int underflow_flags = async_metadata_t::EVENT_CODE_UNDERFLOW | async_metadata_t::EVENT_CODE_UNDERFLOW_IN_PACKET;
 
 /***********************************************************************
  * Data Transport (phony zero-copy with read/write)
@@ -52,15 +57,15 @@ public:
     }
 
     size_t get_num_recv_frames(void) const{
-        return 10; //FIXME no idea!
+        return 100; //FIXME no idea!
+        //this will be an important number when packet ring gets implemented
     }
 
     size_t get_num_send_frames(void) const{
-        return 10; //FIXME no idea!
+        return 100; //FIXME no idea!
+        //this will be an important number when packet ring gets implemented
     }
 
-    size_t recv_timeout_ms;
-
 private:
     int _fd;
     ssize_t send(const boost::asio::const_buffer &buff){
@@ -79,7 +84,7 @@ private:
         pollfd pfd;
         pfd.fd = _fd;
         pfd.events = POLLIN;
-        ssize_t poll_ret = poll(&pfd, 1, recv_timeout_ms);
+        ssize_t poll_ret = poll(&pfd, 1, 100/*ms*/);
         if (poll_ret <= 0){
             if (usrp_e_io_impl_verbose) std::cerr << boost::format(
                 "usrp-e io impl recv(): poll() returned non-positive value: %d\n"
@@ -111,7 +116,11 @@ private:
 };
 
 /***********************************************************************
- * IO Implementation Details
+ * io impl details (internal to this file)
+ * - pirate crew of 1
+ * - bounded buffer
+ * - thread loop
+ * - vrt packet handler states
  **********************************************************************/
 struct usrp_e_impl::io_impl{
     //state management for the vrt packet handler code
@@ -119,9 +128,88 @@ struct usrp_e_impl::io_impl{
     vrt_packet_handler::send_state packet_handler_send_state;
     data_transport transport;
     bool continuous_streaming;
-    io_impl(int fd): packet_handler_recv_state(1), transport(fd){}
+    io_impl(int fd):
+        transport(fd),
+        recv_pirate_booty(recv_booty_type::make(transport.get_num_recv_frames())),
+        async_msg_fifo(bounded_buffer<async_metadata_t>::make(100/*messages deep*/))
+    {
+        /* NOP */
+    }
+
+    ~io_impl(void){
+        recv_pirate_crew_raiding = false;
+        recv_pirate_crew.interrupt_all();
+        recv_pirate_crew.join_all();
+    }
+
+    bool get_recv_buffs(vrt_packet_handler::managed_recv_buffs_t &buffs, size_t timeout_ms){
+        UHD_ASSERT_THROW(buffs.size() == 1);
+        boost::this_thread::disable_interruption di; //disable because the wait can throw
+        return recv_pirate_booty->pop_with_timed_wait(buffs.front(), boost::posix_time::milliseconds(timeout_ms));
+    }
+
+    //a pirate's life is the life for me!
+    void recv_pirate_loop();
+    typedef bounded_buffer<managed_recv_buffer::sptr> recv_booty_type;
+    recv_booty_type::sptr recv_pirate_booty;
+    bounded_buffer<async_metadata_t>::sptr async_msg_fifo;
+    boost::thread_group recv_pirate_crew;
+    bool recv_pirate_crew_raiding;
 };
 
+/***********************************************************************
+ * Receive Pirate Loop
+ * - while raiding, loot for recv buffers
+ * - put booty into the alignment buffer
+ **********************************************************************/
+void usrp_e_impl::io_impl::recv_pirate_loop(
+
+){
+    set_thread_priority_safe();
+    recv_pirate_crew_raiding = true;
+    //size_t next_packet_seq = 0;
+
+    while(recv_pirate_crew_raiding){
+        managed_recv_buffer::sptr buff = this->transport.get_recv_buff();
+        if (not buff.get()) continue; //ignore timeout/error buffers
+
+        try{
+            //extract the vrt header packet info
+            vrt::if_packet_info_t if_packet_info;
+            if_packet_info.num_packet_words32 = buff->size()/sizeof(boost::uint32_t);
+            const boost::uint32_t *vrt_hdr = buff->cast<const boost::uint32_t *>();
+            vrt::if_hdr_unpack_le(vrt_hdr, if_packet_info);
+
+            //handle a tx async report message
+            if (if_packet_info.sid == tx_async_report_sid and if_packet_info.packet_type != vrt::if_packet_info_t::PACKET_TYPE_DATA){
+
+                //fill in the async metadata
+                async_metadata_t metadata;
+                metadata.channel = 0;
+                metadata.has_time_spec = if_packet_info.has_tsi and if_packet_info.has_tsf;
+                metadata.time_spec = time_spec_t(
+                    time_t(if_packet_info.tsi), size_t(if_packet_info.tsf), MASTER_CLOCK_RATE
+                );
+                metadata.event_code = vrt_packet_handler::get_context_code<async_metadata_t::event_code_t>(vrt_hdr, if_packet_info);
+
+                //print the famous U, and push the metadata into the message queue
+                if (metadata.event_code & underflow_flags) std::cerr << "U" << std::flush;
+                async_msg_fifo->push_with_pop_on_full(metadata);
+                continue;
+            }
+
+        }catch(const std::exception &e){
+            std::cerr << "Error (usrp-e recv pirate loop): " << e.what() << std::endl;
+        }
+
+        //usrp-e back-pressures on receive: push with wait
+        recv_pirate_booty->push_with_wait(buff);
+    }
+}
+
+/***********************************************************************
+ * Helper Functions
+ **********************************************************************/
 void usrp_e_impl::io_init(void){
     //setup rx data path
     _iface->poke32(UE_REG_CTRL_RX_NSAMPS_PER_PKT, get_max_recv_samps_per_packet());
@@ -136,7 +224,16 @@ void usrp_e_impl::io_init(void){
     _iface->poke32(UE_REG_CTRL_RX_VRT_STREAM_ID, 0);
     _iface->poke32(UE_REG_CTRL_RX_VRT_TRAILER, 0);
 
+    //setup the tx policy
+    _iface->poke32(UE_REG_CTRL_TX_REPORT_SID, tx_async_report_sid);
+    _iface->poke32(UE_REG_CTRL_TX_POLICY, UE_FLAG_CTRL_TX_POLICY_NEXT_PACKET);
+
     _io_impl = UHD_PIMPL_MAKE(io_impl, (_iface->get_file_descriptor()));
+
+    //spawn a pirate, yarrr!
+    _io_impl->recv_pirate_crew.create_thread(boost::bind(
+        &usrp_e_impl::io_impl::recv_pirate_loop, _io_impl.get()
+    ));
 }
 
 void usrp_e_impl::issue_stream_cmd(const stream_cmd_t &stream_cmd){
@@ -217,9 +314,6 @@ size_t usrp_e_impl::recv(
     recv_otw_type.shift = 0;
     recv_otw_type.byteorder = otw_type_t::BO_LITTLE_ENDIAN;
 
-    //hand-off the timeout to the transport
-    _io_impl->transport.recv_timeout_ms = timeout_ms;
-
     return vrt_packet_handler::recv(
         _io_impl->packet_handler_recv_state,       //last state of the recv handler
         buffs, num_samps,                          //buffer to fill
@@ -227,15 +321,20 @@ size_t usrp_e_impl::recv(
         io_type, recv_otw_type,                    //input and output types to convert
         MASTER_CLOCK_RATE,                         //master clock tick rate
         uhd::transport::vrt::if_hdr_unpack_le,
-        boost::bind(&get_recv_buffs, &_io_impl->transport, _1),
+        boost::bind(&usrp_e_impl::io_impl::get_recv_buffs, _io_impl.get(), _1, timeout_ms),
         boost::bind(&usrp_e_impl::handle_overrun, this, _1)
     );
 }
 
 /***********************************************************************
- * Dummy Async Recv
+ * Async Recv
  **********************************************************************/
-bool usrp_e_impl::recv_async_msg(async_metadata_t &, size_t timeout_ms){
-    boost::this_thread::sleep(boost::posix_time::milliseconds(timeout_ms));
-    return false;
+bool usrp_e_impl::recv_async_msg(
+    async_metadata_t &async_metadata,
+    size_t timeout_ms
+){
+    boost::this_thread::disable_interruption di; //disable because the wait can throw
+    return _io_impl->async_msg_fifo->pop_with_timed_wait(
+        async_metadata, boost::posix_time::milliseconds(timeout_ms)
+    );
 }
diff --git a/host/lib/usrp/usrp_e/mboard_impl.cpp b/host/lib/usrp/usrp_e/mboard_impl.cpp
index 047db3f7c..3d4cef069 100644
--- a/host/lib/usrp/usrp_e/mboard_impl.cpp
+++ b/host/lib/usrp/usrp_e/mboard_impl.cpp
@@ -41,10 +41,6 @@ void usrp_e_impl::mboard_init(void){
     _clock_config.pps_source = clock_config_t::PPS_SMA;
 
     //TODO poke the clock config regs
-
-    //setup the tx policy
-    _iface->poke32(UE_REG_CTRL_TX_REPORT_SID, 1);
-    _iface->poke32(UE_REG_CTRL_TX_POLICY, UE_FLAG_CTRL_TX_POLICY_NEXT_PACKET);
 }
 
 /***********************************************************************