From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 19 Jan 2005 18:13:44 +0000 (+0000)
Subject: bugfix (shame on me!) + asserts to detect earlier weird behavior
X-Git-Tag: v3.3~4589
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b84ee836eb252fb8d20a6d6c60a4321100b033c8

bugfix (shame on me!) + asserts to detect earlier weird behavior


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@761 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index c9730dee16..dae77dc705 100644
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -52,6 +52,7 @@ 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;
@@ -71,6 +72,7 @@ void xbt_swag_insert_at_head(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;
@@ -90,6 +92,7 @@ void xbt_swag_insert_at_tail(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;
@@ -116,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;
@@ -145,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;