Do not free the datacontainer on dynar_reset. The corresponding perf gain exactly...

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

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 8534dde..b231ea1 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -11,7 +11,6 @@
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
 #include "xbt/dynar.h"
 #include <sys/types.h>
 
@@ -47,10 +46,9 @@ void _xbt_clear_mem(void * const ptr,
 }
 
 static _XBT_INLINE
-xbt_error_t
+void
 _xbt_dynar_expand(xbt_dynar_t const dynar,
                    const int          nb) {
-  xbt_error_t errcode     = no_error;
   const unsigned long old_size    = dynar->size;
 
   if (nb > old_size) {
@@ -79,8 +77,6 @@ _xbt_dynar_expand(xbt_dynar_t const dynar,
     dynar->size = new_size;
     dynar->data = new_data;
   }
-
-  return errcode;
 }
 
 static _XBT_INLINE
@@ -181,13 +177,14 @@ xbt_dynar_reset(xbt_dynar_t const dynar) {
   if (dynar->free_f) {
     xbt_dynar_map(dynar, dynar->free_f);
   }
-
+/*
   if (dynar->data)
     free(dynar->data);
 
   dynar->size = 0;
+  */
   dynar->used = 0;
-  dynar->data = NULL;
+/*  dynar->data = NULL;*/
 }
 
 /** @brief Destructor
@@ -424,7 +421,7 @@ xbt_dynar_pop_ptr(xbt_dynar_t  const dynar) {
 /** @brief Get and remove the last element of the dynar */
 void
 xbt_dynar_pop(xbt_dynar_t  const dynar,
-               void         * const dst) {
+              void         * const dst) {
 
   /* sanity checks done by remove_at */
   DEBUG1("Pop %p",(void*)dynar);