diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-10-05 11:13:25 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-10-05 11:14:45 -0700 |
| commit | e4d088fa9169eef81473cb7d83bda7c82bc5d243 (patch) | |
| tree | 0798f4c0863bcb27ff4164f9e2fcc2ccd7bf80d3 /host/lib/usrp/usrp2/io_impl.cpp | |
| parent | 6dd502737bcf6e59933be01720672db9a496803b (diff) | |
| parent | bd3bd0dfbc1a87af5839c9b23450434cfb9c763c (diff) | |
| download | uhd-e4d088fa9169eef81473cb7d83bda7c82bc5d243.tar.gz uhd-e4d088fa9169eef81473cb7d83bda7c82bc5d243.tar.bz2 uhd-e4d088fa9169eef81473cb7d83bda7c82bc5d243.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/ic_reg_maps/CMakeLists.txt
host/lib/usrp/usrp2/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp2/io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index b0603f951..7d9a426a3 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -33,6 +33,7 @@ using namespace uhd::transport; namespace asio = boost::asio; static const int underflow_flags = async_metadata_t::EVENT_CODE_UNDERFLOW | async_metadata_t::EVENT_CODE_UNDERFLOW_IN_PACKET; +static const double RECV_TIMEOUT_MS = 100; /*********************************************************************** * io impl details (internal to this file) @@ -90,7 +91,7 @@ void usrp2_impl::io_impl::recv_pirate_loop( size_t next_packet_seq = 0; while(recv_pirate_crew_raiding){ - managed_recv_buffer::sptr buff = zc_if->get_recv_buff(); + managed_recv_buffer::sptr buff = zc_if->get_recv_buff(RECV_TIMEOUT_MS); if (not buff.get()) continue; //ignore timeout/error buffers try{ @@ -151,7 +152,7 @@ void usrp2_impl::io_init(void){ send_buff->commit(sizeof(data)); //drain the recv buffers (may have junk) - while (data_transport->get_recv_buff().get()){}; + while (data_transport->get_recv_buff(RECV_TIMEOUT_MS).get()){}; } //the number of recv frames is the number for the first transport |