-introducing MDLL macros

2 files changed, 126 insertions, 1 deletions

diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index a476b7f1b..2da177f16 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -832,6 +832,131 @@ GNUNET_CONTAINER_multihashmap_get_multiple (const struct
   (element)->prev = NULL; } while (0)
 
 
+/* ************ Multi-DLL interface, allows DLL elements to be
+   in multiple lists at the same time *********************** */
+
+/**
+ * Insert an element at the head of a MDLL. Assumes that head, tail and
+ * element are structs with prev and next fields.
+ *
+ * @param head pointer to the head of the MDLL
+ * @param tail pointer to the tail of the MDLL
+ * @param element element to insert
+ */
+#define GNUNET_CONTAINER_MDLL_insert(mdll,head,tail,element) do {       \
+  GNUNET_assert ( ( (element)->prev_##mdll == NULL) && ((head) != (element))); \
+  GNUNET_assert ( ( (element)->next_##mdll == NULL) && ((tail) != (element))); \
+  (element)->next_##mdll = (head); \
+  (element)->prev_##mdll = NULL; \
+  if ((tail) == NULL) \
+    (tail) = element; \
+  else \
+    (head)->prev_##mdll = element; \
+  (head) = (element); } while (0)
+
+
+/**
+ * Insert an element at the tail of a MDLL. Assumes that head, tail and
+ * element are structs with prev and next fields.
+ *
+ * @param head pointer to the head of the MDLL
+ * @param tail pointer to the tail of the MDLL
+ * @param element element to insert
+ */
+#define GNUNET_CONTAINER_MDLL_insert_tail(mdll,head,tail,element) do {  \
+  GNUNET_assert ( ( (element)->prev_##mdll == NULL) && ((head) != (element))); \
+  GNUNET_assert ( ( (element)->next_##mdll == NULL) && ((tail) != (element))); \
+  (element)->prev_##mdll = (tail); \
+  (element)->next_##mdll = NULL; \
+  if ((head) == NULL) \
+    (head) = element; \
+  else \
+    (tail)->next_##mdll = element; \
+  (tail) = (element); } while (0)
+
+
+/**
+ * Insert an element into a MDLL after the given other element.  Insert
+ * at the head if the other element is NULL.
+ *
+ * @param head pointer to the head of the MDLL
+ * @param tail pointer to the tail of the MDLL
+ * @param other prior element, NULL for insertion at head of MDLL
+ * @param element element to insert
+ */
+#define GNUNET_CONTAINER_MDLL_insert_after(mdll,head,tail,other,element) do { \
+  GNUNET_assert ( ( (element)->prev_##mdll == NULL) && ((head) != (element))); \
+  GNUNET_assert ( ( (element)->next_##mdll == NULL) && ((tail) != (element))); \
+  (element)->prev_##mdll = (other); \
+  if (NULL == other) \
+    { \
+      (element)->next_##mdll = (head); \
+      (head) = (element); \
+    } \
+  else \
+    { \
+      (element)->next_##mdll = (other)->next_##mdll; \
+      (other)->next_##mdll = (element); \
+    } \
+  if (NULL == (element)->next_##mdll) \
+    (tail) = (element); \
+  else \
+    (element)->next->prev_##mdll = (element); } while (0)
+
+
+/**
+ * Insert an element into a MDLL before the given other element.  Insert
+ * at the tail if the other element is NULL.
+ *
+ * @param head pointer to the head of the MDLL
+ * @param tail pointer to the tail of the MDLL
+ * @param other prior element, NULL for insertion at head of MDLL
+ * @param element element to insert
+ */
+#define GNUNET_CONTAINER_MDLL_insert_before(mdll,head,tail,other,element) do { \
+  GNUNET_assert ( ( (element)->prev_##mdll == NULL) && ((head) != (element))); \
+  GNUNET_assert ( ( (element)->next_##mdll == NULL) && ((tail) != (element))); \
+  (element)->next_##mdll = (other); \
+  if (NULL == other) \
+    { \
+      (element)->prev = (tail); \
+      (tail) = (element); \
+    } \
+  else \
+    { \
+      (element)->prev_##mdll = (other)->prev_##mdll; \
+      (other)->prev_##mdll = (element); \
+    } \
+  if (NULL == (element)->prev_##mdll) \
+    (head) = (element); \
+  else \
+    (element)->prev_##mdll->next_##mdll = (element); } while (0)
+
+
+/**
+ * Remove an element from a MDLL. Assumes
+ * that head, tail and element are structs
+ * with prev and next fields.
+ *
+ * @param head pointer to the head of the MDLL
+ * @param tail pointer to the tail of the MDLL
+ * @param element element to remove
+ */
+#define GNUNET_CONTAINER_MDLL_remove(mdll,head,tail,element) do {       \
+  GNUNET_assert ( ( (element)->prev_##mdll != NULL) || ((head) == (element))); \
+  GNUNET_assert ( ( (element)->next_##mdll != NULL) || ((tail) == (element))); \
+  if ((element)->prev_##mdll == NULL) \
+    (head) = (element)->next_##mdll;  \
+  else \
+    (element)->prev_##mdll->next_##mdll = (element)->next_##mdll; \
+  if ((element)->next_##mdll == NULL) \
+    (tail) = (element)->prev_##mdll;  \
+  else \
+    (element)->next_##mdll->prev_##mdll = (element)->prev_##mdll; \
+  (element)->next_##mdll = NULL; \
+  (element)->prev_##mdll = NULL; } while (0)
+
+
 
 /* ******************** Heap *************** */
 
diff --git a/src/include/platform.h b/src/include/platform.h
index 8bd2e6706..912601dad 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -50,7 +50,7 @@
 #include <sys/types.h>
 #endif
 
-#define ALLOW_EXTRA_CHECKS GNUNET_NO
+#define ALLOW_EXTRA_CHECKS GNUNET_YES
 
 /**
  * For strptime (glibc2 needs this).