Changeset 1821

Timestamp:

Sep 16, 2004, 1:51:07 PM (22 years ago)

Author:

evanalst

Message:

Add unlock/lock mutex to psMemCheckCorruption to allow tst_psMemory to
run successfully on Mac.

Location:

trunk/psLib/src

Files:

• sys/psMemory.c (modified) (2 diffs)
• sysUtils/psMemory.c (modified) (2 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-14 23:48:25 $
+*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-16 23:51:07 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -261 +261 @@
 {
     int nbad = 0;               // number of bad blocks
+    bool failure = false;
 
     // get exclusive access to the memBlock list to avoid it changing on us while we use it.
-    pthread_mutex_lock(&memBlockListMutex);
+    //    pthread_mutex_lock(&memBlockListMutex);
 
     for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) {
-        if (checkMemBlock(iter, __func__)) {
+        pthread_mutex_unlock(&memBlockListMutex);
+        failure = checkMemBlock(iter, __func__);
+        pthread_mutex_lock(&memBlockListMutex);
+        if ( failure ) {
             nbad++;
 

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-14 23:48:25 $
+*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-16 23:51:07 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -261 +261 @@
 {
     int nbad = 0;               // number of bad blocks
+    bool failure = false;
 
     // get exclusive access to the memBlock list to avoid it changing on us while we use it.
-    pthread_mutex_lock(&memBlockListMutex);
+    //    pthread_mutex_lock(&memBlockListMutex);
 
     for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) {
-        if (checkMemBlock(iter, __func__)) {
+        pthread_mutex_unlock(&memBlockListMutex);
+        failure = checkMemBlock(iter, __func__);
+        pthread_mutex_lock(&memBlockListMutex);
+        if ( failure ) {
             nbad++;