[Commit-gnuradio] r8704 - gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2008-06-25 13:58:54 -0600 (Wed, 25 Jun 2008)
New Revision: 8704

Modified:
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.cc
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.h
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.i
   
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
Log:
Applied changeset r8466 on trunk to release branch.

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.cc
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.cc    
    2008-06-25 19:40:43 UTC (rev 8703)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.cc    
    2008-06-25 19:58:54 UTC (rev 8704)
@@ -90,6 +90,12 @@
   d_impl->unlock();
 }
 
+void
+gr_top_block::dump()
+{
+  d_impl->dump();
+}
+
 bool
 gr_top_block::is_running()
 {

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.h
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.h 
2008-06-25 19:40:43 UTC (rev 8703)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.h 
2008-06-25 19:58:54 UTC (rev 8704)
@@ -100,6 +100,11 @@
   virtual void unlock();
 
   /*!
+   * Displays flattened flowgraph edges and block connectivity
+   */
+  void dump();
+
+  /*!
    * Returns true if flowgraph is running
    */
   bool is_running();

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.i
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.i 
2008-06-25 19:40:43 UTC (rev 8703)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.i 
2008-06-25 19:58:54 UTC (rev 8704)
@@ -47,6 +47,7 @@
   void lock();
   void unlock() throw (std::runtime_error);
   bool is_running();
+  void dump();
 };
 
 %inline %{

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   2008-06-25 19:40:43 UTC (rev 8703)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
   2008-06-25 19:58:54 UTC (rev 8704)
@@ -231,3 +231,10 @@
 
   start_threads();
 }
+
+void
+gr_top_block_impl::dump()
+{
+  if (d_ffg)
+    d_ffg->dump();
+}

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
    2008-06-25 19:40:43 UTC (rev 8703)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.h
    2008-06-25 19:58:54 UTC (rev 8704)
@@ -54,6 +54,9 @@
   // Unlock the top block at end of reconfiguration
   void unlock();
 
+  // Dump the flowgraph to stdout
+  void dump();
+
   // Return true if flowgraph is running
   bool is_running() const { return d_running; }