Changeset 1204 for trunk/psLib/src/sysUtils/psMemory.c

Timestamp:

Jul 8, 2004, 4:45:42 PM (22 years ago)

Author:

desonia

Message:

added a PS_MEM_DEBUG preprocessor directive that allows the keeping of all
psMemBlocks as to detect multiple frees.

File:

• trunk/psLib/src/sysUtils/psMemory.c (modified) (12 diffs)

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-24 03:12:19 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-09 02:45:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -190 +190 @@
     if (m == NULL) {
         psError(funcName,"Memory Corruption: NULL memory block found.");
-        return(1);
+        return 1;
+    }
+
+    if (m->refCounter == 0) {
+        // using an unreferenced block of memory, are you?
+        psError(__func__,"Memory Corruption: memory block %ld was freed but still used.",
+                m->id);
+        return 1;
     }
 
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
-        psError(funcName, "psMemCheckCorruption: memory block %ld is corrupted (buffer underflow)",
+        psError(funcName, "Memory Corruption: memory block %ld is corrupted (buffer underflow)",
                 m->id);
-        return(1);
+        return 1;
     }
     if (*(void**)((int8_t*)(m+1)+m->userMemorySize) != P_PS_MEMMAGIC) {
-        psError(funcName, "psMemCheckCorruption: memory block %ld is corrupted (buffer overflow)",
+        psError(funcName, "Memory Corruption: memory block %ld is corrupted (buffer overflow)",
                 m->id);
-        return(1);
-    }
-
-    return(0);
+        return 1;
+    }
+
+    return 0;
 }
 
@@ -292 +299 @@
         bool isBlockLast = false;
 
+        if (checkMemBlock(ptr, __func__) != 0) {
+            memProblemCallback(ptr, file, lineno);
+            psAbort(file,"Realloc detected a memory corruption (id %ld @ %s:%d).",
+                    ptr->id,ptr->file,ptr->lineno);
+        }
+
         pthread_mutex_lock(&memBlockListMutex);
 
@@ -331 +344 @@
 void p_psFree(void *vptr, const char *file, int lineno)
 {
-    if (vptr == NULL) {
-        return;
-    }
-
-    psMemBlock *ptr = ((psMemBlock *)vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, file, lineno); // we may not own this block; don't free it
-        return;
-    }
-
-    (void)psMemDecrRefCounter(vptr);   // this handles the free, if required.
-}
-
-/*
- * Check for memory leaks. Not production quality code
+    (void)p_psMemDecrRefCounter(vptr,file,lineno);   // this handles the free, if required.
+}
+
+/*
+ * Check for memory leaks.
  */
 int psMemCheckLeaks(psMemoryId id0,psMemBlock ***arr,FILE *fd)
@@ -419 +421 @@
 }
 // increment and return refCounter
-void *psMemIncrRefCounter(void *vptr)
+void* p_psMemIncrRefCounter(void *vptr, const char *file, int lineno)
 {
     psMemBlock *ptr;
@@ -430 +432 @@
 
     if (checkMemBlock(ptr, __func__)) {
-        memProblemCallback(ptr, __func__, __LINE__);
+        memProblemCallback(ptr, file,lineno);
     }
 
@@ -441 +443 @@
 
 // decrement and return refCounter
-void *psMemDecrRefCounter(void *vptr)
+void* p_psMemDecrRefCounter(void *vptr,const char *file, int lineno)
 {
     if (vptr == NULL) {
@@ -449 +451 @@
     psMemBlock *ptr = ((psMemBlock *)vptr) - 1;
 
+    if (checkMemBlock(ptr, __func__) != 0) {
+        memProblemCallback(ptr, file, lineno);
+        return NULL;
+    }
 
     pthread_mutex_lock(&ptr->refCounterMutex);
@@ -469 +475 @@
         }
 
+        #ifdef PS_MEM_DEBUG
+        // for debug mode, we should keep the memBlock around and mark as not referenced.
+        ptr->refCounter = 0;
+        (void)p_psRealloc(vptr,0,file,lineno);
+        #else
+
         pthread_mutex_lock(&memBlockListMutex);
 
@@ -487 +499 @@
 
         free(ptr);
+        #endif
 
         vptr = NULL;    // since we freed it, make sure we return NULL.
@@ -502 +515 @@
     psMemBlock *ptr = ((psMemBlock *)vptr) - 1;
 
+    if (checkMemBlock(ptr, __func__) != 0) {
+        memProblemCallback(ptr, __func__, __LINE__);
+    }
+
     ptr->freeFcn = freeFcn;
 
@@ -513 +530 @@
     psMemBlock *ptr = ((psMemBlock *)vptr) - 1;
 
+    if (checkMemBlock(ptr, __func__) != 0) {
+        memProblemCallback(ptr, __func__, __LINE__);
+    }
+
     return ptr->freeFcn;
 }