Changeset 7617

Timestamp:

Jun 21, 2006, 11:40:12 AM (20 years ago)

Author:

Paul Price

Message:

Applying patch from Josh. Renaming psMemThreadSafety to psMemSetThreadSafety. Adding psMemGetThreadSafety. Using psMemGetThreadSafety in psDB.

Location:

trunk/psLib/src

Files:

• db/psDB.c (modified) (6 diffs)
• sys/psMemory.c (modified) (3 diffs)
• sys/psMemory.h (modified) (2 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-10 04:04:18 $
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 21:40:12 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -44 +44 @@
 mysqlType;
 
+//static pthread_mutex_t lookupTableMutex = PTHREAD_MUTEX_INITIALIZER;
 static psHash   *pTypeToSQLlookupTable = NULL;
 static psHash   *sqlToPTypeLookupTable = NULL;
@@ -1666 +1667 @@
 {
     psFree(pTypeToSQLlookupTable);
-    pTypeToSQLlookupTable = NULL;
 }
 
@@ -1716 +1716 @@
 {
     psFree(sqlToPTypeLookupTable);
-    sqlToPTypeLookupTable = NULL;
 }
 
@@ -1755 +1754 @@
 {
     psFree(mysqlToSqlLookupTable);
-    mysqlToSqlLookupTable = NULL;
 }
 
@@ -1802 +1800 @@
 {
     psFree(pTypeToMysqlLookupTable);
-    pTypeToMysqlLookupTable = NULL;
 }
 

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-07 23:16:44 $
+*  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-21 21:40:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1080 +1080 @@
 }
 
-bool psMemThreadSafety(bool safe)
+bool psMemSetThreadSafety(bool safe)
 {
     bool out = safeThreads;
@@ -1087 +1087 @@
 }
 
+bool psMemGetThreadSafety(void)
+{
+    return safeThreads;
+}
+
 bool p_psMemGetPersistent(psPtr vptr)
 {

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-07 23:16:44 $
+ *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 21:40:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -190 +190 @@
  *  @return bool:       The previous value of the thread safety.
  */
-bool psMemThreadSafety(
+bool psMemSetThreadSafety(
     bool safe                          ///< boolean for turning on/off thread safety
 );
+
+/** Get the current state of thread safety and mutex locking in the memory management.
+ *
+ * psMemGetThreadSafety shall return the current state of thread safety in the memory management system.
+ *
+ *  @return bool:       The current state of thread safety.
+ */
+bool psMemGetThreadSafety(void);
 
 /** Set the memory as persistent so that it is ignored when detecting memory leaks.