Changeset 4308 for trunk/psLib/test/collections

Timestamp:

Jun 17, 2005, 1:44:22 PM (21 years ago)

Author:

desonia

Message:

added enhancement to psFree so that it sets the reference being freed to
NULL (thanks Gus).

Location:

trunk/psLib/test/collections

Files:

• tst_psArray.c (modified) (7 diffs)
• tst_psMetadata_04.c (modified) (2 diffs)

trunk/psLib/test/collections/tst_psArray.c

@@ -17 +17 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-06-17 23:44:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -202 +202 @@
         }
     }
-    psFree(mySt[0]);
+    psMemDecrRefCounter(mySt[0]);
     printFooter(stderr,"psArray","Remove valid item", true);
 
@@ -235 +235 @@
         psFree(mySt[i]);
     }
-    if( psMemCheckLeaks(0, NULL, stderr, false) != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Memory leaks detected.");
-        return 110;
-    }
-    psS32 nBad = psMemCheckCorruption(0);
-    if(nBad) {
-        fprintf(stderr,"ERROR: Found %d bad memory blocks\n", nBad);
-        return 111;
-    }
+
     printFooter(stderr, "psArray" ,"Free void pointer array", true);
 
@@ -361 +353 @@
         }
 
-        psFree(data);
-
         subtest++;
         if (arr->nalloc != nalloc) {
@@ -386 +376 @@
             return subtest;
         }
+
+        psFree(data);
     }
 
@@ -391 +383 @@
     data = psAlloc(sizeof(float));
     arr = psArrayAdd(arr, delta, data);
-    psFree(data);
 
     // make sure the array was expanded
@@ -418 +409 @@
     }
 
+    psFree(data);
+
     // make the array full again (operation tested already)
     while (arr->n < arr->nalloc) {

trunk/psLib/test/collections/tst_psMetadata_04.c

@@ -23 +23 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-06-17 23:44:22 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
     psMetadataAddItem(metadata, item5, PS_LIST_HEAD, PS_META_DEFAULT);
     psMetadataAddItem(metadata, item6, PS_LIST_HEAD, PS_META_DEFAULT);
-    psFree(vec);
+    psMemDecrRefCounter(vec); // vs. psFree, which now would set vec to NULL (want to keep it to comparison later)
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);