Rha!

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

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index dc09977..5b2f758 100644 (file)
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -13,11 +13,13 @@
 #include "xbt/error.h"
 #include "xbt/swag.h"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(swag,xbt,"Swag : O(1) set library");
+
 #define PREV(obj,offset) xbt_swag_getPrev(obj,offset)
 #define NEXT(obj,offset) xbt_swag_getNext(obj,offset)
 
 /*
-  Usage : xbt_swag_new(&obj.setA-&obj.setA);
+  Usage : xbt_swag_new(&obj.setA-&obj);
  */
 
 xbt_swag_t xbt_swag_new(size_t offset)
@@ -29,6 +31,12 @@ xbt_swag_t xbt_swag_new(size_t offset)
   return swag;
 }
 
+
+void xbt_swag_free(xbt_swag_t swag)
+{
+  xbt_free(swag);
+}
+
 void xbt_swag_init(xbt_swag_t swag, size_t offset)
 {
   swag->offset = offset;
@@ -53,11 +61,11 @@ void xbt_swag_insert(void *obj, xbt_swag_t swag)
   swag->tail = obj;
 }
 
-void *xbt_swag_extract(void *obj, xbt_swag_t swag)
+void *xbt_swag_remove(void *obj, xbt_swag_t swag)
 {
   size_t offset = swag->offset;
 
-  if (!obj)
+  if ((!obj) || (!swag))
     return NULL;
   if(!xbt_swag_belongs(obj, swag)) /* Trying to remove an object that
                                      was not in this swag */
@@ -85,6 +93,27 @@ void *xbt_swag_extract(void *obj, xbt_swag_t swag)
   return obj;
 }
 
+void *xbt_swag_extract(xbt_swag_t swag)
+{
+  size_t offset = swag->offset;
+  void *obj = NULL;
+
+  if ((!swag) || (!(swag->head)))
+    return NULL;
+
+  obj = swag->head;
+
+  if (swag->head == swag->tail) {      /* special case */
+    swag->head = swag->tail = NULL;
+  } else {
+    swag->head = NEXT(obj, offset);
+    PREV(swag->head, offset) = NULL;
+    NEXT(obj, offset) = NULL;
+  }
+
+  return obj;
+}
+
 int xbt_swag_size(xbt_swag_t swag)
 {
   return (swag->count);