diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -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 |
3 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 21ac7ce13..d80376945 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ if test "$user_set_cxxflags" != yes; then swig_CXXFLAGS="-g1 -O2" ;; *) - swig_CXXFLAGS="-g1 -O1" + swig_CXXFLAGS="-g -O1" ;; esac fi 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() |