diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gnuradio-runtime/lib/gr_basic_block.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib/gr_basic_block.cc')
| -rw-r--r-- | gnuradio-runtime/lib/gr_basic_block.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/gr_basic_block.cc b/gnuradio-runtime/lib/gr_basic_block.cc index 35ea797167..83f6c07c87 100644 --- a/gnuradio-runtime/lib/gr_basic_block.cc +++ b/gnuradio-runtime/lib/gr_basic_block.cc @@ -182,7 +182,7 @@ gr_basic_block::_post(pmt::pmt_t which_port, pmt::pmt_t msg) void gr_basic_block::insert_tail(pmt::pmt_t which_port, pmt::pmt_t msg) { - gruel::scoped_lock guard(mutex); + 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())){ std::cout << "target port = " << pmt::symbol_to_string(which_port) << std::endl; @@ -199,7 +199,7 @@ gr_basic_block::insert_tail(pmt::pmt_t which_port, pmt::pmt_t msg) pmt::pmt_t gr_basic_block::delete_head_nowait(pmt::pmt_t which_port) { - gruel::scoped_lock guard(mutex); + gr::thread::scoped_lock guard(mutex); if (empty_p(which_port)){ return pmt::pmt_t(); @@ -214,7 +214,7 @@ gr_basic_block::delete_head_nowait(pmt::pmt_t which_port) pmt::pmt_t gr_basic_block::delete_head_blocking(pmt::pmt_t which_port) { - gruel::scoped_lock guard(mutex); + gr::thread::scoped_lock guard(mutex); while (empty_p(which_port)){ msg_queue_ready[which_port]->wait(guard); |