Changeset 1826

Timestamp:

Sep 17, 2004, 9:23:24 AM (22 years ago)

Author:

evanalst

Message:

Added call to memory exhausted callback to psRealloc if realloc unable to
obtain the desired memory.

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.39 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-16 23:51:07 $
+*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-17 19:23:24 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -392 +392 @@
 
         if (ptr == NULL) {
-            psAbort(__func__, "Failed to reallocate %ld bytes at %s:%d", size, file, lineno);
+            ptr = memExhaustedCallback(size);
+            if(ptr == NULL) {
+                psAbort(__func__, "Failed to reallocate %ld bytes at %s:%d", size, file, lineno);
+            }
         }
 

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-16 23:51:07 $
+*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-17 19:23:24 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -392 +392 @@
 
         if (ptr == NULL) {
-            psAbort(__func__, "Failed to reallocate %ld bytes at %s:%d", size, file, lineno);
+            ptr = memExhaustedCallback(size);
+            if(ptr == NULL) {
+                psAbort(__func__, "Failed to reallocate %ld bytes at %s:%d", size, file, lineno);
+            }
         }