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
Ensure that the mallocator are really inactive when running MC
[simgrid.git]
/
src
/
xbt
/
fifo.c
diff --git
a/src/xbt/fifo.c
b/src/xbt/fifo.c
index
ba7c0b2
..
7a425f6
100644
(file)
--- a/
src/xbt/fifo.c
+++ b/
src/xbt/fifo.c
@@
-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. */
/* 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. */
@@
-14,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;
@@
-27,28
+26,34
@@
xbt_fifo_t xbt_fifo_new(void)
xbt_fifo_t fifo;
fifo = xbt_new0(struct xbt_fifo, 1);
xbt_fifo_t fifo;
fifo = xbt_new0(struct xbt_fifo, 1);
- if (item_mallocator == NULL) {
- item_mallocator = xbt_mallocator_new(256,
- fifo_item_mallocator_new_f,
- fifo_item_mallocator_free_f,
- fifo_item_mallocator_reset_f);
- }
return fifo;
}
return fifo;
}
+
/** Destructor
* \param l poor victim
*
* Free the fifo structure. None of the objects that was in the fifo is however modified.
*/
void xbt_fifo_free(xbt_fifo_t l)
/** Destructor
* \param l poor victim
*
* Free the fifo structure. None of the objects that was in the fifo is however modified.
*/
void xbt_fifo_free(xbt_fifo_t l)
+{
+ xbt_fifo_reset(l);
+ xbt_free(l);
+}
+
+/**
+ * \brief Makes a fifo empty.
+ * \param l a fifo
+ *
+ * None of the objects that was in the fifo is however modified.
+ */
+void xbt_fifo_reset(xbt_fifo_t l)
{
xbt_fifo_item_t b, tmp;
for (b = xbt_fifo_get_first_item(l); b;
tmp = b, b = b->next, xbt_fifo_free_item(tmp));
{
xbt_fifo_item_t b, tmp;
for (b = xbt_fifo_get_first_item(l); b;
tmp = b, b = b->next, xbt_fifo_free_item(tmp));
- xbt_free(l);
- return;
+ l->head = l->tail = NULL;
}
/** Push
}
/** Push
@@
-138,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;
@@
-186,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;
@@
-288,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)--;
@@
-370,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 */
@@
-393,7
+393,7
@@
XBT_INLINE xbt_fifo_item_t xbt_fifo_new_item(void)
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_newitem(void)
{
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_newitem(void)
{
-
WARN0
("This function is deprecated. Use xbt_fifo_new_item.");
+
XBT_WARN
("This function is deprecated. Use xbt_fifo_new_item.");
return xbt_fifo_new_item();
}
return xbt_fifo_new_item();
}
@@
-433,7
+433,7
@@
XBT_INLINE void xbt_fifo_free_item(xbt_fifo_item_t b)
*/
XBT_INLINE void xbt_fifo_freeitem(xbt_fifo_item_t b)
{
*/
XBT_INLINE void xbt_fifo_freeitem(xbt_fifo_item_t b)
{
-
WARN0
("This function is deprecated. Use xbt_fifo_free_item.");
+
XBT_WARN
("This function is deprecated. Use xbt_fifo_free_item.");
xbt_fifo_free_item(b);
return;
}
xbt_fifo_free_item(b);
return;
}
@@
-450,23
+450,38
@@
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)
{
return l->head;
}
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l)
{
return l->head;
}
+/**
+ * \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)
+{
+ return l->tail;
+}
+
/** \deprecated Use #xbt_fifo_get_first_item instead.
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_getFirstItem(xbt_fifo_t l)
{
/** \deprecated Use #xbt_fifo_get_first_item instead.
*/
XBT_INLINE xbt_fifo_item_t xbt_fifo_getFirstItem(xbt_fifo_t l)
{
-
WARN0
("This function is deprecated. Use xbt_fifo_get_first_item.");
+
XBT_WARN
("This function is deprecated. Use xbt_fifo_get_first_item.");
return xbt_fifo_get_first_item(l);
}
/**
* \param i a bucket
* \return the bucket that comes next
return xbt_fifo_get_first_item(l);
}
/**
* \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)
{
@@
-479,13
+494,15
@@
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_next_item(xbt_fifo_item_t i)
*/
xbt_fifo_item_t xbt_fifo_getNextItem(xbt_fifo_item_t i)
{
*/
xbt_fifo_item_t xbt_fifo_getNextItem(xbt_fifo_item_t i)
{
-
WARN0
("This function is deprecated. Use xbt_fifo_get_next_item.");
+
XBT_WARN
("This function is deprecated. Use xbt_fifo_get_next_item.");
return xbt_fifo_get_next_item(i);
}
/**
* \param i a bucket
* \return the bucket that is just before \a i.
return xbt_fifo_get_next_item(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)
{
@@
-498,15
+515,23
@@
XBT_INLINE xbt_fifo_item_t xbt_fifo_get_prev_item(xbt_fifo_item_t i)
*/
xbt_fifo_item_t xbt_fifo_getPrevItem(xbt_fifo_item_t i)
{
*/
xbt_fifo_item_t xbt_fifo_getPrevItem(xbt_fifo_item_t i)
{
-
WARN0
("This function is deprecated. Use xbt_fifo_get_prev_item.");
+
XBT_WARN
("This function is deprecated. Use xbt_fifo_get_prev_item.");
return xbt_fifo_get_prev_item(i);
}
return xbt_fifo_get_prev_item(i);
}
-/*
*
- *
Destroy the fifo item mallocator
.
- *
This is an internal XBT function called by xbt_exit().
+/*
Module init/exit handling the fifo item mallocator
+ *
These are internal XBT functions called by xbt_preinit/postexit()
.
+ *
It can be used several times to recreate the mallocator, for example when you switch to MC mode
*/
*/
-void xbt_fifo_exit(void)
+void xbt_fifo_preinit(void)
+{
+ item_mallocator = xbt_mallocator_new(65536,
+ fifo_item_mallocator_new_f,
+ fifo_item_mallocator_free_f,
+ fifo_item_mallocator_reset_f);
+}
+
+void xbt_fifo_postexit(void)
{
if (item_mallocator != NULL) {
xbt_mallocator_free(item_mallocator);
{
if (item_mallocator != NULL) {
xbt_mallocator_free(item_mallocator);