[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12920 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12920 - in gnunet/src: include util |
Date: |
Wed, 8 Sep 2010 13:14:29 +0200 |
Author: toelke
Date: 2010-09-08 13:14:29 +0200 (Wed, 08 Sep 2010)
New Revision: 12920
Modified:
gnunet/src/include/gnunet_container_lib.h
gnunet/src/util/container_slist.c
gnunet/src/util/test_container_slist.c
Log:
implemented a way to add an element to the end of a slist
Modified: gnunet/src/include/gnunet_container_lib.h
===================================================================
--- gnunet/src/include/gnunet_container_lib.h 2010-09-08 09:59:32 UTC (rev
12919)
+++ gnunet/src/include/gnunet_container_lib.h 2010-09-08 11:14:29 UTC (rev
12920)
@@ -966,6 +966,18 @@
/**
+ * 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
* @param src source
Modified: gnunet/src/util/container_slist.c
===================================================================
--- gnunet/src/util/container_slist.c 2010-09-08 09:59:32 UTC (rev 12919)
+++ gnunet/src/util/container_slist.c 2010-09-08 11:14:29 UTC (rev 12920)
@@ -65,6 +65,11 @@
struct GNUNET_CONTAINER_SList_Elem *head;
/**
+ * Tail of the linked list.
+ */
+ struct GNUNET_CONTAINER_SList_Elem *tail;
+
+ /**
* Number of elements in the list.
*/
unsigned int length;
@@ -141,10 +146,34 @@
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++;
+}
+
+
/**
* Append a singly linked list to another
* @param dst list to append to
@@ -228,6 +257,7 @@
e = n;
}
l->head = NULL;
+ l->tail = NULL;
l->length = 0;
}
@@ -279,6 +309,8 @@
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 @@
before->last->next = e;
else
before->list->head = e;
+ if (e->next == NULL)
+ before->list->tail = e;
before->list->length++;
}
Modified: gnunet/src/util/test_container_slist.c
===================================================================
--- gnunet/src/util/test_container_slist.c 2010-09-08 09:59:32 UTC (rev
12919)
+++ gnunet/src/util/test_container_slist.c 2010-09-08 11:14:29 UTC (rev
12920)
@@ -101,7 +101,7 @@
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 @@
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 ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12920 - in gnunet/src: include util,
gnunet <=