Changeset 16696

Timestamp:

Feb 27, 2008, 4:13:03 PM (18 years ago)

Author:

jhoblitt

Message:

re-enable thread safety in p_psDBRunQueryPrepared()

File:

• trunk/psLib/src/db/psDB.c (modified) (5 diffs)

trunk/psLib/src/db/psDB.c

@@ -23 +23 @@
  * 4.1.2 or newer is required.
  *
- * $Id: psDB.c,v 1.150 2008-02-28 02:02:47 jhoblitt Exp $
+ * $Id: psDB.c,v 1.151 2008-02-28 02:13:03 jhoblitt Exp $
  */
 
@@ -80 +80 @@
 
 // cache of prepared query statements
-// static pthread_mutex_t preparedQueryMutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t preparedQueryMutex = PTHREAD_MUTEX_INITIALIZER;
 static psHash *preparedQuery = NULL;
 
@@ -857 +857 @@
 
     // start lock on query cache
-//    if (psMemGetThreadSafety()) {
-//        pthread_mutex_lock(&preparedQueryMutex);
-//    }
+    if (psMemGetThreadSafety()) {
+        pthread_mutex_lock(&preparedQueryMutex);
+    }
 
     // initalize the prepared query cache
     if (!preparedQuery) {
         preparedQuery = psHashAlloc(10);
+        psMemSetPersistent(preparedQuery, true);
     }
 
@@ -891 +892 @@
 
             // end lock on query cache
-//            if (psMemGetThreadSafety()) {
-//                pthread_mutex_unlock(&preparedQueryMutex);
-//            }
+            if (psMemGetThreadSafety()) {
+                pthread_mutex_unlock(&preparedQueryMutex);
+            }
 
             return -1;
@@ -905 +906 @@
 
     // end lock on query cache
-//    if (psMemGetThreadSafety()) {
-//        pthread_mutex_unlock(&preparedQueryMutex);
-//    }
+    if (psMemGetThreadSafety()) {
+        pthread_mutex_unlock(&preparedQueryMutex);
+    }
 
     psFree(query);