X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eccb848c9b78eb0a1bffa80e4eb90fc1cd6b4007..3823e54e6b0da3c0b213c3ba1537befca354d647:/src/xbt/mallocator.c

diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index 1b0a3ced13..285c8461ba 100644
--- a/src/xbt/mallocator.c
+++ b/src/xbt/mallocator.c
@@ -1,6 +1,6 @@
 /* mallocator - recycle objects to avoid malloc() / free()                  */
 
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -14,6 +14,17 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
 
+
+/* Change to 0 to completely disable mallocators. */
+#define MALLOCATOR_IS_WANTED 1
+
+/* Mallocators and memory mess introduced by model-checking do not mix well
+ * together: the mallocator will give standard memory when we are using raw
+ * memory (so these blocks are killed on restore) and the contrary (so these
+ * blocks will leak accross restores).
+ */
+#define MALLOCATOR_IS_ENABLED (MALLOCATOR_IS_WANTED && !MC_IS_ENABLED)
+
 /**
  * \brief Constructor
  * \param size size of the internal stack: number of objects the mallocator
@@ -24,7 +35,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
  * in \a xbt_mallocator_release() when the stack is full, and when
  * the mallocator is freed.
  * \param reset_f function to reinitialise an object of your datatype, called
- * when you extract an object from the mallocator
+ * when you extract an object from the mallocator (can be NULL)
  *
  * Create and initialize a new mallocator for a given datatype.
  *
@@ -36,35 +47,29 @@ xbt_mallocator_t xbt_mallocator_new(int size,
                                     void_f_pvoid_t free_f,
                                     void_f_pvoid_t reset_f)
 {
-
-
   xbt_mallocator_t m;
 
   xbt_assert(size > 0, "size must be positive");
-  xbt_assert(new_f != NULL && free_f != NULL
-              && reset_f != NULL, "invalid parameter");
-
-  /* Let's force 0 size mallocator! (Dirty hack, blame Martin :) ) */
-
-  /* mallocators and memory mess introduced by model-checking do not mix well together:
-   *   The mallocator will give standard memory when we are using raw memory (so these blocks are killed on restore)
-   *   and the contrary (so these blocks will leak accross restores)
-   */
-  if (MC_IS_ENABLED)
-    size = 0;
+  xbt_assert(new_f != NULL && free_f != NULL, "invalid parameter");
 
   m = xbt_new0(s_xbt_mallocator_t, 1);
   XBT_VERB("Create mallocator %p", m);
-  if (XBT_LOG_ISENABLED(xbt_mallocator, xbt_log_priority_verbose))
-    xbt_backtrace_display_current();
-
-  m->objects = xbt_new0(void *, MC_IS_ENABLED ? 1 : size);
-  m->max_size = size;
   m->current_size = 0;
   m->new_f = new_f;
   m->free_f = free_f;
   m->reset_f = reset_f;
 
+  if (MALLOCATOR_IS_ENABLED) {
+    m->objects = xbt_new0(void *, size);
+    m->max_size = size;
+    m->mutex = xbt_os_mutex_init();
+  } else {
+    if (!MALLOCATOR_IS_WANTED) /* Warn to avoid to commit debugging settings */
+      XBT_WARN("Mallocator is disabled!");
+    m->objects = NULL;
+    m->max_size = 0;
+    m->mutex = NULL;
+  }
   return m;
 }
 
@@ -85,9 +90,10 @@ void xbt_mallocator_free(xbt_mallocator_t m)
   XBT_VERB("Frees mallocator %p (size:%d/%d)", m, m->current_size,
         m->max_size);
   for (i = 0; i < m->current_size; i++) {
-    (*(m->free_f)) (m->objects[i]);
+    m->free_f(m->objects[i]);
   }
   xbt_free(m->objects);
+  xbt_os_mutex_destroy(m->mutex);
   xbt_free(m);
 }
 
@@ -103,7 +109,7 @@ void xbt_mallocator_free(xbt_mallocator_t m)
  * If the mallocator is empty, a new object is created,
  * by calling the function new_f().
  *
- * In both cases, the function reset_f() is called on the object.
+ * In both cases, the function reset_f() (if defined) is called on the object.
  *
  * \see xbt_mallocator_release()
  */
@@ -111,28 +117,32 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
 {
   void *object;
 
-  if (m->current_size <= 0) {
-    /* No object is ready yet. Create a bunch of them to try to group the mallocs
-     *  on the same memory pages (to help the cache lines) */
-
-    /* XBT_DEBUG("Create a new object for mallocator %p (size:%d/%d)", m,
-           m->current_size, m->max_size); */
-    int i;
-    int amount=MIN( (m->max_size) /2,1000);
-    for (i=0;i<amount;i++)
-      m->objects[i] = (*(m->new_f)) ();
-    m->current_size=amount;
-  }
-
-  /* there is at least an available object, now */
-  /* XBT_DEBUG("Reuse an old object for mallocator %p (size:%d/%d)", m,
-           m->current_size, m->max_size); */
-  if (MC_IS_ENABLED) /* no mallocator with MC */
-    object = (*(m->new_f)) ();
-  else
+  if (MALLOCATOR_IS_ENABLED) {
+    xbt_os_mutex_acquire(m->mutex);
+    if (m->current_size <= 0) {
+      /* No object is ready yet. Create a bunch of them to try to group the
+       * mallocs on the same memory pages (to help the cache lines) */
+
+      /* XBT_DEBUG("Create a new object for mallocator %p (size:%d/%d)", */
+      /*           m, m->current_size, m->max_size); */
+      int i;
+      int amount = MIN(m->max_size / 2, 1000);
+      for (i = 0; i < amount; i++)
+        m->objects[i] = m->new_f();
+      m->current_size = amount;
+    }
+
+    /* there is at least an available object, now */
+    /* XBT_DEBUG("Reuse an old object for mallocator %p (size:%d/%d)", */
+    /*           m, m->current_size, m->max_size); */
     object = m->objects[--m->current_size];
+    xbt_os_mutex_release(m->mutex);
+  } else {
+    object = m->new_f();
+  }
 
-  (*(m->reset_f)) (object);
+  if (m->reset_f)
+    m->reset_f(object);
   return object;
 }
 
@@ -151,16 +161,23 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
  */
 void xbt_mallocator_release(xbt_mallocator_t m, void *object)
 {
-  if (m->current_size < m->max_size) {
-    /* there is enough place to push the object */
-    /* XBT_DEBUG
-        ("Store deleted object in mallocator %p for further use (size:%d/%d)",
+  if (MALLOCATOR_IS_ENABLED) {
+    xbt_os_mutex_acquire(m->mutex);
+    if (m->current_size < m->max_size) {
+      /* there is enough place to push the object */
+      /* XBT_DEBUG
+         ("Store deleted object in mallocator %p for further use (size:%d/%d)",
          m, m->current_size, m->max_size); */
-    m->objects[m->current_size++] = object;
+      m->objects[m->current_size++] = object;
+      xbt_os_mutex_release(m->mutex);
+    } else {
+      xbt_os_mutex_release(m->mutex);
+      /* otherwise we don't have a choice, we must free the object */
+      /* XBT_DEBUG("Free deleted object: mallocator %p is full (size:%d/%d)", m,
+         m->current_size, m->max_size); */
+      m->free_f(object);
+    }
   } else {
-    /* otherwise we don't have a choice, we must free the object */
-    /* XBT_DEBUG("Free deleted object: mallocator %p is full (size:%d/%d)", m,
-           m->current_size, m->max_size); */
-    (*(m->free_f)) (object);
+    m->free_f(object);
   }
 }