From 0d5947a0e8e7d6f86c7591a96d877dfe14b187e4 Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Mon, 10 Aug 2015 17:08:34 +0200
Subject: Ensure we have acquired the GIL before calling Python plugin 'run'
 method

---
 src/PluginAlgorithm.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/PluginAlgorithm.cpp b/src/PluginAlgorithm.cpp
index 4066e30..e79c77b 100644
--- a/src/PluginAlgorithm.cpp
+++ b/src/PluginAlgorithm.cpp
@@ -112,12 +112,14 @@ bool CPluginAlgorithm::initialize(const Config& _cfg){
 
 void CPluginAlgorithm::run(int _iNrIterations){
     if(instance==NULL) return;
+    PyGILState_STATE state = PyGILState_Ensure();
     PyObject *retVal = PyObject_CallMethod(instance, "run", "i",_iNrIterations);
     if(retVal==NULL){
         logPythonError();
-        return;
+    }else{
+        Py_DECREF(retVal);
     }
-    Py_DECREF(retVal);
+    PyGILState_Release(state);
 }
 
 void fixLapackLoading(){
@@ -147,7 +149,10 @@ void fixLapackLoading(){
 }
 
 CPluginAlgorithmFactory::CPluginAlgorithmFactory(){
-    Py_Initialize();
+    if(!Py_IsInitialized()){
+        Py_Initialize();
+        PyEval_InitThreads();
+    }
 #ifndef _MSC_VER
     if(astra::running_in_matlab) fixLapackLoading();
 #endif
-- 
cgit v1.2.3