diff options
| author | eb | 2007-11-29 01:07:00 +0000 |
|---|---|---|
| committer | eb | 2007-11-29 01:07:00 +0000 |
| commit | e01b98864f8dadc486e8f0c57ad69205944391a2 (patch) | |
| tree | c60be8651fa5caa98122726e82ea3b6c6f333df9 /gnuradio-core/src | |
| parent | 8f1eabe43be4b90ecfdbb501bc7fe8cd033e5357 (diff) | |
| download | gnuradio-e01b98864f8dadc486e8f0c57ad69205944391a2.tar.gz gnuradio-e01b98864f8dadc486e8f0c57ad69205944391a2.tar.bz2 gnuradio-e01b98864f8dadc486e8f0c57ad69205944391a2.zip | |
fixes ticket:211
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7053 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_top_block_impl.cc | 4 | ||||
| -rwxr-xr-x | gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc b/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc index 340e81afd..ffdcbdb7a 100644 --- a/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc +++ b/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc @@ -92,7 +92,7 @@ void gr_top_block_impl::start() { if (GR_TOP_BLOCK_IMPL_DEBUG) - std::cout << "start: entered" << std::endl; + std::cout << "start: entered " << this << std::endl; if (d_running) throw std::runtime_error("already running"); @@ -143,7 +143,6 @@ gr_top_block_impl::stop() if (*p) (*p)->stop(); } - d_running = false; } void @@ -165,6 +164,7 @@ gr_top_block_impl::wait() } d_threads.clear(); + d_running = false; } // N.B. lock() and unlock() cannot be called from a flow graph thread or diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py b/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py index a665e18ac..8a76f8144 100755 --- a/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py +++ b/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py @@ -165,7 +165,4 @@ class test_head (gr_unittest.TestCase): self.assertEqual (exp_data, result_data) if __name__ == '__main__': - pass - # Note: disabled until segfault issue is resolved - # FIXME: See ticket:211 - # gr_unittest.main () + gr_unittest.main() |