From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 28 Nov 2011 12:19:18 +0000 (+0100)
Subject: Allow NULL for the reset function of mallocators.
X-Git-Tag: exp_20120216~241^2~43
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1a0f69168109c0b38b03b1d1deb9773fdac83e9e?hp=fb1aa5988cbcd8d27c1c7a8ee359d51d153167e8;ds=sidebyside

Allow NULL for the reset function of mallocators.
---

diff --git a/ChangeLog b/ChangeLog
index b9cbe84062..226f5c1efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ SimGrid (3.7) NOT RELEASED; urgency=low
     tasks that are finished and should constitute the return value of
     SD_simulate.
 
+  XBT:
+  * Mallocators: allow value NULL for the reset function.
+
   -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.6.2) stable; urgency=low
diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index b8427aab25..ed415a5ed7 100644
--- 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);
@@ -108,7 +107,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()
  */
@@ -138,7 +137,8 @@ void *xbt_mallocator_get(xbt_mallocator_t m)
     object = m->new_f();
   }
 
-  m->reset_f(object);
+  if (m->reset_f)
+    m->reset_f(object);
   return object;
 }