[Commit-gnuradio] r10478 - gnuradio/trunk/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2009-02-22 19:14:39 -0700 (Sun, 22 Feb 2009)
New Revision: 10478

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.cc
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.h
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
Log:
Reverted changeset r10451.  Instead we will ensure top_block.stop() and wait() 
can be called on a stopped flowgraph with no ill effects.

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.cc        
2009-02-23 02:08:43 UTC (rev 10477)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.cc        
2009-02-23 02:14:39 UTC (rev 10478)
@@ -78,12 +78,6 @@
   wait();
 }
 
-bool
-gr_top_block::is_running()
-{
-  return d_impl->is_running();
-}
-
 void
 gr_top_block::lock()
 {

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.h 2009-02-23 
02:08:43 UTC (rev 10477)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.h 2009-02-23 
02:14:39 UTC (rev 10478)
@@ -78,11 +78,6 @@
   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
    * will be restarted automatically.

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i 2009-02-23 
02:08:43 UTC (rev 10477)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i 2009-02-23 
02:14:39 UTC (rev 10478)
@@ -44,7 +44,6 @@
   void stop();
   void wait();
   void run();
-  bool is_running();
   void lock();
   void unlock() throw (std::runtime_error);
   void dump();

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   
2009-02-23 02:08:43 UTC (rev 10477)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc   
2009-02-23 02:14:39 UTC (rev 10478)
@@ -87,12 +87,6 @@
   d_owner = 0;
 }
 
-bool
-gr_top_block_impl::is_running()
-{
-  return (d_state != IDLE);
-}
-
 void
 gr_top_block_impl::start()
 {

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.h    
2009-02-23 02:08:43 UTC (rev 10477)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.h    
2009-02-23 02:14:39 UTC (rev 10478)
@@ -60,9 +60,6 @@
 
   // Dump the flowgraph to stdout
   void dump();
-
-  // Has flowgraph been started?
-  bool is_running();
   
 protected: