X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d49a39ee0fbc8f850d4561fca040e50198b00d68..0f2a5c6a1ee7c87ece476402ae0a2842fd5f89f6:/src/xbt/mallocator.c

diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index bf0d2c8e84..1b0a3ced13 100644
--- a/src/xbt/mallocator.c
+++ b/src/xbt/mallocator.c
@@ -40,8 +40,8 @@ xbt_mallocator_t xbt_mallocator_new(int size,
 
   xbt_mallocator_t m;
 
-  xbt_assert0(size > 0, "size must be positive");
-  xbt_assert0(new_f != NULL && free_f != NULL
+  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 :) ) */
@@ -54,7 +54,7 @@ xbt_mallocator_t xbt_mallocator_new(int size,
     size = 0;
 
   m = xbt_new0(s_xbt_mallocator_t, 1);
-  VERB1("Create mallocator %p", m);
+  XBT_VERB("Create mallocator %p", m);
   if (XBT_LOG_ISENABLED(xbt_mallocator, xbt_log_priority_verbose))
     xbt_backtrace_display_current();
 
@@ -80,9 +80,9 @@ void xbt_mallocator_free(xbt_mallocator_t m)
 {
 
   int i;
-  xbt_assert0(m != NULL, "Invalid parameter");
+  xbt_assert(m != NULL, "Invalid parameter");
 
-  VERB3("Frees mallocator %p (size:%d/%d)", m, m->current_size,
+  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]);
@@ -111,17 +111,27 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
 {
   void *object;
 
-  if (m->current_size > 0) {
-    /* there is at least an available object */
-    /* DEBUG3("Reuse an old object for mallocator %p (size:%d/%d)", m,
+  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); */
-    object = m->objects[--m->current_size];
-  } else {
-    /* otherwise we must allocate a new object */
-    /* DEBUG3("Create a new object for mallocator %p (size:%d/%d)", m,
+    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
+    object = m->objects[--m->current_size];
+
   (*(m->reset_f)) (object);
   return object;
 }
@@ -143,13 +153,13 @@ 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 */
-    /* DEBUG3
+    /* 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;
   } else {
     /* otherwise we don't have a choice, we must free the object */
-    /* DEBUG3("Free deleted object: mallocator %p is full (size:%d/%d)", m,
+    /* XBT_DEBUG("Free deleted object: mallocator %p is full (size:%d/%d)", m,
            m->current_size, m->max_size); */
     (*(m->free_f)) (object);
   }