diff options
| author | jcorgan | 2006-12-14 16:28:36 +0000 |
|---|---|---|
| committer | jcorgan | 2006-12-14 16:28:36 +0000 |
| commit | 65ee33a8122bf23dad5721ff115e80ae7bb8e523 (patch) | |
| tree | 1da761293ae5dd802a757e85f6e0983988c2a740 /gnuradio-core/src/lib/runtime | |
| parent | 0bcd3eef3ddd18fd190a459923920a59287b7485 (diff) | |
| download | gnuradio-65ee33a8122bf23dad5721ff115e80ae7bb8e523.tar.gz gnuradio-65ee33a8122bf23dad5721ff115e80ae7bb8e523.tar.bz2 gnuradio-65ee33a8122bf23dad5721ff115e80ae7bb8e523.zip | |
Merged jcorgan/sfg changeset r4082 into trunk (fixes gr.runtime parameter typing issue)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4083 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/runtime')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_runtime.i | 13 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_runtime_impl.cc | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_runtime.i b/gnuradio-core/src/lib/runtime/gr_runtime.i index 496adff37..2933c7187 100644 --- a/gnuradio-core/src/lib/runtime/gr_runtime.i +++ b/gnuradio-core/src/lib/runtime/gr_runtime.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004 Free Software Foundation, Inc. + * Copyright 2004,2006 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,7 +24,6 @@ class gr_runtime; typedef boost::shared_ptr<gr_runtime> gr_runtime_sptr; %template(gr_runtime_sptr) boost::shared_ptr<gr_runtime>; -%rename(runtime) gr_make_runtime; gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block); class gr_runtime @@ -33,10 +32,8 @@ protected: gr_runtime(gr_hier_block2_sptr top_block); public: - void start() - throw (std::runtime_error); - void stop(); - void wait(); - void run() - throw (std::runtime_error); + void run() throw (std::runtime_error); + void start() throw (std::runtime_error); + void stop() throw (std::runtime_error); + void wait() throw (std::runtime_error); }; diff --git a/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc b/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc index 2b104cd99..ffc897b8b 100644 --- a/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc +++ b/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc @@ -76,7 +76,7 @@ void gr_runtime_impl::stop() { if (!d_running) - return; + throw std::runtime_error("not running"); for (gr_scheduler_thread_viter_t p = d_threads.begin(); p != d_threads.end(); p++) |