Changeset 1073 for trunk/psLib/test/collections/tst_psVector_03.c

Timestamp:

Jun 23, 2004, 1:00:17 PM (22 years ago)

Author:

desonia

Message:

Changed the means of deallocation of memory. ps_Alloc now registers an optional free function to handle any additional processing of a memory object.

File:

• trunk/psLib/test/collections/tst_psVector_03.c (modified) (6 diffs)

trunk/psLib/test/collections/tst_psVector_03.c

@@ -12 +12 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-04 19:51:49 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 }
 testStruct;
-
-static void freeData(void *data)
-{
-    psFree(data);
-}
-
 
 int main(int argc,
@@ -59 +53 @@
         psVec->data.PTR[i] = ts;
         psVec->n++;
-        psMemIncrRefCounter(ts);
     }
 
@@ -82 +75 @@
         psVec->data.PTR[i] = ts;
         psVec->n++;
-        psMemIncrRefCounter(ts);
     }
     for(int i = 0; i < 10; i++) {
@@ -92 +84 @@
     printFooter(stdout, "psVector", "Reallocate void pointer vector bigger", true);
 
-
     // Test D - Reallocate void pointer vector smaller
     printPositiveTestHeader(stdout,"psVector","Reallocate void pointer vector smaller");
-    psVec = psVectorRealloc(3, psVec);
+    psVec = psVectorRealloc(3, psVec); // this also frees the elements trimmed
     for(int i = 0; i < 3; i++) {
         testStruct *ts = (testStruct*)psVec->data.PTR[i];
@@ -109 +100 @@
 
     // Free void pointer array struct and its 3 internal elements
-    psVectorElementFree(psVec, freeData);
-    psVectorFree(psVec);
+    psFree(psVec);
 
-    // Free 7 elements manually that were lost after array was reallocated smaller
-    for(int i = 3; i < 10; i++) {
-        psFree(mySt[i]);
+    if (psMemCheckLeaks(0, NULL, stdout) != 0) {
+        psAbort(__func__,"memory leaks");
     }
-    psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
     if(nBad) {