Ensure Python interpreter lock gets reacquired when an exception is thrown.

d96606e2 · Peter Eastman · 53d469c5 · d96606e2
Commit d96606e2 authored Apr 29, 2013 by Peter Eastman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

wrappers/python/src/swig_doxygen/swig_lib/python/exceptions.i ...pers/python/src/swig_doxygen/swig_lib/python/exceptions.i +6 -4

No files found.
--- a/wrappers/python/src/swig_doxygen/swig_lib/python/exceptions.i
+++ b/wrappers/python/src/swig_doxygen/swig_lib/python/exceptions.i
@@ -9,23 +9,25 @@
 }
 %exception *::step {
+    PyThreadState* _savePythonThreadState = PyEval_SaveThread();
    try {
-        Py_BEGIN_ALLOW_THREADS
        $action
-        Py_END_ALLOW_THREADS
    } catch (std::exception &e) {
+        PyEval_RestoreThread(_savePythonThreadState);
        PyErr_SetString(PyExc_Exception, const_cast<char*>(e.what()));
        return NULL;
    }
+    PyEval_RestoreThread(_savePythonThreadState);
 }
 %exception OpenMM::LocalEnergyMinimizer::minimize {
+    PyThreadState* _savePythonThreadState = PyEval_SaveThread();
    try {
-        Py_BEGIN_ALLOW_THREADS
        $action
-        Py_END_ALLOW_THREADS
    } catch (std::exception &e) {
+        PyEval_RestoreThread(_savePythonThreadState);
        PyErr_SetString(PyExc_Exception, const_cast<char*>(e.what()));
        return NULL;
    }
+    PyEval_RestoreThread(_savePythonThreadState);
 }