Extract returns the object to remove if present in the swag and NULL

[simgrid.git] / include / xbt / swag.h

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 75ce345..3b8a0e7 100644 (file)
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -23,8 +23,9 @@ typedef struct xbt_swag {
 } s_xbt_swag_t, *xbt_swag_t;
 
 xbt_swag_t xbt_swag_new(size_t offset);
+void xbt_swag_init(xbt_swag_t swag, size_t offset);
 void  xbt_swag_insert(void *obj,xbt_swag_t swag);
-void xbt_swag_extract(void *obj, xbt_swag_t swag);
+void *xbt_swag_extract(void *obj, xbt_swag_t swag);
 int  xbt_swag_size(xbt_swag_t swag);
 int  xbt_swag_belongs(void *obj,xbt_swag_t swag);
 
@@ -36,6 +37,7 @@ static __inline__ void *xbt_swag_getFirst(xbt_swag_t swag)
 #define xbt_swag_getNext(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev)
 #define xbt_swag_getPrev(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next)
 
+#define xbt_swag_offset(var,field) ((char *)&( (var).field ) - (char *)&(var)) 
 
 #define xbt_swag_foreach(obj,swag)                            \
    for(obj=xbt_swag_getFirst(swag);                           \