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 /gr-blocks/lib/file_source_impl.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/file_source_impl.cc')
| -rw-r--r-- | gr-blocks/lib/file_source_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-blocks/lib/file_source_impl.cc b/gr-blocks/lib/file_source_impl.cc index dcbd042106..3c30884a59 100644 --- a/gr-blocks/lib/file_source_impl.cc +++ b/gr-blocks/lib/file_source_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gruel/thread.h> +#include <thread/thread.h> #include "file_source_impl.h" #include <gr_io_signature.h> #include <cstdio> @@ -85,7 +85,7 @@ namespace gr { file_source_impl::open(const char *filename, bool repeat) { // obtain exclusive access for duration of this function - gruel::scoped_lock lock(fp_mutex); + gr::thread::scoped_lock lock(fp_mutex); int fd; @@ -114,7 +114,7 @@ namespace gr { file_source_impl::close() { // obtain exclusive access for duration of this function - gruel::scoped_lock lock(fp_mutex); + gr::thread::scoped_lock lock(fp_mutex); if(d_new_fp != NULL) { fclose(d_new_fp); @@ -127,7 +127,7 @@ namespace gr { file_source_impl::do_update() { if(d_updated) { - gruel::scoped_lock lock(fp_mutex); // hold while in scope + gr::thread::scoped_lock lock(fp_mutex); // hold while in scope if(d_fp) fclose(d_fp); @@ -151,7 +151,7 @@ namespace gr { if(d_fp == NULL) throw std::runtime_error("work with file not open"); - gruel::scoped_lock lock(fp_mutex); // hold for the rest of this function + gr::thread::scoped_lock lock(fp_mutex); // hold for the rest of this function while(size) { i = fread(o, d_itemsize, size, (FILE*)d_fp); |