diff options
author | Ben Reynwar <ben@reynwar.net> | 2013-06-03 10:31:25 -0700 |
---|---|---|
committer | Ben Reynwar <ben@reynwar.net> | 2013-06-03 10:31:25 -0700 |
commit | 6ee7c1a6267e823d5525d3d5cf251ba52b12c823 (patch) | |
tree | 9a6b39ae056aab1f399c82b4108ac05ba2c6ea05 /gr-blocks/lib/udp_source_impl.cc | |
parent | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (diff) | |
parent | d1b65f4125aee94442c68d53f503bb29cdc10330 (diff) |
Merged in master.
Diffstat (limited to 'gr-blocks/lib/udp_source_impl.cc')
-rw-r--r-- | gr-blocks/lib/udp_source_impl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gr-blocks/lib/udp_source_impl.cc b/gr-blocks/lib/udp_source_impl.cc index e62c2b0df1..7f4a2af3d3 100644 --- a/gr-blocks/lib/udp_source_impl.cc +++ b/gr-blocks/lib/udp_source_impl.cc @@ -186,7 +186,9 @@ namespace gr { // because the conditional wait is interruptable while a // synchronous receive_from is not. boost::unique_lock<boost::mutex> lock(d_udp_mutex); - d_cond_wait.wait(lock); + + //use timed_wait to avoid permanent blocking in the work function + d_cond_wait.timed_wait(lock, boost::posix_time::milliseconds(10)); if(d_residual < 0) return -1; |