Ticket #364: python-multiinterpreter-locking.patch

xapian-bindings/python/python.i

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

xapian-bindings/python/pythontest2.py

@@ -19 +19 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
 # USA
 
+import thread
 import gc
 import os
 import random
@@ -1628 +1629 @@
     check_missing(titer, 'positionlist_end')
 
 # Run all tests (ie, callables with names starting "test_").
-if not runtests(globals(), sys.argv[1:]):
-    sys.exit(1)
+def f():
+    if not runtests(globals(), sys.argv[1:]):
+        sys.exit(1)
+
+thread.start_new_thread(f, ())
+os.system("sleep 1")
 
 # vim:syntax=python:set expandtab: