svn commit: r280398 - in /httpd/mod_python/trunk/src: include/mod_python.h include/mpversion.h mod_python.c

[nl...@apache.org]

Author: nlehuen
Date: Mon Sep 12 12:23:04 2005
New Revision: 280398

URL: http://svn.apache.org/viewcvs?rev=280398&view=rev
Log:
Defined MOD_PYTHON_WITH_THREAD_SUPPORT as (defined(WITH_THREAD) && APR_HAS_THREAD) and used it everywhere WITH_THREAD was previously used.

Modified:
    httpd/mod_python/trunk/src/include/mod_python.h
    httpd/mod_python/trunk/src/include/mpversion.h
    httpd/mod_python/trunk/src/mod_python.c

Modified: httpd/mod_python/trunk/src/include/mod_python.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mod_python.h?rev=280398&r1=280397&r2=280398&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mod_python.h (original)
+++ httpd/mod_python/trunk/src/include/mod_python.h Mon Sep 12 12:23:04 2005
@@ -57,7 +57,13 @@
 #include "Python.h"
 #include "structmember.h"
 
-#if defined(WIN32) && !defined(WITH_THREAD)
+#if(defined(WITH_THREAD) && APR_HAS_THREADS)
+    #define MOD_PYTHON_WITH_THREAD_SUPPORT 1
+#else
+    #define MOD_PYTHON_WITH_THREAD_SUPPORT 0
+#endif
+
+#if defined(WIN32) && !MOD_PYTHON_WITH_THREAD_SUPPORT
 #error Python threading must be enabled on Windows
 #endif
 

Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=280398&r1=280397&r2=280398&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Mon Sep 12 12:23:04 2005
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 2
 #define MPV_PATCH 0
-#define MPV_BUILD 20050911
-#define MPV_STRING "3.2.0-dev-20050911"
+#define MPV_BUILD 20050912
+#define MPV_STRING "3.2.0-dev-20050912"

Modified: httpd/mod_python/trunk/src/mod_python.c
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/mod_python.c?rev=280398&r1=280397&r2=280398&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/mod_python.c (original)
+++ httpd/mod_python/trunk/src/mod_python.c Mon Sep 12 12:23:04 2005
@@ -31,7 +31,7 @@
  * (In a Python dictionary) */
 static PyObject * interpreters = NULL;
 
-#if defined(WITH_THREAD) && APR_HAS_THREADS
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
 static apr_thread_mutex_t* interpreters_lock = 0;
 #endif
 
@@ -129,10 +129,8 @@
     if (! name)
         name = MAIN_INTERPRETER;
 
-#ifdef WITH_THREAD
-    #if APR_HAS_THREADS
-        apr_thread_mutex_lock(interpreters_lock);
-    #endif
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
+    apr_thread_mutex_lock(interpreters_lock);
     PyEval_AcquireLock();
 #endif
 
@@ -160,11 +158,9 @@
         idata = (interpreterdata *)PyCObject_AsVoidPtr(p);
     }
 
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
     PyEval_ReleaseLock();
-    #if APR_HAS_THREADS
-        apr_thread_mutex_unlock(interpreters_lock);
-    #endif
+    apr_thread_mutex_unlock(interpreters_lock);
 #endif
 
     if (! idata) {
@@ -175,7 +171,7 @@
 
     /* create thread state and acquire lock */
     tstate = PyThreadState_New(idata->istate);
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
     PyEval_AcquireThread(tstate);
 #else
     PyThreadState_Swap(tstate);
@@ -187,7 +183,7 @@
 
         if (!idata->obcallback) 
         {
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
             PyEval_ReleaseThread(tstate);
 #endif
             PyThreadState_Delete(tstate);
@@ -211,7 +207,7 @@
 static void release_interpreter(void) 
 {
     PyThreadState *tstate = PyThreadState_Get();
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
     PyEval_ReleaseThread(tstate);
 #endif
     PyThreadState_Delete(tstate);
@@ -519,10 +515,8 @@
         /* initialze the interpreter */
         Py_Initialize();
 
-#ifdef WITH_THREAD
-        #if APR_HAS_THREADS
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
             apr_thread_mutex_create(&interpreters_lock,APR_THREAD_MUTEX_UNNESTED,p);
-        #endif
         /* create and acquire the interpreter lock */
         PyEval_InitThreads();
 #endif
@@ -538,7 +532,7 @@
             exit(1);
         }
         
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
         /* release the lock; now other threads can run */
         PyEval_ReleaseLock();
 #endif
@@ -1796,7 +1790,7 @@
 
         Py_Finalize();
 
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
         PyEval_ReleaseLock();
 #endif
 
@@ -1821,11 +1815,11 @@
 
     /* accordig Py C Docs we must do this after forking */
 
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
     PyEval_AcquireLock();
 #endif
     PyOS_AfterFork();
-#ifdef WITH_THREAD
+#if MOD_PYTHON_WITH_THREAD_SUPPORT
     PyEval_ReleaseLock();
 #endif