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

[jcorgan]

Author: jcorgan
Date: 2008-02-05 09:54:24 -0700 (Tue, 05 Feb 2008)
New Revision: 7565

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i
   gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc
Log:
Fixes abort issue in gr.top_block exception handling, improve some exception 
messages.

Modified: gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i 2008-02-05 
06:47:55 UTC (rev 7564)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block.i 2008-02-05 
16:54:24 UTC (rev 7565)
@@ -40,12 +40,12 @@
 public:
   ~gr_top_block();
 
-  void start();
+  void start() throw (std::runtime_error);
   void stop();
   void wait();
   void run();
   void lock();
-  void unlock();
+  void unlock() throw (std::runtime_error);
   bool is_running();
 };
 

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   
2008-02-05 06:47:55 UTC (rev 7564)
+++ gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc   
2008-02-05 16:54:24 UTC (rev 7565)
@@ -77,7 +77,7 @@
     d_lock_count(0)
 {
   if (s_impl)
-    throw std::logic_error("gr_top_block_impl: multiple simultaneous 
gr_top_block's");
+    throw std::logic_error("gr_top_block_impl: multiple simultaneous 
gr_top_blocks not allowed");
 
   s_impl = this;
 }
@@ -95,7 +95,7 @@
     std::cout << "start: entered " << this << std::endl;
 
   if (d_running)
-    throw std::runtime_error("already running");
+    throw std::runtime_error("top block already running or wait() not called 
after previous stop()");
 
   // Create new flat flow graph by flattening hierarchy
   d_ffg = d_owner->flatten();
@@ -203,7 +203,7 @@
     std::cout << "restart: entered" << std::endl;
 
   if (!d_running)
-    throw std::runtime_error("not running");
+    throw std::runtime_error("top block is not running");
 
   // Stop scheduler threads and wait for completion
   stop();