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

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-14 19:45:46 $
+ *  @version $Revision: 1.7 $ $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 @@
 
 // private functions.
-psListElem* listGetIterator(psList* list);
-int listGetIteratorIndex(psList* list);
-void listSetIterator(psList *list, int where, bool lockList);
+static psListElem* listGetIterator(psList* list);
+static int listGetIteratorIndex(psList* list);
+static void listSetIterator(psList *list, int where, bool lockList);
+static void listFree(psList *list);
 
 
@@ -36 +37 @@
 {
     psList *list = psAlloc(sizeof(psList));
+    p_psMemSetDeallocator(list,(psFreeFcn)listFree);
 
     list->size = 0;
@@ -41 +43 @@
     list->iter = ITER_INIT_HEAD;
     list->iterIndex = PS_LIST_HEAD;
+
     pthread_mutex_init(&(list->lock),NULL)
     ;
@@ -51 +54 @@
 }
 
-void psListFree(psList *list, psFreeFcn elemFree)
+static void listFree(psList *list)
 {
     if (list == NULL) {
@@ -63 +66 @@
         psListElem *next = ptr->next;
 
-        p_psCustomFree(elemFree, psMemDecrRefCounter(ptr->data));
+        psFree(ptr->data);
         psFree(ptr);
 
@@ -75 +78 @@
     ;
 
-    psFree(list);
 }