diff options
| author | Tom Rondeau | 2012-03-16 16:57:38 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-03-16 16:57:38 -0400 |
| commit | fcdac045ad64099949dbbefff25832a6dcef3187 (patch) | |
| tree | f0f793f25b942f2f83f2cd754b3b924f9593dfcf /gnuradio-core/src/lib | |
| parent | b5dbeb3f02b7e230f0e8fd49640047a04c6908b6 (diff) | |
| parent | 74f7c070339a3bb4ba2b6f2e17c66583ba4c0104 (diff) | |
| download | gnuradio-fcdac045ad64099949dbbefff25832a6dcef3187.tar.gz gnuradio-fcdac045ad64099949dbbefff25832a6dcef3187.tar.bz2 gnuradio-fcdac045ad64099949dbbefff25832a6dcef3187.zip | |
Merge branch 'master' into next
Conflicts:
gruel/src/swig/Makefile.am
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_msg_queue.i | 14 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 18 |
2 files changed, 8 insertions, 24 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_msg_queue.i b/gnuradio-core/src/lib/runtime/gr_msg_queue.i index c9214bef3..0a4eda78a 100644 --- a/gnuradio-core/src/lib/runtime/gr_msg_queue.i +++ b/gnuradio-core/src/lib/runtime/gr_msg_queue.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005,2009,2010 Free Software Foundation, Inc. + * Copyright 2005,2009,2010,2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -85,16 +85,16 @@ public: %inline %{ gr_message_sptr gr_py_msg_queue__delete_head(gr_msg_queue_sptr q) { gr_message_sptr msg; - Py_BEGIN_ALLOW_THREADS; // release global interpreter lock - msg = q->delete_head(); // possibly blocking call - Py_END_ALLOW_THREADS; // acquire global interpreter lock + GR_PYTHON_BLOCKING_CODE( + msg = q->delete_head(); + ) return msg; } void gr_py_msg_queue__insert_tail(gr_msg_queue_sptr q, gr_message_sptr msg) { - Py_BEGIN_ALLOW_THREADS; // release global interpreter lock - q->insert_tail(msg); // possibly blocking call - Py_END_ALLOW_THREADS; // acquire global interpreter lock + GR_PYTHON_BLOCKING_CODE( + q->insert_tail(msg); + ) } %} diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index e365aeac7..972d56c84 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -25,23 +25,7 @@ // SWIG interface definition //////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////// -// Language independent exception handler -//////////////////////////////////////////////////////////////////////// -%include exception.i - -%exception { - try { - $action - } - catch(std::exception &e) { - SWIG_exception(SWIG_RuntimeError, e.what()); - } - catch(...) { - SWIG_exception(SWIG_RuntimeError, "Unknown exception"); - } - -} +%include <gruel_common.i> //////////////////////////////////////////////////////////////////////// // Headers |