Changeset 5216 for trunk/psLib/src/types

Timestamp:

Sep 30, 2005, 4:22:26 PM (21 years ago)

Author:

desonia

Message:

changed psArrayGet/psArraySet/psArrayRemove to do proper reference counting.

Location:

trunk/psLib/src/types

Files:

• psArray.c (modified) (7 diffs)
• psArray.h (modified) (3 diffs)
• psList.c (modified) (4 diffs)
• psMetadataConfig.c (modified) (3 diffs)

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-24 00:17:44 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-01 02:22:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     }
 
-    psArrayElementFree(psArr);
+    psArrayElementsFree(psArr);
 
     psFree(psArr->data);
@@ -98 +98 @@
 {
     if (array == NULL) {
-        return array;
+        int d = (delta > 0) ? delta : 10; // as spec'ed in SDRS.
+        array = psArrayAlloc(d);
+        array->n = 0;
     }
 
@@ -132 +134 @@
         if (psArrData[i] == data) {
             memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
+            psFree(data); // free the removed item (see Bug #449)
             n--;
             success = true;
@@ -141 +144 @@
 }
 
-void psArrayElementFree(psArray* psArr)
+void psArrayElementsFree(psArray* psArr)
 {
 
@@ -205 +208 @@
     }
     psFree(array->data[position]);
-    array->data[position] = data;
+    array->data[position] = psMemIncrRefCounter(data);
 
     return true;
@@ -232 +235 @@
         return NULL;
     }
-    return array->data[position];
-}
-
-
-
-
+    return psMemIncrRefCounter(array->data[position]);
+}

trunk/psLib/src/types/psArray.h

@@ -1 @@
-
 /** @file  psArray.h
  *
@@ -12 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-24 00:17:44 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-01 02:22:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -116 +115 @@
  *
  */
-void psArrayElementFree(
+void psArrayElementsFree(
     psArray* psArr                     ///< Void pointer array to destroy.
 );

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-29 01:15:38 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-01 02:22:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     pthread_mutex_lock(&list->p_lock);
 
-    // remove the free function of iterators to avoid double removal from list
+    // remove the associated iterators -- any references are invalid once psList is freed.
     psArray* iterators = list->iterators;
-    for (int i = 0; i < iterators->n; i++) {
-        psMemSetDeallocator(iterators->data[i], NULL);
-    }
-
-    psFree(list->iterators);
+    // ONLY orphan the iterators if the list iterators are about to be destroyed
+    // a case where this is not the case is in psListSort.
+    if (psMemGetRefCounter(iterators)  < 2) {
+        for (int i = 0; i < iterators->n; i++) {
+            // orphan iterators first to avoid any callbacks to dying list
+            ((psListIterator*)iterators->data[i])->list = NULL;
+            // remove all external references
+            psMemSetRefCounter(iterators->data[i], 1);
+        }
+    }
+    psFree(iterators);
 
     for (psListElem* ptr = list->head; ptr != NULL;) {
@@ -71 +77 @@
 
     // remove this iterator from the parent list
-    psArrayRemove(iter->list->iterators,iter);
-
+    if (iter->list != NULL) {
+        psArray* iters = iter->list->iterators;
+        for (int lcv = 0; lcv < iters->n; lcv++) {
+            if (iters->data[lcv] == iter) {
+                // following is done to match SDRS.
+                iters->data[lcv] = iters->data[iters->n-1];
+                iters->n--;
+                break;
+            }
+        }
+    }
 }
 
@@ -164 +179 @@
     iter->mutable = mutable;
 
-    // add to the list's array of iterators
-    psArray* listIterators = list->iterators;
-    int num = listIterators->n;
-    if ( num >= listIterators->nalloc) {
-        // need to resize the array to make more room for another iterator.
-        list->iterators = psArrayRealloc(listIterators,listIterators->nalloc*2);
-        listIterators = list->iterators;
-    }
-    listIterators->data[num] = iter;
-    listIterators->n = num+1;
+    // associate the iterator with the list
+    list->iterators = psArrayAdd(list->iterators,0,iter);
+    // don't want the list's array of iterators to hold a true reference
+    psMemDecrRefCounter(iter);
 
     if (! psListIteratorSet(iter,location)) {
         psFree(iter);
-        iter = NULL;
+        return NULL;
     }
 

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-29 01:15:38 $
+*  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-01 02:22:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -995 +995 @@
         nextLevelInfo->name = psStringCopy(keyName);
         // Add next level to levelArray
-        levelArray = psArrayAdd(levelArray,1,nextLevelInfo);
+        levelArray = psArrayAdd(levelArray,0,nextLevelInfo);
         psFree(nextLevelInfo);
         // Increment level counter
@@ -1132 +1132 @@
                         return false;
                     }
-                    psFree(lowerLevelInfo);
                     (*level)--;
                 }