The mutex is useless when mallocators are disabled.

[simgrid.git] / src / xbt / mallocator.c

diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index 0b416cb..285c846 100644 (file)
--- a/src/xbt/mallocator.c
+++ b/src/xbt/mallocator.c
@@ -35,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.
  *
@@ -50,8 +50,7 @@ xbt_mallocator_t xbt_mallocator_new(int size,
   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");
+  xbt_assert(new_f != NULL && free_f != NULL, "invalid parameter");
 
   m = xbt_new0(s_xbt_mallocator_t, 1);
   XBT_VERB("Create mallocator %p", m);
@@ -63,13 +62,14 @@ xbt_mallocator_t xbt_mallocator_new(int size,
   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;
 }
 
@@ -90,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);
 }
 
@@ -108,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()
  */
@@ -117,6 +118,7 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
   void *object;
 
   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) */
@@ -126,7 +128,7 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
       int i;
       int amount = MIN(m->max_size / 2, 1000);
       for (i = 0; i < amount; i++)
-        m->objects[i] = (*(m->new_f)) ();
+        m->objects[i] = m->new_f();
       m->current_size = amount;
     }
 
@@ -134,11 +136,13 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
     /* 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)) ();
+    object = m->new_f();
   }
 
-  (*(m->reset_f)) (object);
+  if (m->reset_f)
+    m->reset_f(object);
   return object;
 }
 
@@ -157,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);
   }
 }