X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/444abc179efeaa1cfa259f967fc68a7c032fe5eb..8f3e7df6480d8da4db694b9ba382fa8c416ed916:/src/xbt/swag.c

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index 9d6c209b0b..bc2361a72a 100644
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -22,7 +21,7 @@
  *
  * Usage : xbt_swag_new(&obj.setA-&obj);
  */
-xbt_swag_t xbt_swag_new(size_t offset)
+XBT_INLINE xbt_swag_t xbt_swag_new(size_t offset)
 {
   xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);
 
@@ -37,7 +36,7 @@ xbt_swag_t xbt_swag_new(size_t offset)
  * 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.
  */
-void xbt_swag_free(xbt_swag_t swag)
+XBT_INLINE void xbt_swag_free(xbt_swag_t swag)
 {
   free(swag);
 }
@@ -49,7 +48,7 @@ void xbt_swag_free(xbt_swag_t swag)
  *
  * Usage : xbt_swag_init(swag,&obj.setA-&obj);
  */
-void xbt_swag_init(xbt_swag_t swag, size_t offset)
+XBT_INLINE void xbt_swag_init(xbt_swag_t swag, size_t offset)
 {
   swag->tail = NULL;
   swag->head = NULL;
@@ -64,7 +63,7 @@ void xbt_swag_init(xbt_swag_t swag, size_t offset)
  *
  * insert \a obj in \a swag
  */
-void xbt_swag_insert(void *obj, xbt_swag_t swag)
+XBT_INLINE void xbt_swag_insert(void *obj, xbt_swag_t swag)
 {
 
   if (xbt_swag_belongs(obj, swag))
@@ -79,8 +78,7 @@ void xbt_swag_insert(void *obj, xbt_swag_t swag)
   }
 
   xbt_swag_getPrev(obj, swag->offset) = swag->tail;
-  xbt_swag_getNext(xbt_swag_getPrev(obj, swag->offset), swag->offset) = obj;
-
+  xbt_swag_getNext(swag->tail, swag->offset) = obj;
   swag->tail = obj;
 }
 
@@ -91,7 +89,7 @@ void xbt_swag_insert(void *obj, xbt_swag_t 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
  */
-void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
+XBT_INLINE void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
 {
 
   if (xbt_swag_belongs(obj, swag))
@@ -106,8 +104,7 @@ void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag)
   }
 
   xbt_swag_getNext(obj, swag->offset) = swag->head;
-  xbt_swag_getPrev(xbt_swag_getNext(obj, swag->offset), swag->offset) = obj;
-
+  xbt_swag_getPrev(swag->head, swag->offset) = obj;
   swag->head = obj;
 }
 
@@ -118,7 +115,7 @@ void xbt_swag_insert_at_head(void *obj, xbt_swag_t 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
  */
-void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
+XBT_INLINE void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
 {
 
   if (xbt_swag_belongs(obj, swag))
@@ -133,8 +130,7 @@ void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
   }
 
   xbt_swag_getPrev(obj, swag->offset) = swag->tail;
-  xbt_swag_getNext(xbt_swag_getPrev(obj, swag->offset), swag->offset) = obj;
-
+  xbt_swag_getNext(swag->tail, swag->offset) = obj;
   swag->tail = obj;
 }
 
@@ -145,7 +141,7 @@ void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag)
  *
  * removes \a obj from \a swag
  */
-void *xbt_swag_remove(void *obj, xbt_swag_t swag)
+XBT_INLINE void *xbt_swag_remove(void *obj, xbt_swag_t swag)
 {
   size_t offset = swag->offset;
 
@@ -170,8 +166,10 @@ void *xbt_swag_remove(void *obj, xbt_swag_t swag)
     xbt_swag_getNext(swag->tail, offset) = NULL;
     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_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;
   }
   (swag->count)--;
@@ -209,7 +207,7 @@ void *xbt_swag_extract(xbt_swag_t swag)
  * \param swag a swag
  * \return the number of objects in \a swag
  */
-int xbt_swag_size(xbt_swag_t swag)
+XBT_INLINE int xbt_swag_size(xbt_swag_t swag)
 {
   return (swag->count);
 }
@@ -274,6 +272,9 @@ 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 */
+#endif                          /* SIMGRID_TEST */