Ticket #364: python.i-diff-against-reformatted-original.patch

(a) reformatted-python.i.orig vs. (b) python.i

@@ -28 +28 @@
  * overhead of thread locking when the user's code isn't using threads. */
 #define SWIG_PYTHON_NO_USE_GIL
 
+static __thread PyThreadState * swig_pythreadstate = NULL;
+
 class XapianSWIG_Python_Thread_Block {
     bool status;
-    PyGILState_STATE state;
   public:
     XapianSWIG_Python_Thread_Block()
-        : status(PyEval_ThreadsInitialized()) {
+        : status(PyEval_ThreadsInitialized() && swig_pythreadstate) {
         if (status) {
-            state = PyGILState_Ensure();
+            PyEval_RestoreThread(swig_pythreadstate);
+            swig_pythreadstate = NULL;
         }
     }
     void end() {
         if (status) {
-            PyGILState_Release(state);
+            if (swig_pythreadstate) Py_FatalError("swig_pythreadstate set in XapianSWIG_Python_Thread_Block::end()");
+            swig_pythreadstate = PyEval_SaveThread();
             status = false;
         }
     }
@@ -49 +52 @@
 
 class XapianSWIG_Python_Thread_Allow {
     bool status;
-    PyThreadState *save;
   public:
     XapianSWIG_Python_Thread_Allow() : status(PyEval_ThreadsInitialized()) {
         if (status) {
-            save = PyEval_SaveThread();
+            if (swig_pythreadstate) Py_FatalError("swig_pythreadstate set in XapianSWIG_Python_Thread_Allow ctor");
+            swig_pythreadstate = PyEval_SaveThread();
         }
     }
     void end() {
         if (status) {
-            PyEval_RestoreThread(save);
+            if (!swig_pythreadstate) Py_FatalError("swig_pythreadstate unset in XapianSWIG_Python_Thread_Block::end()");
+            PyEval_RestoreThread(swig_pythreadstate);
+            swig_pythreadstate = NULL;
             status = false;
         }
     }