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_block_executor.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_block_executor.cc')
| -rw-r--r-- | gnuradio-runtime/lib/gr_block_executor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/gr_block_executor.cc b/gnuradio-runtime/lib/gr_block_executor.cc index e070f3c508..cfef406412 100644 --- a/gnuradio-runtime/lib/gr_block_executor.cc +++ b/gnuradio-runtime/lib/gr_block_executor.cc @@ -71,7 +71,7 @@ min_available_space (gr_block_detail *d, int output_multiple, int min_noutput_it if (min_noutput_items == 0) min_noutput_items = 1; for (int i = 0; i < d->noutputs (); i++){ - gruel::scoped_lock guard(*d->output(i)->mutex()); + gr::thread::scoped_lock guard(*d->output(i)->mutex()); int avail_n = round_down(d->output(i)->space_available(), output_multiple); int best_n = round_down(d->output(i)->bufsize()/2, output_multiple); if (best_n < min_noutput_items) @@ -239,7 +239,7 @@ gr_block_executor::run_one_iteration() /* * Acquire the mutex and grab local copies of items_available and done. */ - gruel::scoped_lock guard(*d->input(i)->mutex()); + gr::thread::scoped_lock guard(*d->input(i)->mutex()); d_ninput_items[i] = d->input(i)->items_available(); d_input_done[i] = d->input(i)->done(); } @@ -283,7 +283,7 @@ gr_block_executor::run_one_iteration() /* * Acquire the mutex and grab local copies of items_available and done. */ - gruel::scoped_lock guard(*d->input(i)->mutex()); + gr::thread::scoped_lock guard(*d->input(i)->mutex()); d_ninput_items[i] = d->input(i)->items_available (); d_input_done[i] = d->input(i)->done(); } |