X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/268981d54533fb025d1353582cf229d235eb2fb2..4351658448f75c635736fc7a9bad6fb24fb7087c:/include/xbt/swag.h
diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 863b8a52c7..69004c3ebc 100644
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -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. */
@@ -13,17 +12,14 @@
#define _XBT_SWAG_H
#include "xbt/misc.h"
-#include "xbt/sysdep.h" /* sizeof */
+#include "xbt/sysdep.h" /* size_t */
+
+SG_BEGIN_DECL()
/**
* @addtogroup XBT_swag
* @brief a O(1) set based on linked lists
*
- *
Top | [\ref index]::[\ref XBT_API]
- * |
Prev | [\ref XBT_fifo]
- * |
Next | [\ref XBT_heap]
- * |
Down | [\ref XBT_swag_type] |
- *
* Warning, this module is done to be efficient and performs tons of
* cast and dirty things. So make sure you know what you are doing while using it.
* It is basically a fifo but with restrictions so that
@@ -31,14 +27,9 @@
* no call to malloc/free is done.
*
*/
-
/** @defgroup XBT_swag_type Swag types
@ingroup XBT_swag
- Top | [\ref index]::[\ref XBT_API]::[\ref XBT_swag]
- |
Prev |
- |
Next | [\ref XBT_swag_func] |
-
Specific set.
@@ -50,7 +41,7 @@
typedef struct xbt_swag_hookup {
void *next;
void *prev;
-} s_xbt_swag_hookup_t;
+} 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
@@ -77,7 +68,7 @@ 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 {
@@ -92,31 +83,44 @@ typedef struct xbt_swag {
/** @defgroup XBT_swag_func SWAG functions
* @ingroup XBT_swag
- Top | [\ref index]::[\ref XBT_API]::[\ref XBT_swag]
- |
Prev | [\ref XBT_swag_type]
- |
Next | [\ref XBT_swag_curs] |
-
* @{
*/
-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_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 _XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
+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);
+
+/**
+ * \brief Makes a swag empty.
+ * \param swag a swag
+ * @hideinitializer
+ */
+#define xbt_swag_reset(swag) do {} while(xbt_swag_extract(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_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)
+#define xbt_swag_belongs(obj, swag) (xbt_swag_getNext((obj), (swag)->offset) || (swag)->tail == (obj))
+
+static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
{
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)
/**
* \brief Offset computation
@@ -136,10 +140,6 @@ static _XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
* \defgroup XBT_swag_curs Swag cursor
* @ingroup XBT_swag
- Top | [\ref index]::[\ref XBT_API]::[\ref XBT_swag]
- |
Prev | [\ref XBT_swag_func]
- |
Next | |
-
* Iterates over the whole swag.
*
* @{ */
@@ -168,11 +168,12 @@ static _XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
#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_next=NULL)); \
(obj)!=NULL; \
(obj)=obj_next, \
((obj)?(obj_next=xbt_swag_getNext((obj),(swag)->offset)): \
(obj_next=NULL)) )
/* @} */
-#endif /* _XBT_SWAG_H */
+SG_END_DECL()
+#endif /* _XBT_SWAG_H */