A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a function to copy a RngStream structure
[simgrid.git]
/
src
/
xbt
/
fifo.c
diff --git
a/src/xbt/fifo.c
b/src/xbt/fifo.c
index
c7ca1ab
..
305abed
100644
(file)
--- a/
src/xbt/fifo.c
+++ b/
src/xbt/fifo.c
@@
-13,7
+13,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_fifo, xbt, "FIFO");
static void *fifo_item_mallocator_new_f(void);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_fifo, xbt, "FIFO");
static void *fifo_item_mallocator_new_f(void);
-static void fifo_item_mallocator_free_f(void *item);
+#define fifo_item_mallocator_free_f xbt_free_f
static void fifo_item_mallocator_reset_f(void *item);
static xbt_mallocator_t item_mallocator = NULL;
static void fifo_item_mallocator_reset_f(void *item);
static xbt_mallocator_t item_mallocator = NULL;
@@
-143,7
+143,7
@@
void *xbt_fifo_shift(xbt_fifo_t l)
*/
void xbt_fifo_push_item(xbt_fifo_t l, xbt_fifo_item_t new)
{
*/
void xbt_fifo_push_item(xbt_fifo_t l, xbt_fifo_item_t new)
{
- xbt_assert
0
((new->next == NULL) && (new->prev == NULL), "Invalid item!");
+ xbt_assert((new->next == NULL) && (new->prev == NULL), "Invalid item!");
(l->count)++;
if (l->head == NULL) {
l->head = new;
(l->count)++;
if (l->head == NULL) {
l->head = new;
@@
-191,7
+191,7
@@
xbt_fifo_item_t xbt_fifo_pop_item(xbt_fifo_t l)
*/
void xbt_fifo_unshift_item(xbt_fifo_t l, xbt_fifo_item_t new)
{
*/
void xbt_fifo_unshift_item(xbt_fifo_t l, xbt_fifo_item_t new)
{
- xbt_assert
0
((new->next == NULL) && (new->prev == NULL), "Invalid item!");
+ xbt_assert((new->next == NULL) && (new->prev == NULL), "Invalid item!");
(l->count)++;
if (l->head == NULL) {
l->head = new;
(l->count)++;
if (l->head == NULL) {
l->head = new;
@@
-293,7
+293,7
@@
int xbt_fifo_remove_all(xbt_fifo_t l, void *t)
void xbt_fifo_remove_item(xbt_fifo_t l, xbt_fifo_item_t current)
{
if (l->head == l->tail) { /* special case */
void xbt_fifo_remove_item(xbt_fifo_t l, xbt_fifo_item_t current)
{
if (l->head == l->tail) { /* special case */
- xbt_assert
0
((current == l->head), "This item is not in the list!");
+ xbt_assert((current == l->head), "This item is not in the list!");
l->head = NULL;
l->tail = NULL;
(l->count)--;
l->head = NULL;
l->tail = NULL;
(l->count)--;
@@
-375,11
+375,6
@@
static void *fifo_item_mallocator_new_f(void)
return xbt_new(s_xbt_fifo_item_t, 1);
}
return xbt_new(s_xbt_fifo_item_t, 1);
}
-static void fifo_item_mallocator_free_f(void *item)
-{
- xbt_free(item);
-}
-
static void fifo_item_mallocator_reset_f(void *item)
{
/* memset to zero like calloc */
static void fifo_item_mallocator_reset_f(void *item)
{
/* memset to zero like calloc */
@@
-455,6
+450,8
@@
XBT_INLINE int xbt_fifo_size(xbt_fifo_t f)
/**
* \param l a list
* \return the head of \a l.
/**
* \param l a list
* \return the head of \a l.
+ *
+ * Returns NULL if the list is empty.
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l)
{
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l)
{
@@
-464,6
+461,8
@@
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l)
/**
* \param l a list
* \return the tail of \a l.
/**
* \param l a list
* \return the tail of \a l.
+ *
+ * Returns NULL if the list is empty.
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_last_item(xbt_fifo_t l)
{
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_last_item(xbt_fifo_t l)
{
@@
-481,6
+480,8
@@
XBT_INLINE xbt_fifo_item_t xbt_fifo_getFirstItem(xbt_fifo_t l)
/**
* \param i a bucket
* \return the bucket that comes next
/**
* \param i a bucket
* \return the bucket that comes next
+ *
+ * Returns NULL if \a i is the tail of the list.
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_next_item(xbt_fifo_item_t i)
{
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_next_item(xbt_fifo_item_t i)
{
@@
-500,6
+501,8
@@
xbt_fifo_item_t xbt_fifo_getNextItem(xbt_fifo_item_t i)
/**
* \param i a bucket
* \return the bucket that is just before \a i.
/**
* \param i a bucket
* \return the bucket that is just before \a i.
+ *
+ * Returns NULL if \a i is the head of the list.
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_prev_item(xbt_fifo_item_t i)
{
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_prev_item(xbt_fifo_item_t i)
{