xbt_dynar_map did not work well with dynars of structs.

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

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 9d5de7d..51d207b 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -35,19 +35,19 @@ static XBT_INLINE void _dynar_unlock(xbt_dynar_t dynar)
 
 static XBT_INLINE void _sanity_check_dynar(xbt_dynar_t dynar)
 {
-  xbt_assert0(dynar, "dynar is NULL");
+  xbt_assert(dynar, "dynar is NULL");
 }
 
 static XBT_INLINE void _sanity_check_idx(int idx)
 {
-  xbt_assert1(idx >= 0, "dynar idx(=%d) < 0", (int) (idx));
+  xbt_assert(idx >= 0, "dynar idx(=%d) < 0", (int) (idx));
 }
 
 static XBT_INLINE void _check_inbound_idx(xbt_dynar_t dynar, int idx)
 {
   if (idx < 0 || idx >= dynar->used) {
     _dynar_unlock(dynar);
-    THROW2(bound_error, idx,
+    THROWF(bound_error, idx,
            "dynar is not that long. You asked %d, but it's only %lu long",
            (int) (idx), (unsigned long) dynar->used);
   }
@@ -58,7 +58,7 @@ static XBT_INLINE void _check_sloppy_inbound_idx(xbt_dynar_t dynar,
 {
   if (idx > dynar->used) {
     _dynar_unlock(dynar);
-    THROW2(bound_error, idx,
+    THROWF(bound_error, idx,
            "dynar is not that long. You asked %d, but it's only %lu long (could have been equal to it)",
            (int) (idx), (unsigned long) dynar->used);
   }
@@ -68,7 +68,7 @@ static XBT_INLINE void _check_populated_dynar(xbt_dynar_t dynar)
 {
   if (dynar->used == 0) {
     _dynar_unlock(dynar);
-    THROW1(bound_error, 0, "dynar %p is empty", dynar);
+    THROWF(bound_error, 0, "dynar %p is empty", dynar);
   }
 }
 
@@ -327,7 +327,8 @@ XBT_INLINE void xbt_dynar_free(xbt_dynar_t * dynar)
 /** \brief free a dynar passed as void* (handy to store dynar in dynars or dict) */
 void xbt_dynar_free_voidp(void *d)
 {
-  xbt_dynar_free((xbt_dynar_t *) d);
+  xbt_dynar_t dynar = (xbt_dynar_t)d;
+  xbt_dynar_free(&dynar);
 }
 
 /** @brief Count of dynar's elements
@@ -570,7 +571,7 @@ unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void *const elem)
     }
 
   _dynar_unlock(dynar);
-  THROW2(not_found_error, 0, "Element %p not part of dynar %p", elem,
+  THROWF(not_found_error, 0, "Element %p not part of dynar %p", elem,
          dynar);
 }
 
@@ -675,12 +676,13 @@ XBT_INLINE void xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst)
 
 static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op)
 {
-  char elm[SIZEOF_MAX];
+  char *const data = (char *) dynar->data;
+  const unsigned long elmsize = dynar->elmsize;
   const unsigned long used = dynar->used;
-  unsigned long i = 0;
+  unsigned long i;
 
   for (i = 0; i < used; i++) {
-    _xbt_dynar_get_elm(elm, dynar, i);
+    char* elm = (char*) data + i * elmsize;
     (*op) (elm);
   }
 }
@@ -775,16 +777,19 @@ XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
        if((!d1) || (!d2))
        {
                XBT_DEBUG("NULL dynar d1=%p d2=%p",d1,d2);
+               xbt_dynar_free(&d2);
                return 1;
        }
        if((d1->elmsize)!=(d2->elmsize))
        {
                XBT_DEBUG("Size of elmsize d1=%ld d2=%ld",d1->elmsize,d2->elmsize);
+               xbt_dynar_free(&d2);
                return 1; // xbt_die
        }
        if(xbt_dynar_length(d1) != xbt_dynar_length(d2))
        {
                XBT_DEBUG("Size of dynar d1=%ld d2=%ld",xbt_dynar_length(d1),xbt_dynar_length(d2));
+               xbt_dynar_free(&d2);
                return 1;
        }
 
@@ -794,8 +799,12 @@ XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
                void *data1 = xbt_dynar_get_as(d1, i, void *);
                void *data2 = xbt_dynar_get_as(d2, i, void *);
                XBT_DEBUG("link[%d] d1=%p d2=%p",i,data1,data2);
-               if(compar(data1,data2)) return 1;
+               if(compar(data1,data2)){
+                       xbt_dynar_free(&d2);
+                       return 1;
+               }
        }
+       xbt_dynar_free(&d2);
        return 0;
 }