fixes ticket:211

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7053 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/configure.ac b/configure.ac
index 21ac7ce13f059ba1ab3f304d31b4042e4e141f62..d8037694579c4b2a5612b1851472432def49523c 100644 (file)
--- 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 340e81afd92323f88a2a9f1a8288b96a849243e6..ffdcbdb7adacc82dc18e8e54be2f7ee072d1a643 100644 (file)
--- 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 a665e18ac244f1152b7bc4b61f4863df01649d28..8a76f8144d78e4945164560bfd9c1cd60459c638 100755 (executable)
--- 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()