Changeset 1075 for trunk/psLib/test/sysUtils

Timestamp:

Jun 23, 2004, 2:54:59 PM (22 years ago)

Author:

desonia

Message:

Fixed Bug #63 -- TPOutOfMemory test fails with very large memory machines.

Location:

trunk/psLib/test/sysUtils

Files:

• tst_psMemory.c (modified) (4 diffs)
• verified/tst_psMemory.stderr (modified) (2 diffs)

trunk/psLib/test/sysUtils/tst_psMemory.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-14 21:36:24 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 00:54:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -149 +149 @@
 int TPOutOfMemory(void)
 {
-    int* mem1 = NULL;
-    int* mem2 = NULL;
-    int* mem3 = NULL;
-    int* mem4 = NULL;
+    int* mem[100];
     psMemExhaustedCallback cb;
+
+    for (int lcv = 0; lcv<100; lcv++) {
+        mem[lcv] = NULL;
+    }
 
     psLogMsg(__func__,PS_LOG_INFO,"Upon requesting more memory than is available, psalloc shall call "
@@ -162 +163 @@
     cb = psMemExhaustedCallbackSet(TPOutOfMemoryExhaustedCallback);
 
-    mem1 = (int*) psAlloc(UINT_MAX-1000);
+    for (int lcv = 0; lcv<100; lcv++) {
+        mem[lcv] = (int*) psAlloc(SIZE_MAX-1000);
+    }
 
     psMemExhaustedCallbackSet(cb);
@@ -171 +174 @@
     }
 
-    psFree(mem1);
-    psFree(mem2);
-    psFree(mem3);
-    psFree(mem4);
+    for (int lcv = 0; lcv<100; lcv++) {
+        psFree(mem[lcv]);
+    }
 
     return 0;

trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr

@@ -17 +17 @@
  <DATE> <TIME> <HOST> |I|  TPOutOfMemory|Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
  <DATE> <TIME> <HOST> |I|TPOutOfMemoryEx|Custom MemExhaustedCallback was invoked.
- <DATE> <TIME> <HOST> |A|      p_psAlloc|Failed to allocate 4294966295 bytes at tst_psMemory.c:164
+ <DATE> <TIME> <HOST> |A|      p_psAlloc|Failed to allocate 4294966295 bytes at tst_psMemory.c:166
 
 ---> TESTPOINT PASSED (psMemory{450-TPOutOfMemory} | tst_psMemory.c)
@@ -59 +59 @@
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce one instance.
                    file:line ID
-         tst_psMemory.c:314  1
+         tst_psMemory.c:316  1
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|Testing psMemCheckLeaks again with a different leak location
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce one error.
                    file:line ID
-         tst_psMemory.c:344  11
+         tst_psMemory.c:346  11
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|Testing psMemCheckLeaks again with multiple leak locations.
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce two errors.
                    file:line ID
-         tst_psMemory.c:372  16
-         tst_psMemory.c:372  14
+         tst_psMemory.c:374  16
+         tst_psMemory.c:374  14
 
 ---> TESTPOINT PASSED (psMemory{454-TPcheckLeaks} | tst_psMemory.c)