diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
| commit | 9f29e51f2945f355b43f3012da43e37dcd95f6b4 (patch) | |
| tree | bcc71c8975379c107bb6e94da944292a5ee9a03a /gnuradio-core/src/lib/runtime/gr_block.h | |
| parent | 7afefc484137bf0bed7ab9a7ed86017c117d6a35 (diff) | |
| parent | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (diff) | |
Merge branch 'next' into perf_monitor
Diffstat (limited to 'gnuradio-core/src/lib/runtime/gr_block.h')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h index 034f6136d9..acd938080a 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.h +++ b/gnuradio-core/src/lib/runtime/gr_block.h @@ -628,6 +628,12 @@ class GR_CORE_API gr_block : public gr_basic_block { std::vector<long> d_max_output_buffer; std::vector<long> d_min_output_buffer; + /*! Used by block's setters and work functions to make + * setting/resetting of parameters thread-safe. + * + * Used by calling gruel::scoped_lock l(d_setlock); + */ + gruel::mutex d_setlock; // These are really only for internal use, but leaving them public avoids // having to work up an ever-varying list of friend GR_CORE_APIs |