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

Timestamp:

May 11, 2004, 10:11:17 AM (22 years ago)

Author:

desonia

Message:

fixed memory corruption detection system.

File:

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

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-11 01:57:54 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-11 20:11:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -62 +62 @@
                                       const char *file, int lineno)
 {
-    checkMemBlock(ptr, __func__);
-
     if (ptr->refCounter <= 0) {
         psError(__func__,
@@ -100 +98 @@
 long p_psMemFreeID = 0;   // notify user this block is freed
 
-long psMemSetAllocateID(long id) // set p_psMemAllocateID to id
+long psMemAllocateCallbackSetID(long id) // set p_psMemAllocateID to id
 {
     long old = p_psMemAllocateID;
@@ -108 +106 @@
 }
 
-long psMemSetFreeID(long id)  // set p_psMemFreeID to id
+long psMemFreeCallbackSetID(long id)  // set p_psMemFreeID to id
 {
     long old = p_psMemFreeID;
@@ -155 +153 @@
 }
 
-psMemFreeCallback psMemFreeSetCallback(psMemFreeCallback func)
+psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func)
 {
     psMemFreeCallback old = memFreeCallback;
@@ -201 +199 @@
 
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
-        psError(funcName, "psMemCheckCorruption: memory block %ld is corrupted (%x %x)",
+        psError(funcName, "psMemCheckCorruption: memory block %ld is corrupted (%p %p)",
                 m->id,m->startblock,m->endblock);
         return(1);
@@ -310 +308 @@
         pthread_mutex_unlock(&memBlockListMutex);
 
+        //  Did the user ask to be informed about this allocation?
+        if (ptr->id == p_psMemAllocateID) {
+            p_psMemAllocateID += memAllocateCallback(ptr);
+        }
+
         return ptr + 1;   // usr memory
     }
@@ -366 +369 @@
     int nleak = 0;
     int j = 0;
+    psMemBlock* topBlock = lastMemBlockAllocated;
 
     pthread_mutex_lock(&memBlockListMutex);
 
-    for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter=iter->nextBlock)
+    for (psMemBlock* iter = topBlock; iter != NULL; iter=iter->nextBlock)
     {
         if ( (iter->refCounter > 0) && (iter->id >= id0) ) {
@@ -391 +395 @@
     }
 
-    p_psFree(*arr,__FILE__, __LINE__);  // Don't generate a memory leak!
-
     *arr = p_psAlloc(nleak*sizeof(psMemBlock), __FILE__, __LINE__);
-
     pthread_mutex_lock(&memBlockListMutex);
 
-    for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter=iter->nextBlock)
+    for (psMemBlock* iter = topBlock; iter != NULL; iter=iter->nextBlock)
     {
         if ( (iter->refCounter > 0) && (iter->id >= id0) ) {