implemented a way to add an element to the end of a slist

diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index 19946d6f7961a0769cf66738056cc0bc1a9c5940..b19dd52dc06eb14262b75f8423635749312f8659 100644 (file)
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -965,6 +965,18 @@ void GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l,
                                 const void *buf, size_t len);
 
 
+/**
+ * Add a new element to the end of the list
+ * @param l list
+ * @param disp memory disposition
+ * @param buf payload buffer
+ * @param len length of the buffer
+ */
+void GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l,
+                                enum GNUNET_CONTAINER_SListDisposition disp,
+                                const void *buf, size_t len);
+
+
 /**
  * Append a singly linked list to another
  * @param dst list to append to

diff --git a/src/util/container_slist.c b/src/util/container_slist.c
index fb9ab5558719c2a17b7efa8a5c395e65c2445458..8c4886ef540106959b6ae0968f8b22f6bcccc595 100644 (file)
--- a/src/util/container_slist.c
+++ b/src/util/container_slist.c
@@ -64,6 +64,11 @@ struct GNUNET_CONTAINER_SList
    */
   struct GNUNET_CONTAINER_SList_Elem *head;
 
+  /**
+   * Tail of the linked list.
+   */
+  struct GNUNET_CONTAINER_SList_Elem *tail;
+
   /**
    * Number of elements in the list.
    */
@@ -141,6 +146,30 @@ GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l,
   e = create_elem (disp, buf, len);
   e->next = l->head;
   l->head = e;
+  if (l->tail == NULL) l->tail = e;
+  l->length++;
+}
+
+/**
+ * Add a new element to the end of the list
+ * @param l list
+ * @param disp memory disposition
+ * @param buf payload buffer
+ * @param len length of the buffer
+ */
+void
+GNUNET_CONTAINER_slist_add_end (struct GNUNET_CONTAINER_SList *l,
+                            enum GNUNET_CONTAINER_SListDisposition disp,
+                            const void *buf, size_t len)
+{
+  struct GNUNET_CONTAINER_SList_Elem *e;
+
+  e = create_elem (disp, buf, len);
+  if (l->tail != NULL)
+    l->tail->next = e;
+  if (l->head == NULL)
+    l->head = e;
+  l->tail = e;
   l->length++;
 }
 
@@ -228,6 +257,7 @@ GNUNET_CONTAINER_slist_clear (struct GNUNET_CONTAINER_SList *l)
       e = n;
     }
   l->head = NULL;
+  l->tail = NULL;
   l->length = 0;
 }
 
@@ -279,6 +309,8 @@ GNUNET_CONTAINER_slist_erase (struct GNUNET_CONTAINER_SList_Iterator *i)
     i->last->next = next;
   else
     i->list->head = next;
+  if (next == NULL)
+    i->list->tail = i->last;
   if (i->elem->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC)
     GNUNET_free (i->elem->elem);
   GNUNET_free (i->elem);
@@ -307,6 +339,8 @@ GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator *before,
     before->last->next = e;
   else
     before->list->head = e;
+  if (e->next == NULL)
+    before->list->tail = e;
   before->list->length++;
 }
 

diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c
index af3c3f39a318d62e078d423d31b9403bc2e8c4b1..fc3e8a2a4c8075280dbaf839e667ecbf3061e7d4 100644 (file)
--- a/src/util/test_container_slist.c
+++ b/src/util/test_container_slist.c
@@ -101,7 +101,7 @@ main (int argc, char *argv[])
   i = 99;
   CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_NO);
   i = 198;
-  CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)));
+  CHECK (GNUNET_CONTAINER_slist_contains (l, &i, sizeof (i)) == GNUNET_YES);
 
   GNUNET_CONTAINER_slist_clear (l);
   CHECK (GNUNET_CONTAINER_slist_count (l) == 0);
@@ -116,6 +116,32 @@ main (int argc, char *argv[])
 
   GNUNET_CONTAINER_slist_destroy (l);
 
+  /*check slist_add_end*/
+  l = GNUNET_CONTAINER_slist_create ();
+  for (i = 0; i < 100; i++)
+    GNUNET_CONTAINER_slist_add_end (l,
+                                GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+                                &i, sizeof (i));
+
+  CHECK (GNUNET_CONTAINER_slist_count (l) == 100);
+
+  for (it = GNUNET_CONTAINER_slist_begin (l), i = 0;
+       GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;
+       GNUNET_CONTAINER_slist_next (it), i++)
+  {
+    p = GNUNET_CONTAINER_slist_get (it, &s);
+
+    if ((p == NULL) ||
+        (i != *(int *) p) ||
+        (s != sizeof (i)))
+    {
+      GNUNET_CONTAINER_slist_iter_destroy (it);
+      CHECK (0);
+    }
+  }
+
+  GNUNET_CONTAINER_slist_destroy (l);
+
   /*check if disp = GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC*/
   l = GNUNET_CONTAINER_slist_create ();