X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fbbf6a918abf456af097bd030d4cf533a629092..69128883beb4dfd713ece4ca484f37aab0461101:/include/xbt/swag.h diff --git a/include/xbt/swag.h b/include/xbt/swag.h index 627799dbe2..9ebd506420 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -38,10 +38,10 @@ SG_BEGIN_DECL() those structs directly. Use them as an abstract datatype. */ /* @{ */ - typedef struct xbt_swag_hookup { - void *next; - void *prev; - } s_xbt_swag_hookup_t; +typedef struct xbt_swag_hookup { + void *next; + void *prev; +} s_xbt_swag_hookup_t; /**< This type should be added to a type that is to be used in a swag. * * Whenever a new object with this struct is created, all fields have @@ -68,15 +68,15 @@ typedef struct foo { } \endcode */ - typedef s_xbt_swag_hookup_t *xbt_swag_hookup_t; +typedef s_xbt_swag_hookup_t *xbt_swag_hookup_t; - typedef struct xbt_swag { - void *head; - void *tail; - size_t offset; - int count; - } s_xbt_swag_t, *xbt_swag_t; +typedef struct xbt_swag { + void *head; + void *tail; + size_t offset; + int count; +} s_xbt_swag_t, *xbt_swag_t; /**< A typical swag */ /* @} */ @@ -89,19 +89,30 @@ typedef struct foo { XBT_PUBLIC(xbt_swag_t) xbt_swag_new(size_t offset); XBT_PUBLIC(void) xbt_swag_free(xbt_swag_t swag); XBT_PUBLIC(void) xbt_swag_init(xbt_swag_t swag, size_t offset); -XBT_PUBLIC(void) xbt_swag_insert(void *obj, xbt_swag_t swag); + +/** + * \param obj the objet to insert in the swag + * \param swag a swag + * @hideinitializer + * + * insert \a obj in \a swag + */ +#define xbt_swag_insert(obj, swag) xbt_swag_insert_at_tail(obj, swag) + XBT_PUBLIC(void) xbt_swag_insert_at_head(void *obj, xbt_swag_t swag); XBT_PUBLIC(void) xbt_swag_insert_at_tail(void *obj, xbt_swag_t swag); XBT_PUBLIC(void *) xbt_swag_remove(void *obj, xbt_swag_t swag); XBT_PUBLIC(void *) xbt_swag_extract(xbt_swag_t swag); XBT_PUBLIC(int) xbt_swag_size(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_getPrev(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev) +#define xbt_swag_getNext(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next) -static XBT_INLINE int xbt_swag_belongs(void *obj, xbt_swag_t swag) { - return ((xbt_swag_getNext(obj, swag->offset)) || (xbt_swag_getPrev(obj, swag->offset)) - || (swag->head == obj)); +static XBT_INLINE int xbt_swag_belongs(void *obj, xbt_swag_t swag) +{ + return ((xbt_swag_getNext(obj, swag->offset)) + || (xbt_swag_getPrev(obj, swag->offset)) + || (swag->head == obj)); } static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag) @@ -164,4 +175,4 @@ static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag) /* @} */ SG_END_DECL() -#endif /* _XBT_SWAG_H */ +#endif /* _XBT_SWAG_H */