X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..703b8d1aad4cbad68010429cd3aec85ae7a61b2b:/src/xbt/swag.c

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index f6e7107455..6bf90c0fab 100644
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -14,14 +14,13 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 
-
 /** Creates a new swag.
  * \param offset where the hookup is located in the structure
  * \see xbt_swag_offset
  *
  * Usage : xbt_swag_new(&obj.setA-&obj);
  */
-XBT_INLINE xbt_swag_t xbt_swag_new(size_t offset)
+inline xbt_swag_t xbt_swag_new(size_t offset)
 {
   xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);
 
@@ -33,10 +32,10 @@ XBT_INLINE xbt_swag_t xbt_swag_new(size_t offset)
 /**
  * \param swag poor victim
  *
- * kilkil a swag but not it's content. If you do not understand why
- * xbt_swag_free should not free its content, don't use swags.
+ * kilkil a swag but not it's content. If you do not understand why xbt_swag_free should not free its content,
+ * don't use swags.
  */
-XBT_INLINE void xbt_swag_free(xbt_swag_t swag)
+inline void xbt_swag_free(xbt_swag_t swag)
 {
   free(swag);
 }
@@ -48,7 +47,7 @@ XBT_INLINE void xbt_swag_free(xbt_swag_t swag)
  *
  * Usage : xbt_swag_init(swag,&obj.setA-&obj);
  */
-XBT_INLINE void xbt_swag_init(xbt_swag_t swag, size_t offset)
+inline void xbt_swag_init(xbt_swag_t swag, size_t offset)
 {
   swag->tail = NULL;
   swag->head = NULL;
@@ -56,88 +55,54 @@ XBT_INLINE void xbt_swag_init(xbt_swag_t swag, size_t offset)
   swag->count = 0;
 }
 
-
 /**
  * \param obj the objet to insert in the swag
  * \param swag a swag
  *
- * insert \a obj in \a swag
+ * insert (at the head... you probably had a very good reason to do that, I hope you know what you're doing) \a obj in
+ * \a swag
  */
-XBT_INLINE void xbt_swag_insert(void *obj, xbt_swag_t swag)
+inline void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
 {
+  xbt_assert(!xbt_swag_belongs(obj, swag) || swag->tail,
+      "This object belongs to an empty swag! Did you correctly initialize the object's hookup?");
 
-  if (xbt_swag_belongs(obj, swag))
-    return;
-
-  (swag->count)++;
-  if (swag->head == NULL) {
-    xbt_assert0(!(swag->tail), "Inconsistent swag.");
+  if (!swag->head) {
+    xbt_assert(!(swag->tail), "Inconsistent swag.");
     swag->head = obj;
     swag->tail = obj;
-    return;
-  }
-
-  xbt_swag_getPrev(obj, swag->offset) = swag->tail;
-  xbt_swag_getNext(xbt_swag_getPrev(obj, swag->offset), swag->offset) =
-      obj;
-
-  swag->tail = obj;
-}
-
-/**
- * \param obj the objet to insert in the swag
- * \param swag a swag
- *
- * insert (at the head... you probably had a very good reason to do
- * that, I hope you know what you're doing) \a obj in \a swag
- */
-XBT_INLINE 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->count++;
+  } else if (obj != swag->head && !xbt_swag_getPrev(obj, swag->offset)) {
+    xbt_swag_getNext(obj, swag->offset) = swag->head;
+    xbt_swag_getPrev(swag->head, swag->offset) = obj;
     swag->head = obj;
-    swag->tail = obj;
-    return;
+    swag->count++;
   }
-
-  xbt_swag_getNext(obj, swag->offset) = swag->head;
-  xbt_swag_getPrev(xbt_swag_getNext(obj, swag->offset), swag->offset) =
-      obj;
-
-  swag->head = obj;
 }
 
 /**
  * \param obj the objet to insert in the swag
  * \param swag a swag
  *
- * insert (at the tail... you probably had a very good reason to do
- * that, I hope you know what you're doing) \a obj in \a swag
+ * insert (at the tail... you probably had a very good reason to do that, I hope you know what you're doing) \a obj in
+ * \a swag
  */
-XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
+inline void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
 {
+  xbt_assert(!xbt_swag_belongs(obj, swag) || swag->tail,
+      "This object belongs to an empty swag! Did you correctly initialize the object's hookup?");
 
-  if (xbt_swag_belongs(obj, swag))
-    return;
-
-  (swag->count)++;
-  if (swag->head == NULL) {
-    xbt_assert0(!(swag->tail), "Inconsistent swag.");
+  if (!swag->head) {
+    xbt_assert(!(swag->tail), "Inconsistent swag.");
     swag->head = obj;
     swag->tail = obj;
-    return;
+    swag->count++;
+  } else if (obj != swag->tail && !xbt_swag_getNext(obj, swag->offset)) {
+    xbt_swag_getPrev(obj, swag->offset) = swag->tail;
+    xbt_swag_getNext(swag->tail, swag->offset) = obj;
+    swag->tail = obj;
+    swag->count++;
   }
-
-  xbt_swag_getPrev(obj, swag->offset) = swag->tail;
-  xbt_swag_getNext(xbt_swag_getPrev(obj, swag->offset), swag->offset) =
-      obj;
-
-  swag->tail = obj;
 }
 
 /**
@@ -147,38 +112,35 @@ XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
  *
  * removes \a obj from \a swag
  */
-XBT_INLINE void *xbt_swag_remove(void *obj, xbt_swag_t swag)
+inline void *xbt_swag_remove(void *obj, xbt_swag_t swag)
 {
-  size_t offset = swag->offset;
-
-  if ((!obj) || (!swag))
-    return NULL;
-  if (!xbt_swag_belongs(obj, swag))     /* Trying to remove an object that
-                                           was not in this swag */
+  if (!obj)
     return NULL;
 
-  if (swag->head == swag->tail) {       /* special case */
-    if (swag->head != obj)      /* Trying to remove an object that was not in this swag */
-      return NULL;
-    swag->head = NULL;
-    swag->tail = NULL;
-    xbt_swag_getNext(obj, offset) = xbt_swag_getPrev(obj, offset) = NULL;
-  } else if (obj == swag->head) {       /* It's the head */
-    swag->head = xbt_swag_getNext(obj, offset);
-    xbt_swag_getPrev(swag->head, offset) = NULL;
-    xbt_swag_getNext(obj, offset) = NULL;
-  } else if (obj == swag->tail) {       /* It's the tail */
-    swag->tail = xbt_swag_getPrev(obj, offset);
-    xbt_swag_getNext(swag->tail, offset) = NULL;
+  size_t offset = swag->offset;
+  void* prev = xbt_swag_getPrev(obj, offset);
+  void* next = xbt_swag_getNext(obj, offset);
+
+  if (prev) {
+    xbt_swag_getNext(prev, offset) = next;
     xbt_swag_getPrev(obj, offset) = NULL;
-  } else {                      /* It's in the middle */
-    xbt_swag_getNext(xbt_swag_getPrev(obj, offset), offset) =
-        xbt_swag_getNext(obj, offset);
-    xbt_swag_getPrev(xbt_swag_getNext(obj, offset), offset) =
-        xbt_swag_getPrev(obj, offset);
-    xbt_swag_getPrev(obj, offset) = xbt_swag_getNext(obj, offset) = NULL;
+    if (next) {
+      xbt_swag_getPrev(next, offset) = prev;
+      xbt_swag_getNext(obj, offset) = NULL;
+    } else {
+      swag->tail = prev;
+    }
+    swag->count--;
+  } else if (next) {
+    xbt_swag_getPrev(next, offset) = NULL;
+    xbt_swag_getNext(obj, offset) = NULL;
+    swag->head = next;
+    swag->count--;
+  } else if (obj == swag->head) {
+    swag->head = swag->tail = NULL;
+    swag->count--;
   }
-  (swag->count)--;
+
   return obj;
 }
 
@@ -188,17 +150,14 @@ XBT_INLINE void *xbt_swag_remove(void *obj, xbt_swag_t swag)
  */
 void *xbt_swag_extract(xbt_swag_t swag)
 {
-  size_t offset = swag->offset;
-  void *obj = NULL;
-
-  if ((!swag) || (!(swag->head)))
+  if (!swag->head)
     return NULL;
 
-  obj = swag->head;
+  size_t offset = swag->offset;
+  void* obj = swag->head;
 
-  if (swag->head == swag->tail) {       /* special case */
+  if (obj == swag->tail) {       /* special case */
     swag->head = swag->tail = NULL;
-    xbt_swag_getPrev(obj, offset) = xbt_swag_getNext(obj, offset) = NULL;
   } else {
     swag->head = xbt_swag_getNext(obj, offset);
     xbt_swag_getPrev(swag->head, offset) = NULL;
@@ -213,12 +172,11 @@ void *xbt_swag_extract(xbt_swag_t swag)
  * \param swag a swag
  * \return the number of objects in \a swag
  */
-XBT_INLINE int xbt_swag_size(xbt_swag_t swag)
+inline int xbt_swag_size(const_xbt_swag_t swag)
 {
   return (swag->count);
 }
 
-
 #ifdef SIMGRID_TEST
 
 XBT_TEST_SUITE("swag", "Swag data container");
@@ -241,9 +199,8 @@ XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
   obj1->name = "Obj 1";
   obj2->name = "Obj 2";
 
-  xbt_test_add0("Basic usage");
-  xbt_test_log3("%p %p %ld\n", obj1, &(obj1->setB),
-                (long) ((char *) &(obj1->setB) - (char *) obj1));
+  xbt_test_add("Basic usage");
+  xbt_test_log("%p %p %ld\n", obj1, &(obj1->setB), (long) ((char *) &(obj1->setB) - (char *) obj1));
 
   setA = xbt_swag_new(xbt_swag_offset(*obj1, setA));
   setB = xbt_swag_new(xbt_swag_offset(*obj1, setB));
@@ -253,20 +210,20 @@ XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
   xbt_swag_insert(obj2, setA);
   xbt_swag_insert(obj2, setB);
 
-  xbt_swag_remove(obj1, setB);
-  /*  xbt_swag_remove(obj2, setB); */
+  xbt_test_assert(xbt_swag_remove(NULL, setB) == NULL);
+  xbt_test_assert(xbt_swag_remove(obj1, setB) == obj1);
 
-  xbt_test_add0("Traverse set A");
+  xbt_test_add("Traverse set A");
   xbt_swag_foreach(obj, setA) {
-    xbt_test_log1("Saw: %s", obj->name);
+    xbt_test_log("Saw: %s", obj->name);
   }
 
-  xbt_test_add0("Traverse set B");
+  xbt_test_add("Traverse set B");
   xbt_swag_foreach(obj, setB) {
-    xbt_test_log1("Saw: %s", obj->name);
+    xbt_test_log("Saw: %s", obj->name);
   }
 
-  xbt_test_add0("Ensure set content and length");
+  xbt_test_add("Ensure set content and length");
   xbt_test_assert(xbt_swag_belongs(obj1, setA));
   xbt_test_assert(xbt_swag_belongs(obj2, setA));
 
@@ -278,6 +235,8 @@ XBT_TEST_UNIT("basic", test_swag_basic, "Basic usage")
 
   xbt_swag_free(setA);
   xbt_swag_free(setB);
-}
 
+  xbt_free(obj1);
+  xbt_free(obj2);
+}
 #endif                          /* SIMGRID_TEST */