X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a866e7e4a9359b24914796fb19d60cd7ba9b7ec0..7f379953cbe4a9a5b60472c218a6189d523856cd:/include/xbt/swag.h

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 45fd60bd9e..21d40fd1f2 100644
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -1,15 +1,22 @@
-/* Authors: Arnaud Legrand                                                  */
+/* 	$Id$	 */
+
+/* Copyright (c) 2004 Arnaud Legrand. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* Warning, this module is done to be efficient and performs tons of
    cast and dirty things. So avoid using it unless you really know
    what you are doing. */
 
-/* This type should be added to a type that is to be used in such a swag */
-/* Whenever a new object with this struct is created, all fields have to be swag to NULL */
+#ifndef _XBT_SWAG_H
+#define _XBT_SWAG_H
+
+#include "xbt/sysdep.h"
 
+/* This type should be added to a type that is to be used in such a swag */
+/* Whenever a new object with this struct is created, all fields have
+   to be set to NULL */
 typedef struct xbt_swag_hookup {
   void *next;
   void *prev;
@@ -23,23 +30,38 @@ typedef struct xbt_swag {
 } s_xbt_swag_t, *xbt_swag_t;
 
 xbt_swag_t xbt_swag_new(size_t offset);
+void xbt_swag_free(xbt_swag_t swag);
 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);
-int  xbt_swag_size(xbt_swag_t swag);
-int  xbt_swag_belongs(void *obj,xbt_swag_t swag);
+void xbt_swag_insert(void *obj, xbt_swag_t swag);
+void xbt_swag_insert_at_head(void *obj, xbt_swag_t swag);
+void xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag);
+void *xbt_swag_remove(void *obj, xbt_swag_t swag);
+void *xbt_swag_extract(xbt_swag_t swag);
+int xbt_swag_size(xbt_swag_t swag);
+int xbt_swag_belongs(void *obj, xbt_swag_t swag);
 
 static __inline__ void *xbt_swag_getFirst(xbt_swag_t swag)
 {
-  return(swag->head);
+  return (swag->head);
 }
 
 #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_offset(var,field) ((char *)&( (var).field ) - (char *)&(var))
 
 #define xbt_swag_foreach(obj,swag)                            \
-   for((obj)=xbt_swag_getFirst((swag));                           \
+   for((obj)=xbt_swag_getFirst((swag));                       \
        (obj)!=NULL;                                           \
        (obj)=xbt_swag_getNext((obj),(swag)->offset))
+
+#define xbt_swag_foreach_safe(obj,obj_next,swag)                  \
+   for((obj)=xbt_swag_getFirst((swag)),                           \
+       ((obj)?(obj_next=xbt_swag_getNext((obj),(swag)->offset)):  \
+	         (obj_next=NULL));                                \
+       (obj)!=NULL;                                               \
+       (obj)=obj_next,                                            \
+       ((obj)?(obj_next=xbt_swag_getNext((obj),(swag)->offset)):  \
+                 (obj_next=NULL))     )
+
+#endif    /* _XBT_SWAG_H */