[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r7053 - in gnuradio/trunk: . gnuradio-core/src/lib/run
From: |
eb |
Subject: |
[Commit-gnuradio] r7053 - in gnuradio/trunk: . gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr |
Date: |
Wed, 28 Nov 2007 18:07:01 -0700 (MST) |
Author: eb
Date: 2007-11-28 18:07:00 -0700 (Wed, 28 Nov 2007)
New Revision: 7053
Modified:
gnuradio/trunk/configure.ac
gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py
Log:
fixes ticket:211
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2007-11-28 19:23:01 UTC (rev 7052)
+++ gnuradio/trunk/configure.ac 2007-11-29 01:07:00 UTC (rev 7053)
@@ -66,7 +66,7 @@
swig_CXXFLAGS="-g1 -O2"
;;
*)
- swig_CXXFLAGS="-g1 -O1"
+ swig_CXXFLAGS="-g -O1"
;;
esac
fi
Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
2007-11-28 19:23:01 UTC (rev 7052)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
2007-11-29 01:07:00 UTC (rev 7053)
@@ -92,7 +92,7 @@
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 @@
if (*p)
(*p)->stop();
}
- d_running = false;
}
void
@@ -165,6 +164,7 @@
}
d_threads.clear();
+ d_running = false;
}
// N.B. lock() and unlock() cannot be called from a flow graph thread or
Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py
2007-11-28 19:23:01 UTC (rev 7052)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_stream_mux.py
2007-11-29 01:07:00 UTC (rev 7053)
@@ -165,7 +165,4 @@
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()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r7053 - in gnuradio/trunk: . gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr,
eb <=