Ticket #137: pythreads.patch

.cc

@@ -2808 +2808 @@
 # endif
 #endif
 
-/* simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
-# define __PTHREAD__
-# if defined(_WIN32) || defined(__WIN32__)
-#  define pthread_mutex_lock EnterCriticalSection
-#  define pthread_mutex_unlock LeaveCriticalSection
-#  define pthread_mutex_t CRITICAL_SECTION
-#  define SWIG_MUTEX_INIT(var) var
-# else
-#  include <pthread.h>
-#  define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER 
-# endif
-#endif
-
-#ifdef  __PTHREAD__
-  struct Guard
+# include "pythread.h"
+  class Guard
   {
-    pthread_mutex_t *_mutex;
+    PyThread_type_lock & mutex_;
     
-    Guard(pthread_mutex_t &mutex) : _mutex(&mutex)
+  public:
+    Guard(PyThread_type_lock & mutex) : mutex_(mutex)
     {
-      pthread_mutex_lock(_mutex);
+      PyThread_acquire_lock(mutex_, WAIT_LOCK);
     }
     
     ~Guard()
     {
-      pthread_mutex_unlock(_mutex);
+      PyThread_free_lock(mutex_);
     }
   };
 # define SWIG_GUARD(mutex) Guard _guard(mutex)
@@ -2905 +2893 @@
   private:
     typedef std::map<void*, GCItem_var> ownership_map;
     mutable ownership_map owner;
-#ifdef __PTHREAD__
-    static pthread_mutex_t swig_mutex_own;
+#ifdef __THREAD__
+    static PyThread_type_lock swig_mutex_own;
 #endif
 
   public:
@@ -2951 +2939 @@
     }
   };
 
-#ifdef __PTHREAD__
-  pthread_mutex_t SWIG_MUTEX_INIT(Director::swig_mutex_own);
+#ifdef __THREAD__
+  PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
 #endif
 }