diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-12-13 16:47:54 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-12-13 16:47:54 -0800 |
| commit | 3edb85309d5b346cc23a1649a2312178d9fe953f (patch) | |
| tree | 79b0f4768a7e4f99080bf52f98f57f58efbbc43f /gr-uhd/lib/usrp_source_impl.cc | |
| parent | 043e9310bf35d9b31e304bc095b1f3d4004923b0 (diff) | |
| parent | 44393f4f009abf6603196f8667d9a440adcb1416 (diff) | |
Merge branch 'fix_thread_interrupt_uhd' of https://github.com/noc0lour/gnuradio into maint
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.cc')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index b48b15165d..e19367e51c 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -610,6 +610,7 @@ namespace gr { gr_vector_void_star &output_items) { boost::recursive_mutex::scoped_lock lock(d_mutex); + boost::this_thread::disable_interruption disable_interrupt; #ifdef GR_UHD_USE_STREAM_API //In order to allow for low-latency: //We receive all available packets without timeout. @@ -632,8 +633,8 @@ namespace gr { ::uhd::device::RECV_MODE_ONE_PACKET, 1.0); } #endif - - //handle possible errors conditions + boost::this_thread::restore_interruption restore_interrupt(disable_interrupt); + // handle possible errors conditions switch(_metadata.error_code) { case ::uhd::rx_metadata_t::ERROR_CODE_NONE: if(_tag_now) { |