diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-03-21 18:18:25 +0100 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-04-05 07:15:18 -0400 |
| commit | 9ff812715657f964e7a7a7256c4600353d43b741 (patch) | |
| tree | 8626cbcc517c12962e5ef64c9483ba0e55716119 | |
| parent | 85a7326c934c8e94d0fc89b6b221c1f4c5307cdc (diff) | |
runtime: remove ready message receiver queue remnant from basic_block
5197311dd22744b784ff9ae2cd965a26ef04f4a4 removed the blocking wait, which utilized this. Time for this to go.
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/basic_block.h | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/basic_block.cc | 6 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/basic_block_python.cc | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h index 300187af6a..7a265cd05e 100644 --- a/gnuradio-runtime/include/gnuradio/basic_block.h +++ b/gnuradio-runtime/include/gnuradio/basic_block.h @@ -52,8 +52,6 @@ private: typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comparator> msg_queue_map_t; typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comparator>::iterator msg_queue_map_itr; - std::map<pmt::pmt_t, std::shared_ptr<boost::condition_variable>, pmt::comparator> - msg_queue_ready; gr::thread::mutex mutex; //< protects all vars diff --git a/gnuradio-runtime/lib/basic_block.cc b/gnuradio-runtime/lib/basic_block.cc index f3a06476b4..6061026a56 100644 --- a/gnuradio-runtime/lib/basic_block.cc +++ b/gnuradio-runtime/lib/basic_block.cc @@ -75,8 +75,6 @@ void basic_block::message_port_register_in(pmt::pmt_t port_id) throw std::runtime_error("message_port_register_in: bad port id"); } msg_queue[port_id] = msg_queue_t(); - msg_queue_ready[port_id] = - std::shared_ptr<boost::condition_variable>(new boost::condition_variable()); } pmt::pmt_t basic_block::message_ports_in() @@ -176,8 +174,7 @@ void basic_block::insert_tail(pmt::pmt_t which_port, pmt::pmt_t msg) { gr::thread::scoped_lock guard(mutex); - if ((msg_queue.find(which_port) == msg_queue.end()) || - (msg_queue_ready.find(which_port) == msg_queue_ready.end())) { + if (msg_queue.find(which_port) == msg_queue.end()) { GR_LOG_ERROR(d_logger, std::string("attempted insertion on invalid queue ") + pmt::symbol_to_string(which_port)); @@ -185,7 +182,6 @@ void basic_block::insert_tail(pmt::pmt_t which_port, pmt::pmt_t msg) } msg_queue[which_port].push_back(msg); - msg_queue_ready[which_port]->notify_one(); // wake up thread if BLKD_IN or BLKD_OUT global_block_registry.notify_blk(d_symbol_name); diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/basic_block_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/basic_block_python.cc index 1d57787025..f18fce2c9a 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/basic_block_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/basic_block_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(basic_block.h) */ -/* BINDTOOL_HEADER_FILE_HASH(26ded167bb79b740fd37685f86fd553e) */ +/* BINDTOOL_HEADER_FILE_HASH(9239cc3381582f5f44010485cd48fa72) */ /***********************************************************************************/ #include <pybind11/complex.h> |