Added DLLIST2_*() functions for doubly linked list with head and tail.

--HG--
branch : HEAD

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9b1e8953e72696e1e592929312767c20a765dc0a..b031e48bac2a0b5d7e7124f403aab5f1ce6b671a 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -225,6 +225,7 @@ test_lib_SOURCES = \
        test-istream-crlf.c \
        test-istream-seekable.c \
        test-istream-tee.c \
+       test-llist.c \
        test-mempool-alloconly.c \
        test-network.c \
        test-primes.c \

diff --git a/src/lib/llist.h b/src/lib/llist.h
index e29c7b79c7af1736071c61c752455c60545a6d1c..d608075868171ccc1b6d615f7ad442338079b004 100644 (file)
--- a/src/lib/llist.h
+++ b/src/lib/llist.h
@@ -21,4 +21,33 @@
        (item)->prev = NULL; \
        } STMT_END
 
+/* Doubly linked list with head and tail */
+#define DLLIST2_PREPEND(head, tail, item) STMT_START { \
+       (item)->prev = NULL; \
+       (item)->next = *(head); \
+       if (*(head) != NULL) (*(head))->prev = (item); else (*tail) = (item); \
+       *(head) = (item); \
+       } STMT_END
+
+#define DLLIST2_APPEND(head, tail, item) STMT_START { \
+       (item)->prev = *(tail); \
+       (item)->next = NULL; \
+       if (*(tail) != NULL) (*(tail))->next = (item); else (*head) = (item); \
+       *(tail) = (item); \
+       } STMT_END
+
+#define DLLIST2_REMOVE(head, tail, item) STMT_START { \
+       if ((item)->prev == NULL) \
+               *(head) = (item)->next; \
+       else \
+               (item)->prev->next = (item)->next; \
+       if ((item)->next == NULL) \
+               *(tail) = (item)->prev; \
+       else { \
+               (item)->next->prev = (item)->prev; \
+               (item)->next = NULL; \
+       } \
+       (item)->prev = NULL; \
+       } STMT_END
+
 #endif

diff --git a/src/lib/test-lib.c b/src/lib/test-lib.c
index 0d44e76d609a9859e6f8f72c8f1e7fd521c5af7d..e782a16059bb7f90e34a4a231000f9ea2b11a5de 100644 (file)
--- a/src/lib/test-lib.c
+++ b/src/lib/test-lib.c
@@ -15,6 +15,7 @@ int main(void)
                test_istream_crlf,
                test_istream_seekable,
                test_istream_tee,
+               test_llist,
                test_mempool_alloconly,
                test_network,
                test_primes,

diff --git a/src/lib/test-lib.h b/src/lib/test-lib.h
index 6505af6502520a02576de06a5334a3dfa29efd24..1529857d988fc8feb40d2a3f6e0578752a11beed 100644 (file)
--- a/src/lib/test-lib.h
+++ b/src/lib/test-lib.h
@@ -14,6 +14,7 @@ void test_istream_concat(void);
 void test_istream_crlf(void);
 void test_istream_seekable(void);
 void test_istream_tee(void);
+void test_llist(void);
 void test_mempool_alloconly(void);
 void test_network(void);
 void test_primes(void);

diff --git a/src/lib/test-llist.c b/src/lib/test-llist.c
new file mode 100644 (file)
index 0000000..478e581
--- /dev/null
+++ b/src/lib/test-llist.c
@@ -0,0 +1,126 @@
+/* Copyright (c) 2009 Dovecot authors, see the included COPYING file */
+
+#include "test-lib.h"
+#include "llist.h"
+
+#include <stdlib.h>
+
+struct dllist {
+       struct dllist *prev, *next;
+};
+
+static void test_dllist(void)
+{
+       struct dllist *head = NULL, *l4, *l3, *l2, *l1;
+
+       l4 = t_new(struct dllist, 1);
+       l3 = t_new(struct dllist, 1);
+       l2 = t_new(struct dllist, 1);
+       l1 = t_new(struct dllist, 1);
+
+       test_begin("dllist");
+       DLLIST_PREPEND(&head, l4);
+       test_assert(head == l4);
+       test_assert(l4->prev == NULL && l4->next == NULL);
+       DLLIST_PREPEND(&head, l3);
+       test_assert(head == l3);
+       test_assert(l3->prev == NULL && l3->next == l4);
+       test_assert(l4->prev == l3 && l4->next == NULL);
+       DLLIST_PREPEND(&head, l2);
+       DLLIST_PREPEND(&head, l1);
+       /* remove from middle */
+       DLLIST_REMOVE(&head, l2);
+       test_assert(l2->prev == NULL && l2->next == NULL);
+       test_assert(head == l1);
+       test_assert(l1->prev == NULL && l1->next == l3);
+       test_assert(l3->prev == l1 && l3->next == l4);
+       test_assert(l4->prev == l3 && l4->next == NULL);
+       /* remove from head */
+       DLLIST_REMOVE(&head, l1);
+       test_assert(l1->prev == NULL && l1->next == NULL);
+       test_assert(head == l3);
+       test_assert(l3->prev == NULL && l3->next == l4);
+       test_assert(l4->prev == l3 && l4->next == NULL);
+       /* remove from tail */
+       DLLIST_PREPEND(&head, l1);
+       DLLIST_REMOVE(&head, l4);
+       test_assert(l4->prev == NULL && l4->next == NULL);
+       test_assert(head == l1);
+       test_assert(l1->prev == NULL && l1->next == l3);
+       test_assert(l3->prev == l1 && l3->next == NULL);
+       /* remove last two */
+       DLLIST_REMOVE(&head, l1);
+       DLLIST_REMOVE(&head, l3);
+       test_assert(l3->prev == NULL && l3->next == NULL);
+       test_assert(head == NULL);
+       test_end();
+}
+
+static void test_dllist2(void)
+{
+       struct dllist *head = NULL, *tail = NULL, *l4, *l3, *l2, *l1;
+
+       l4 = t_new(struct dllist, 1);
+       l3 = t_new(struct dllist, 1);
+       l2 = t_new(struct dllist, 1);
+       l1 = t_new(struct dllist, 1);
+
+       test_begin("dllist");
+       /* prepend to empty */
+       DLLIST2_PREPEND(&head, &tail, l3);
+       test_assert(head == l3 && tail == l3);
+       test_assert(l3->next == NULL && l3->prev == NULL);
+       /* remove last */
+       DLLIST2_REMOVE(&head, &tail, l3);
+       test_assert(head == NULL && tail == NULL);
+       test_assert(l3->next == NULL && l3->prev == NULL);
+       /* append to empty */
+       DLLIST2_APPEND(&head, &tail, l3);
+       test_assert(head == l3 && tail == l3);
+       test_assert(l3->next == NULL && l3->prev == NULL);
+       /* prepend */
+       DLLIST2_PREPEND(&head, &tail, l2);
+       test_assert(head == l2 && tail == l3);
+       test_assert(l2->prev == NULL && l2->next == l3);
+       test_assert(l3->prev == l2 && l3->next == NULL);
+       /* append */
+       DLLIST2_APPEND(&head, &tail, l4);
+       test_assert(head == l2 && tail == l4);
+       test_assert(l2->prev == NULL && l2->next == l3);
+       test_assert(l3->prev == l2 && l3->next == l4);
+       test_assert(l4->prev == l3 && l4->next == NULL);
+       DLLIST2_PREPEND(&head, &tail, l1);
+
+       /* remove from middle */
+       DLLIST2_REMOVE(&head, &tail, l2);
+       test_assert(l2->prev == NULL && l2->next == NULL);
+       test_assert(head == l1 && tail == l4);
+       test_assert(l1->prev == NULL && l1->next == l3);
+       test_assert(l3->prev == l1 && l3->next == l4);
+       test_assert(l4->prev == l3 && l4->next == NULL);
+       /* remove from head */
+       DLLIST2_REMOVE(&head, &tail, l1);
+       test_assert(l1->prev == NULL && l1->next == NULL);
+       test_assert(head == l3 && tail == l4);
+       test_assert(l3->prev == NULL && l3->next == l4);
+       test_assert(l4->prev == l3 && l4->next == NULL);
+       /* remove from tail */
+       DLLIST2_PREPEND(&head, &tail, l1);
+       DLLIST2_REMOVE(&head, &tail, l4);
+       test_assert(l4->prev == NULL && l4->next == NULL);
+       test_assert(head == l1 && tail == l3);
+       test_assert(l1->prev == NULL && l1->next == l3);
+       test_assert(l3->prev == l1 && l3->next == NULL);
+       /* remove last two */
+       DLLIST2_REMOVE(&head, &tail, l1);
+       DLLIST2_REMOVE(&head, &tail, l3);
+       test_assert(l3->prev == NULL && l3->next == NULL);
+       test_assert(head == NULL && tail == NULL);
+       test_end();
+}
+
+void test_llist(void)
+{
+       test_dllist();
+       test_dllist2();
+}