Cosmetics: fix comment.

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

diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index 51c9b75..157896d 100644 (file)
--- 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
@@ -9,10 +9,10 @@
 #include "xbt/mallocator.h"
 #include "xbt/asserts.h"
 #include "xbt/sysdep.h"
+#include "mc/mc.h" /* kill mallocators when model-checking is enabled */
 #include "mallocator_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
-extern int _surf_do_model_check;        /* kill mallocators when this is true */
 
 /**
  * \brief Constructor
@@ -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 :) ) */
@@ -50,15 +50,13 @@ xbt_mallocator_t xbt_mallocator_new(int size,
    *   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 (_surf_do_model_check)
+  if (MC_IS_ENABLED)
     size = 0;
 
   m = xbt_new0(s_xbt_mallocator_t, 1);
-  VERB1("Create mallocator %p", m);
-  if (XBT_LOG_ISENABLED(xbt_mallocator, xbt_log_priority_verbose))
-    xbt_backtrace_display_current();
+  XBT_VERB("Create mallocator %p", m);
 
-  m->objects = xbt_new0(void *, _surf_do_model_check ? 1 : size);
+  m->objects = xbt_new0(void *, MC_IS_ENABLED ? 1 : size);
   m->max_size = size;
   m->current_size = 0;
   m->new_f = new_f;
@@ -80,9 +78,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]);
@@ -110,19 +108,28 @@ void xbt_mallocator_free(xbt_mallocator_t m)
 void *xbt_mallocator_get(xbt_mallocator_t m)
 {
   void *object;
-  xbt_assert0(m != NULL, "Invalid parameter");
 
-  if (m->current_size > 0) {
-    /* there is at least an available object */
-    DEBUG3("Reuse an old 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,
-           m->current_size, m->max_size);
-    object = (*(m->new_f)) ();
+  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
+    object = m->objects[--m->current_size];
+
   (*(m->reset_f)) (object);
   return object;
 }
@@ -142,18 +149,16 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
  */
 void xbt_mallocator_release(xbt_mallocator_t m, void *object)
 {
-  xbt_assert0(m != NULL && object != NULL, "Invalid parameter");
-
   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, 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,
-           m->current_size, m->max_size);
+    /* XBT_DEBUG("Free deleted object: mallocator %p is full (size:%d/%d)", m,
+           m->current_size, m->max_size); */
     (*(m->free_f)) (object);
   }
 }