summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib/gr_basic_block.cc
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-03-29 17:31:06 -0400
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-01 16:23:06 -0700
commitf74d3dae8f2ec423c61932b4ad0359f98b996a51 (patch)
tree1e16eb3537829248c177b04209acce3fe2bead96 /gnuradio-runtime/lib/gr_basic_block.cc
parenteea0e411411303ea94953c5cd8454c4139a474ff (diff)
gruel: moved gruel into subdirs of gnuradio-runtime.
PMTs are handled slightly different and are installed into their own module and include dir.
Diffstat (limited to 'gnuradio-runtime/lib/gr_basic_block.cc')
-rw-r--r--gnuradio-runtime/lib/gr_basic_block.cc6
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);