diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 17:31:06 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:23:06 -0700 |
| commit | f74d3dae8f2ec423c61932b4ad0359f98b996a51 (patch) | |
| tree | 1e16eb3537829248c177b04209acce3fe2bead96 /gnuradio-runtime/lib/gr_block_executor.cc | |
| parent | eea0e411411303ea94953c5cd8454c4139a474ff (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_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(); } |