Changeset 2698 for trunk/psLib/src/collections/psList.c

Timestamp:

Dec 10, 2004, 3:19:06 PM (22 years ago)

Author:

desonia

Message:

fixes so that psList test passes now.

File:

• trunk/psLib/src/collections/psList.c (modified) (12 diffs)

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-10 21:43:16 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-11 01:19:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
     pthread_mutex_lock(&list->lock)
     ;
+
+    // remove the free function of iterators to avoid double removal from list
+    psArray* iterators = list->iterators;
+    for (int i = 0; i < iterators->n; i++) {
+        p_psMemSetDeallocator(iterators->data[i], NULL);
+    }
 
     psFree(list->iterators);
@@ -128 +134 @@
     list->head = list->tail = NULL;
     list->iterators = psArrayAlloc(16);
+    list->iterators->n = 0;
 
     // create a default iterator
-    list->iterators->data[0] = psListIteratorAlloc(list,PS_LIST_HEAD);
-    list->iterators->n = 1;
+    psListIteratorAlloc(list,PS_LIST_HEAD);
 
     pthread_mutex_init(&(list->lock), NULL)
@@ -183 +189 @@
     psList* list = iterator->list;
 
-    if (location >= (int)list->size) {
-        psLogMsg(__func__, PS_LOG_WARN,
-                 "Specified index, %d, is beyond the end of the psList, which "
-                 "has only %d elements.  Assuming tail.",
-                 location, list->size);
-        location = PS_LIST_TAIL;
-    }
-
     if (location == PS_LIST_TAIL) {
         iterator->cursor = list->tail;
@@ -198 +196 @@
     }
 
-    if (location <= 0) {   // Invalid index
-        return false;
-    }
-
+    if (location == PS_LIST_HEAD) {
+        iterator->cursor = list->head;
+        iterator->index = 0;
+        iterator->offEnd = false;
+        return true;
+    }
+
+    if (location < 0 || location >= (int)list->size) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psList_LOCATION_INVALID,
+                location);
+        return false;
+    }
 
     psListElem* cursor = iterator->cursor;
@@ -250 +257 @@
     }
 
+    if (location >= (int)list->size) {
+        psLogMsg(__func__,PS_LOG_WARN,
+                 "Specified location, %d, is beyond the end of the list.  "
+                 "Adding data item to tail.",
+                 location);
+        location = PS_LIST_TAIL;
+    }
+
     // move ourselves to the given position
-    if (list->iterators->n < 1 ||
-            ! psListIteratorSet(list->iterators->data[0],location)) {
-        // oh no, I can't find where to add this!
-        psError(PS_ERR_UNKNOWN, false,
-                PS_ERRORTEXT_psList_LOCATION_INVALID,
-                location);
+    if (! psListIteratorSet(list->iterators->data[0],location)) {
         return false;
     }
@@ -308 +318 @@
         if (elem->next == NULL) {
             list->tail = elem;
+        } else {
+            elem->next->prev = elem;
         }
     }
@@ -374 +386 @@
         if (elem->prev == NULL) {
             list->head = elem;
+        } else {
+            elem->prev->next = elem;
         }
     }
@@ -411 +425 @@
     // move ourselves to the given position
     psListIterator* defaultIterator = list->iterators->data[0];
-    if (list->iterators->n < 1 ||
-            ! psListIteratorSet(defaultIterator,location)) {
-        // oh no, I can't find where to add this!
-        psError(PS_ERR_UNKNOWN, false,
-                PS_ERRORTEXT_psList_LOCATION_INVALID,
-                location);
+    if (! psListIteratorSet(defaultIterator,location)) {
         return false;
     }
@@ -438 +447 @@
     }
 
-    psListIterator* iterator = list->iterators->data[0];
-    psListIteratorSet(iterator,PS_LIST_HEAD);
-
-    psPtr iteratorData = psListGetNext(iterator);
-    while (iteratorData != NULL && iteratorData != data) {
-        iteratorData = psListGetNext(iterator);
-    }
-
-    if (iteratorData == NULL) {
+    psListElem* elem = list->head;
+    int index = 0;
+    while (elem != NULL && elem->data != data) {
+        elem = elem->next;
+        index++;
+    }
+    if (elem == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psList_DATA_NOT_FOUND);
@@ -452 +459 @@
     }
 
+    psListIterator* iterator = (psListIterator*)list->iterators->data[0];
+    iterator->index = index;
+    iterator->cursor = elem;
+
     return listIteratorRemove(iterator);
 }
@@ -460 +471 @@
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psList_LIST_NULL);
-        return false;
+        return NULL;
+    }
+
+    if (list->head == NULL) { // list empty?
+        return NULL;
     }