Reverted changeset r10451. Instead we will ensure top_block.stop() and wait() can...

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

diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.cc b/gnuradio-core/src/lib/runtime/gr_top_block.cc
index 3fa324257f0a33bed3be064536fb7f19baa60185..09e46dfbb4bbea367911cd3c25e3d994757bfd47 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_top_block.cc
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.cc
@@ -78,12 +78,6 @@ gr_top_block::run()
   wait();
 }
 
-bool
-gr_top_block::is_running()
-{
-  return d_impl->is_running();
-}
-
 void
 gr_top_block::lock()
 {

diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.h b/gnuradio-core/src/lib/runtime/gr_top_block.h
index 415bb21f2e8d49a7585706b66a7d17e137bdaa3c..b47ec019c8f68e0c38c4572145ded27cfff69080 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_top_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.h
@@ -77,11 +77,6 @@ public:
    */
   void wait();
 
-  /*!
-   * Is the flowgraph running?
-   */
-  bool is_running();
-
   /*!
    * Lock a flowgraph in preparation for reconfiguration.  When an equal
    * number of calls to lock() and unlock() have occurred, the flowgraph

diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.i b/gnuradio-core/src/lib/runtime/gr_top_block.i
index b5ced3cda653c97d39314477a0ee8aeb29d15041..670e5b5e54eb65ae37c955b67f20022b680787d4 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_top_block.i
+++ b/gnuradio-core/src/lib/runtime/gr_top_block.i
@@ -44,7 +44,6 @@ public:
   void stop();
   void wait();
   void run();
-  bool is_running();
   void lock();
   void unlock() throw (std::runtime_error);
   void dump();

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 97b19adad3b5cf98125b162739d3975178d1cb77..50d480d009e80875b02744740e84917837a33e0e 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
+++ b/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
@@ -87,12 +87,6 @@ gr_top_block_impl::~gr_top_block_impl()
   d_owner = 0;
 }
 
-bool
-gr_top_block_impl::is_running()
-{
-  return (d_state != IDLE);
-}
-
 void
 gr_top_block_impl::start()
 {

diff --git a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h b/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
index 794c4bc0d42d1aaae6d69a5e07e7c400c7556f2b..35fb44ef92ba7110c4c052e3c96d8a89573fcb8d 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
+++ b/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
@@ -60,9 +60,6 @@ public:
 
   // Dump the flowgraph to stdout
   void dump();
-
-  // Has flowgraph been started?
-  bool is_running();
   
 protected: