Changeset 1073 for trunk/psLib/src/collections/psVector.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/src/collections/psVector.c (modified) (7 diffs)

trunk/psLib/src/collections/psVector.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-12 01:33:16 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 /*  FUNCTION IMPLEMENTATION - LOCAL                                          */
 /*****************************************************************************/
+static void vectorFree(psVector *restrict psVec);
 
 /*****************************************************************************/
@@ -68 +69 @@
     // Create vector struct
     psVec = (psVector *)psAlloc(sizeof(psVector));
+    p_psMemSetDeallocator(psVec,(psFreeFcn)vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;
@@ -132 +134 @@
     if(nalloc < 1) {
         psError(__func__, "Invalid value for nalloc (%d)\n", nalloc);
-        psVectorFree(in);
+        psFree(in);
         return NULL;
     }
@@ -154 +156 @@
 }
 
-void psVectorFree(psVector *restrict psVec)
+static void vectorFree(psVector *restrict psVec)
 {
     if (psVec == NULL) {
@@ -160 +162 @@
     }
 
+    if (psVec->type.type == PS_TYPE_PTR) {
+        for(int i = 0; i < psVec->n; i++) {
+            psFree(psVec->data.PTR[i]);
+            psVec->data.PTR[i] = NULL;
+        }
+    }
+
     psFree(psVec->data.V);
-    psFree(psVec);
 }
 
-void psVectorElementFree(psVector *restrict psVec, void (*elemFree)(void *))
+void psVectorElementFree(psVector *restrict psVec)
 {
 
@@ -176 +184 @@
     }
 
-    for(int i = 0; i < psVec->nalloc; i++) {
-        if(elemFree == NULL) {
-            psMemDecrRefCounter(psVec->data.PTR[i]);
-        } else {
-            elemFree(psMemDecrRefCounter(psVec->data.PTR[i]));
-        }
+    for(int i = 0; i < psVec->n; i++) {
+        psFree(psVec->data.PTR[i]);
         psVec->data.PTR[i] = NULL;
     }