I probably had been drinking too much the day I have written this command... Sorry...

[simgrid.git] / src / xbt / swag.c

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index 3c2793a..dae77dc 100644 (file)
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -52,6 +52,47 @@ void xbt_swag_insert(void *obj, xbt_swag_t swag)
 
   (swag->count)++;
   if (swag->head == NULL) {
+    xbt_assert0(!(swag->tail), "Inconsistent swag.");
+    swag->head = obj;
+    swag->tail = obj;
+    return;
+  }
+
+  PREV(obj, swag->offset) = swag->tail;
+  NEXT(PREV(obj, swag->offset), swag->offset) = obj;
+
+  swag->tail = obj;
+}
+
+void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
+{
+
+  if (xbt_swag_belongs(obj, swag))
+    return;
+
+  (swag->count)++;
+  if (swag->head == NULL) {
+    xbt_assert0(!(swag->tail), "Inconsistent swag.");
+    swag->head = obj;
+    swag->tail = obj;
+    return;
+  }
+
+  NEXT(obj, swag->offset) = swag->head;
+  PREV(NEXT(obj, swag->offset), swag->offset) = obj;
+
+  swag->head = obj;
+}
+
+void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
+{
+
+  if (xbt_swag_belongs(obj, swag))
+    return;
+
+  (swag->count)++;
+  if (swag->head == NULL) {
+    xbt_assert0(!(swag->tail), "Inconsistent swag.");
     swag->head = obj;
     swag->tail = obj;
     return;
@@ -78,6 +119,7 @@ void *xbt_swag_remove(void *obj, xbt_swag_t swag)
       return NULL;
     swag->head = NULL;
     swag->tail = NULL;
+    NEXT(obj, offset) = PREV(obj, offset) = NULL;
   } else if (obj == swag->head) {      /* It's the head */
     swag->head = NEXT(obj, offset);
     PREV(swag->head, offset) = NULL;
@@ -107,6 +149,7 @@ void *xbt_swag_extract(xbt_swag_t swag)
 
   if (swag->head == swag->tail) {      /* special case */
     swag->head = swag->tail = NULL;
+    PREV(obj, offset) = NEXT(obj, offset) = NULL;
   } else {
     swag->head = NEXT(obj, offset);
     PREV(swag->head, offset) = NULL;