diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-26 12:21:02 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-26 12:21:02 -0500 |
| commit | d0d1348a08db382e1497e4a929f2ec22b35b8f0a (patch) | |
| tree | 0f6f529cfd42446b20f68b6a6dd940ddb897563c /gnuradio-core/src/lib/runtime | |
| parent | 38d82bad2cfbcbb9575af54bf29e96476dee4117 (diff) | |
| parent | d8e73d63c0af6ba6810319d866cab07b332d0e42 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -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 |