diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-28 09:49:12 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-28 09:49:12 -0700 |
commit | 098dc3e01c86cad3d07d5632b674c04d2da65bdf (patch) | |
tree | d80f1020611223ffdecd75df5bbf41d80a133c5c /gnuradio-runtime/lib/tpb_thread_body.cc | |
parent | 082711cc3f7d910e50609695224e7a3c994a4c73 (diff) | |
parent | 10b7f835854f46ac390fdb6954d312a6b0ba30e9 (diff) |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-runtime/lib/tpb_thread_body.cc')
-rw-r--r-- | gnuradio-runtime/lib/tpb_thread_body.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc index 93591feee2..72fc671c40 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.cc +++ b/gnuradio-runtime/lib/tpb_thread_body.cc @@ -32,7 +32,7 @@ namespace gr { - tpb_thread_body::tpb_thread_body(block_sptr block, int max_noutput_items) + tpb_thread_body::tpb_thread_body(block_sptr block, gr::thread::barrier_sptr start_sync, int max_noutput_items) : d_exec(block, max_noutput_items) { //std::cerr << "tpb_thread_body: " << block << std::endl; @@ -92,6 +92,7 @@ namespace gr { // make sure our block isnt finished block->clear_finished(); + start_sync->wait(); while(1) { tpb_loop_top: boost::this_thread::interruption_point(); |