Changeset 7659

Show
Ignore:
Timestamp:
02/13/08 11:55:29
Author:
jcorgan
Message:

Applied changeset r7565 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block.i

    r6787 r7659  
    4141  ~gr_top_block(); 
    4242 
    43   void start()
     43  void start() throw (std::runtime_error)
    4444  void stop(); 
    4545  void wait(); 
    4646  void run(); 
    4747  void lock(); 
    48   void unlock()
     48  void unlock() throw (std::runtime_error)
    4949  bool is_running(); 
    5050}; 
  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc

    r6201 r7659  
    7878{ 
    7979  if (s_impl) 
    80     throw std::logic_error("gr_top_block_impl: multiple simultaneous gr_top_block's"); 
     80    throw std::logic_error("gr_top_block_impl: multiple simultaneous gr_top_blocks not allowed"); 
    8181 
    8282  s_impl = this; 
     
    9696 
    9797  if (d_running) 
    98     throw std::runtime_error("already running"); 
     98    throw std::runtime_error("top block already running or wait() not called after previous stop()"); 
    9999 
    100100  // Create new flat flow graph by flattening hierarchy 
     
    204204 
    205205  if (!d_running) 
    206     throw std::runtime_error("not running"); 
     206    throw std::runtime_error("top block is not running"); 
    207207 
    208208  // Stop scheduler threads and wait for completion