From: Johnathan Corgan Date: Sun, 16 Aug 2009 01:06:37 +0000 (-0700) Subject: Merged changes from svn repository trunk. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c9ad0211dac1721ec3f834bb14e71ca50e801721;p=debian%2Fgnuradio Merged changes from svn repository trunk. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11601 221aa14e-8319-0410-a670-987f0aec2ac5 Signed-off-by: Johnathan Corgan --- c9ad0211dac1721ec3f834bb14e71ca50e801721 diff --cc gnuradio-core/src/lib/runtime/gr_block_detail.cc index f36a6c21,d33dfed8..38d4a13c --- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc +++ b/gnuradio-core/src/lib/runtime/gr_block_detail.cc @@@ -112,9 -102,14 +112,16 @@@ gr_block_detail::produce (int which_out void gr_block_detail::produce_each (int how_many_items) { - if (how_many_items > 0) + if (how_many_items > 0){ for (int i = 0; i < noutputs (); i++) d_output[i]->update_write_pointer (how_many_items); + d_produce_or |= how_many_items; + } } + + + void + gr_block_detail::_post(pmt::pmt_t msg) + { + d_tpb.insert_tail(msg); + } diff --cc gnuradio-core/src/lib/runtime/gr_block_detail.h index f32a875e,9d635860..c5787a5a --- a/gnuradio-core/src/lib/runtime/gr_block_detail.h +++ b/gnuradio-core/src/lib/runtime/gr_block_detail.h @@@ -83,10 -78,14 +83,13 @@@ class gr_block_detail */ void produce_each (int how_many_items); -- + /*! + * Accept msg, place in queue, arrange for thread to be awakened if it's not already. + */ + void _post(pmt::pmt_t msg); - gr_tpb_detail d_tpb; // used by thread-per-block scheduler + int d_produce_or; // ----------------------------------------------------------------------------