Rework xbt_dynar_three_way_partition.

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

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 7e7512b..2b6a287 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -736,36 +736,35 @@ XBT_PUBLIC(void) xbt_dynar_three_way_partition(xbt_dynar_t const dynar,
                                                int_f_pvoid_t color)
 {
   _dynar_lock(dynar);
-  unsigned long size = xbt_dynar_length(dynar);
-  void *data = dynar->data;
   unsigned long int i;
   unsigned long int p = -1;
-  unsigned long int q = size;
-  unsigned long elmsize = dynar->elmsize;
+  unsigned long int q = dynar->used;
+  const unsigned long elmsize = dynar->elmsize;
   void *tmp = xbt_malloc(elmsize);
-
-#define swap(a,b) do {     \
-    memcpy(tmp,  a , elmsize);  \
-    memcpy( a ,  b , elmsize);  \
-    memcpy( b , tmp, elmsize);  \
-  } while(0)
+  void *elm;
 
   for (i = 0; i < q;) {
-    unsigned long int datai = ((unsigned long int) data) + i*elmsize;
-    int colori = color((void *) datai);
+    void *elmi = _xbt_dynar_elm(dynar, i);
+    int colori = color(elmi);
 
-    if(colori==0) {
-      unsigned long int datap = ((unsigned long int) data) + (++p)*elmsize;
-      swap((void *) datai, (void *) datap);
+    if (colori == 1) {
       ++i;
-    } else if (colori==2) {
-      unsigned long int dataq = ((unsigned long int) data) + (--q)*elmsize;
-      swap((void *) datai, (void *) dataq);
     } else {
-      ++i;
+      if (colori == 0) {
+        elm = _xbt_dynar_elm(dynar, ++p);
+        ++i;
+      } else {                  /* colori == 2 */
+        elm = _xbt_dynar_elm(dynar, --q);
+      }
+      if (elm != elmi) {
+        memcpy(tmp,  elm,  elmsize);
+        memcpy(elm,  elmi, elmsize);
+        memcpy(elmi, tmp,  elmsize);
+      }
     }
   }
   _dynar_unlock(dynar);
+  xbt_free(tmp);
 }
 
 /** @brief Transform a dynar into a NULL terminated array