X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6003eb15ed861d609da20f29fb90c5253b7798b4..64561039d3dec9e50b4eaf1b78b3edef71898383:/src/xbt/fifo.c

diff --git a/src/xbt/fifo.c b/src/xbt/fifo.c
index 8cdd4018d5..51eb9b7184 100644
--- a/src/xbt/fifo.c
+++ b/src/xbt/fifo.c
@@ -26,28 +26,34 @@ xbt_fifo_t xbt_fifo_new(void)
   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;
 }
 
+
 /** 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_free(l);
-  return;
+  l->head = l->tail = NULL;
 }
 
 /** Push
@@ -510,11 +516,24 @@ xbt_fifo_item_t xbt_fifo_getPrevItem(xbt_fifo_item_t 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)
+{
+  if (item_mallocator != NULL) {
+    /* Already created. I guess we want to switch to MC mode, so kill the previously created mallocator */
+    xbt_mallocator_free(item_mallocator);
+  }
+
+  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);