Changeset 6419 for trunk/psLib/src/types

Timestamp:

Feb 9, 2006, 4:44:46 PM (20 years ago)

Author:

drobbin

Message:

Added psMemThreadSafety in psMemory and updated corresponding mutex's to comply with specs.

Location:

trunk/psLib/src/types

Files:

• psList.c (modified) (12 diffs)
• psList.h (modified) (2 diffs)

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-14 22:18:34 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-10 02:44:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 static psBool listIteratorRemove(psListIterator* iterator);
 
+//private boolean for enabling/disabling thread safety.  Default = enabled.
+static bool safeThreads = true;
+
 static void listFree(psList* list)
 {
@@ -39 +42 @@
     }
 
-    pthread_mutex_lock(&list->p_lock);
+    if (safeThreads) {
+        pthread_mutex_lock(&list->p_lock);
+        //        pthread_mutex_lock(&p_lock);
+    }
 
     // remove the associated iterators -- any references are invalid once psList is freed.
@@ -64 +70 @@
     }
 
-    pthread_mutex_unlock(&list->p_lock);
-
-    pthread_mutex_destroy(&list->p_lock);
-
+    if (safeThreads) {
+        pthread_mutex_unlock(&list->p_lock);
+        pthread_mutex_destroy(&list->p_lock);
+        //        pthread_mutex_unlock(&p_lock);
+        //        pthread_mutex_destroy(&p_lock);
+    } else {
+        safeThreads = true;
+    }
 }
 
@@ -100 +110 @@
     int index = iterator->index;
 
-    pthread_mutex_lock(&list->p_lock);
-
+    if (safeThreads) {
+        pthread_mutex_lock(&list->p_lock);
+        //        pthread_mutex_lock(&p_lock);
+    }
     if (elem == list->head) {        // head of list?
         list->head = elem->next;
@@ -126 +138 @@
     list->n--;
 
-    pthread_mutex_unlock(&list->p_lock)
-    ;
+    if (safeThreads) {
+        pthread_mutex_unlock(&list->p_lock);
+        //        pthread_mutex_unlock(&p_lock);
+    }
 
     // OK, delete orphaned list element and its data
@@ -150 +164 @@
     psListIteratorAlloc(list,PS_LIST_HEAD,true);
 
-    pthread_mutex_init(&(list->p_lock), NULL);
+    if (safeThreads) {
+        pthread_mutex_init(&(list->p_lock), NULL);
+        //        pthread_mutex_init(&p_lock, NULL);
+    }
 
     if (data != NULL) {
@@ -164 +181 @@
 }
 
-
+bool p_psListThreadSafety(bool safe)
+{
+    bool out = safeThreads;
+    safeThreads = safe;
+    return out;
+}
 
 psListIterator* psListIteratorAlloc(psList* list, long location, bool mutable)
@@ -326 +348 @@
     psListElem* elem = psAlloc(sizeof(psListElem));
 
-    pthread_mutex_lock(&list->p_lock);
+    if (safeThreads) {
+        pthread_mutex_lock(&list->p_lock);
+        //        pthread_mutex_lock(&p_lock);
+    }
 
     // set the new list element's attributes
@@ -362 +387 @@
     }
 
-    pthread_mutex_unlock(&list->p_lock);
+    if (safeThreads) {
+        pthread_mutex_unlock(&list->p_lock);
+        //        pthread_mutex_unlock(&p_lock);
+    }
 
     return true;
@@ -399 +427 @@
     psListElem* elem = psAlloc(sizeof(psListElem));
 
-    pthread_mutex_lock(&list->p_lock);
+    if (safeThreads) {
+        pthread_mutex_lock(&list->p_lock);
+        //        pthread_mutex_lock(&p_lock);
+    }
 
     // set the new list element's attributes
@@ -435 +466 @@
     }
 
-    pthread_mutex_unlock(&list->p_lock);
+    if (safeThreads) {
+        pthread_mutex_unlock(&list->p_lock);
+        //        pthread_mutex_unlock(&p_lock);
+    }
 
     return true;

trunk/psLib/src/types/psList.h

@@ -7 +7 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-07 23:36:15 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-10 02:44:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -94 +94 @@
 ;
 
+/** Private function used by psMemThreadSafety to activate/deactivate thread safety.
+ *
+ *  @return bool:       The previous value of the thread safety.
+ */
+bool p_psListThreadSafety(
+    bool safe                          ///< current value of thread safety to set
+);
 
 /** Creates a psList linked list object.