Moved the packet handler state stuff into a separate header (so we dont pull in all the includes).

Use callback for getting buffers rather than zc interface pointer so its more modular.

1 files changed, 14 insertions, 36 deletions

diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp
index e64e3383d..a179731ca 100644
--- a/host/lib/transport/vrt_packet_handler.hpp
+++ b/host/lib/transport/vrt_packet_handler.hpp
@@ -18,6 +18,7 @@
 #ifndef INCLUDED_LIBUHD_TRANSPORT_VRT_PACKET_HANDLER_HPP
 #define INCLUDED_LIBUHD_TRANSPORT_VRT_PACKET_HANDLER_HPP
 
+#include "vrt_packet_handler_state.hpp"
 #include <uhd/config.hpp>
 #include <uhd/device.hpp>
 #include <uhd/types/io_type.hpp>
@@ -36,23 +37,7 @@ namespace vrt_packet_handler{
 /***********************************************************************
  * vrt packet handler for recv
  **********************************************************************/
-    struct recv_state{
-        //init the expected seq number
-        size_t next_packet_seq;
-
-        //state variables to handle fragments
-        uhd::transport::managed_recv_buffer::sptr managed_buff;
-        boost::asio::const_buffer copy_buff;
-        size_t fragment_offset_in_samps;
-
-        recv_state(void){
-            //first expected seq is zero
-            next_packet_seq = 0;
-
-            //initially empty copy buffer
-            copy_buff = boost::asio::buffer("", 0);
-        }
-    };
+    typedef boost::function<uhd::transport::managed_recv_buffer::sptr(void)> get_recv_buff_t;
 
     typedef boost::function<void(uhd::transport::managed_recv_buffer::sptr)> recv_cb_t;
 
@@ -112,15 +97,15 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
-        uhd::transport::zero_copy_if::sptr zc_iface,
+        const get_recv_buff_t &get_recv_buff,
         //use these two params to handle a layer above vrt
         size_t vrt_header_offset_words32,
-        const recv_cb_t& recv_cb
+        const recv_cb_t &recv_cb
     ){
         //perform a receive if no rx data is waiting to be copied
         if (boost::asio::buffer_size(state.copy_buff) == 0){
             state.fragment_offset_in_samps = 0;
-            state.managed_buff = zc_iface->get_recv_buff();
+            state.managed_buff = get_recv_buff();
             recv_cb(state.managed_buff); //callback before vrt unpack
             try{
                 _recv1_helper(
@@ -169,7 +154,7 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
-        uhd::transport::zero_copy_if::sptr zc_iface,
+        const get_recv_buff_t &get_recv_buff,
         //use these two params to handle a layer above vrt
         size_t vrt_header_offset_words32 = 0,
         const recv_cb_t& recv_cb = &recv_cb_nop
@@ -189,7 +174,7 @@ namespace vrt_packet_handler{
                 metadata,
                 io_type, otw_type,
                 tick_rate,
-                zc_iface,
+                get_recv_buff,
                 vrt_header_offset_words32,
                 recv_cb
             );
@@ -208,7 +193,7 @@ namespace vrt_packet_handler{
                     (accum_num_samps == 0)? metadata : tmp_md, //only the first metadata gets kept
                     io_type, otw_type,
                     tick_rate,
-                    zc_iface,
+                    get_recv_buff,
                     vrt_header_offset_words32,
                     recv_cb
                 );
@@ -225,14 +210,7 @@ namespace vrt_packet_handler{
 /***********************************************************************
  * vrt packet handler for send
  **********************************************************************/
-    struct send_state{
-        //init the expected seq number
-        size_t next_packet_seq;
-
-        send_state(void){
-            next_packet_seq = 0;
-        }
-    };
+    typedef boost::function<uhd::transport::managed_send_buffer::sptr(void)> get_send_buff_t;
 
     typedef boost::function<void(uhd::transport::managed_send_buffer::sptr)> send_cb_t;
 
@@ -252,12 +230,12 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
-        uhd::transport::zero_copy_if::sptr zc_iface,
+        const get_send_buff_t &get_send_buff,
         size_t vrt_header_offset_words32,
         const send_cb_t& send_cb
     ){
         //get a new managed send buffer
-        uhd::transport::managed_send_buffer::sptr send_buff = zc_iface->get_send_buff();
+        uhd::transport::managed_send_buffer::sptr send_buff = get_send_buff();
         boost::uint32_t *tx_mem = send_buff->cast<boost::uint32_t *>() + vrt_header_offset_words32;
 
         size_t num_header_words32, num_packet_words32;
@@ -298,7 +276,7 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
-        uhd::transport::zero_copy_if::sptr zc_iface,
+        const get_send_buff_t &get_send_buff,
         size_t max_samples_per_packet,
         //use these two params to handle a layer above vrt
         size_t vrt_header_offset_words32 = 0,
@@ -319,7 +297,7 @@ namespace vrt_packet_handler{
                 metadata,
                 io_type, otw_type,
                 tick_rate,
-                zc_iface,
+                get_send_buff,
                 vrt_header_offset_words32,
                 send_cb
             );
@@ -353,7 +331,7 @@ namespace vrt_packet_handler{
                     md,
                     io_type, otw_type,
                     tick_rate,
-                    zc_iface,
+                    get_send_buff,
                     vrt_header_offset_words32,
                     send_cb
                 );