diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-30 15:03:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-30 15:03:04 -0700 |
| commit | ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e (patch) | |
| tree | 111e27a507d711f890f99ea47c57f25757482e03 /host/lib/transport/zero_copy.cpp | |
| parent | 507283b3d43d653bf7ff1b2aa04f3d642297c9b1 (diff) | |
| parent | 790a5ac665144180cde712d46b799a115bb74e46 (diff) | |
| download | uhd-ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e.tar.gz uhd-ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e.tar.bz2 uhd-ccb7adcb150ae481ce08d4e0fa32641b5aec4e6e.zip | |
Merge branch 'master' into usrp_e_next
Diffstat (limited to 'host/lib/transport/zero_copy.cpp')
| -rw-r--r-- | host/lib/transport/zero_copy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/transport/zero_copy.cpp b/host/lib/transport/zero_copy.cpp index 8a1cde694..1fcf846a0 100644 --- a/host/lib/transport/zero_copy.cpp +++ b/host/lib/transport/zero_copy.cpp @@ -68,12 +68,12 @@ phony_zero_copy_recv_if::~phony_zero_copy_recv_if(void){ /* NOP */ } -managed_recv_buffer::sptr phony_zero_copy_recv_if::get_recv_buff(void){ +managed_recv_buffer::sptr phony_zero_copy_recv_if::get_recv_buff(size_t timeout_ms){ //allocate memory boost::uint8_t *recv_mem = new boost::uint8_t[_impl->max_buff_size]; //call recv() with timeout option - ssize_t num_bytes = this->recv(boost::asio::buffer(recv_mem, _impl->max_buff_size)); + ssize_t num_bytes = this->recv(boost::asio::buffer(recv_mem, _impl->max_buff_size), timeout_ms); if (num_bytes <= 0) return managed_recv_buffer::sptr(); //NULL sptr |