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

Timestamp:

May 10, 2004, 3:57:54 PM (22 years ago)

Author:

desonia

Message:

p_realloc didn't track the last allocated buffer properly (if reallocating last buffer, it didn't reflect the pointer change in the global pointer for the last allocated buffer.

File:

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

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-20 03:10:31 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-11 01:57:54 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
+
 #include "psMemory.h"
 #include "psError.h"
@@ -44 +46 @@
 static psMemExhaustedCallback memExhaustedCallback = memExhaustedCallbackDefault;
 
-psMemExhaustedCallback psMemExhaustedSetCallback(psMemExhaustedCallback func)
+psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func)
 {
     psMemExhaustedCallback old = memExhaustedCallback;
@@ -78 +80 @@
 static psMemProblemCallback memProblemCallback = memProblemCallbackDefault;
 
-psMemProblemCallback psMemProblemSetCallback(psMemProblemCallback func)
+psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func)
 {
     psMemProblemCallback old = memProblemCallback;
@@ -140 +142 @@
 static psMemFreeCallback memFreeCallback = memFreeCallbackDefault;
 
-psMemAllocateCallback psMemAllocateSetCallback(psMemAllocateCallback func)
+psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func)
 {
     psMemFreeCallback old = memAllocateCallback;
@@ -199 +201 @@
 
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
-        psError(funcName, "psMemCheckCorruption: memory block %ld is corrupted", m->id);
+        psError(funcName, "psMemCheckCorruption: memory block %ld is corrupted (%x %x)",
+                m->id,m->startblock,m->endblock);
         return(1);
     }
@@ -280 +283 @@
     } else {
         psMemBlock *ptr = ((psMemBlock *)vptr) - 1;
+        bool isBlockLast = false;
 
         pthread_mutex_lock(&memBlockListMutex);
 
+        isBlockLast = (ptr == lastMemBlockAllocated);
+
         ptr = (psMemBlock*)realloc(ptr, sizeof(psMemBlock) + size);
+
+        if (ptr == NULL) {
+            psAbort(__func__, "Failed to reallocate %ld bytes at %s:%d",
+                    size, file, lineno);
+        }
+
+        if (isBlockLast) {
+            lastMemBlockAllocated = ptr;
+        }
 
         // the block location may have changed, so fix the linked list addresses.