From 002e7a2b4a8630599849ee2bb488cf62ffbd8757 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Mon, 23 Feb 2009 02:14:39 +0000 Subject: [PATCH] Reverted changeset r10451. Instead we will ensure top_block.stop() and wait() can be called on a stopped flowgraph with no ill effects. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10478 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/runtime/gr_top_block.cc | 6 ------ gnuradio-core/src/lib/runtime/gr_top_block.h | 5 ----- gnuradio-core/src/lib/runtime/gr_top_block.i | 1 - gnuradio-core/src/lib/runtime/gr_top_block_impl.cc | 6 ------ gnuradio-core/src/lib/runtime/gr_top_block_impl.h | 3 --- 5 files changed, 21 deletions(-) diff --git a/gnuradio-core/src/lib/runtime/gr_top_block.cc b/gnuradio-core/src/lib/runtime/gr_top_block.cc index 3fa32425..09e46dfb 100644 --- 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 415bb21f..b47ec019 100644 --- 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 b5ced3cd..670e5b5e 100644 --- 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 97b19ada..50d480d0 100644 --- 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 794c4bc0..35fb44ef 100644 --- 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: -- 2.47.2