Changeset 10895

Timestamp:

Jan 3, 2007, 12:07:23 PM (19 years ago)

Author:

jhoblitt

Message:

remove failure variable from psMemCheckCorruption() (now unused)
rename checkMemBlock() -> badMemBlock() and change it's return type to bool so that it's usuage is better self documenting

File:

• branches/jch-memory/psLib/src/sys/psMemory.c (modified) (19 diffs)

branches/jch-memory/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.88.2.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-03 22:04:42 $
+*  @version $Revision: 1.88.2.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-01-03 22:07:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -69 +69 @@
 fprintf(stderr, "\n");
 
-static psS32 checkMemBlock(const psMemBlock* m, const char *funcName);
+static bool badMemBlock(const psMemBlock* m, const char *funcName);
 static psMemBlock* lastMemBlockAllocated = NULL;
 static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -137 +137 @@
  * N.b. If the block wasn't allocated by psAlloc, it will appear corrupted
  */
-static psS32 checkMemBlock(const psMemBlock* m,
-                           const char *funcName)
+static bool badMemBlock(const psMemBlock* m,
+                        const char *funcName)
 {
     // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked,
@@ -146 +146 @@
         PS_MEM_ERROR(PS_ERR_MEMORY_CORRUPTION, true,
                      _("NULL memory block found."));
-        return 1;
+        return true;
     }
 
@@ -154 +154 @@
                      _("Memory block %lu was freed but still being used."),
                      (unsigned long)m->id);
-        return 1;
+        return true;
     }
 
@@ -161 +161 @@
                      _("Memory block %lu is corrupted; buffer underflow detected."),
                      (unsigned long)m->id);
-        return 1;
+        return true;
     }
     if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
@@ -167 +167 @@
                      _("Memory block %lu is corrupted; buffer overflow detected."),
                      (unsigned long)m->id);
-        return 1;
-    }
-
-    return 0;
+        return true;
+    }
+
+    return false;
 }
 
@@ -303 +303 @@
 {
     psS32 nbad = 0;               // number of bad blocks
-    psBool failure = false;
 
     // get exclusive access to the memBlock list to avoid it changing on us
@@ -310 +309 @@
 
     for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) {
-        if (checkMemBlock(iter, __func__)) {
+        if (badMemBlock(iter, __func__)) {
             nbad++;
 
@@ -413 +412 @@
     psMemBlock *ptr = ((psMemBlock*)vptr) - 1;
 
-    if (checkMemBlock(ptr, __func__) != 0) {
+    if (badMemBlock(ptr, __func__) != 0) {
         memProblemCallback(ptr, file, lineno);
         PS_MEM_ABORT(file, "Realloc detected a memory corruption (id %lu @ %s:%d).",
@@ -477 +476 @@
     }
 
-    if (checkMemBlock(ptr, __func__) != 0) {
+    if (badMemBlock(ptr, __func__) != 0) {
         memProblemCallback(ptr, filename, lineno);
         PS_MEM_ABORT(__func__,"Memory Corruption Detected.");
@@ -558 +557 @@
     ptr2 = ((psMemBlock* ) ptr) - 1;
 
-    if (checkMemBlock(ptr2, __func__) != 0) {
+    if (badMemBlock(ptr2, __func__) != 0) {
         memProblemCallback(ptr2, __func__, __LINE__);
     }
@@ -582 +581 @@
     ptr = ((psMemBlock* ) vptr) - 1;
 
-    if (checkMemBlock(ptr, __func__)) {
+    if (badMemBlock(ptr, __func__)) {
         memProblemCallback(ptr, file, lineno);
     }
@@ -615 +614 @@
     ptr = ((psMemBlock* ) vptr) - 1;
 
-    if (checkMemBlock(ptr, __func__)) {
+    if (badMemBlock(ptr, __func__)) {
         memProblemCallback(ptr, file, lineno);
     }
@@ -641 +640 @@
     psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-    if (checkMemBlock(ptr, __func__) != 0) {
+    if (badMemBlock(ptr, __func__) != 0) {
         memProblemCallback(ptr, file, lineno);
         return NULL;
@@ -694 +693 @@
     psMemBlock* PTR = ((psMemBlock* ) ptr) - 1;
 
-    if (checkMemBlock(PTR, __func__) != 0) {
+    if (badMemBlock(PTR, __func__) != 0) {
         memProblemCallback(PTR, __func__, __LINE__);
     }
@@ -710 +709 @@
     psMemBlock* PTR = ((psMemBlock* ) ptr) - 1;
 
-    if (checkMemBlock(PTR, __func__) != 0) {
+    if (badMemBlock(PTR, __func__) != 0) {
         memProblemCallback(PTR, __func__, __LINE__);
     }
@@ -1006 +1005 @@
     psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-    if (checkMemBlock(ptr, __func__) != 0) {
+    if (badMemBlock(ptr, __func__) != 0) {
         memProblemCallback(ptr, __func__, __LINE__);
     }
@@ -1022 +1021 @@
     psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-    if (checkMemBlock(ptr, __func__) != 0) {
+    if (badMemBlock(ptr, __func__) != 0) {
         memProblemCallback(ptr, __func__, __LINE__);
     }