merge branches

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

diff --git a/src/xbt/xbt_synchro.c b/src/xbt/xbt_synchro.c
index 594fd01..5b78e0a 100644 (file)
--- a/src/xbt/xbt_synchro.c
+++ b/src/xbt/xbt_synchro.c
@@ -46,7 +46,7 @@ void xbt_dynar_dopar(xbt_dynar_t datas, void_f_int_pvoid_t function)
     return;
   }
   /* Start all workers */
-  XBT_INFO("Dopar for %ld elements", xbt_dynar_length(datas));
+  XBT_DEBUG("Dopar for %ld elements", xbt_dynar_length(datas));
   xbt_dynar_foreach(datas, cursor, data) {
     worker_data_t w = xbt_new0(s_worker_data_t, 1);
     w->data = datas;
@@ -81,18 +81,18 @@ XBT_TEST_UNIT("dopar", test_dynar_dopar, "do parallel on dynars of integers")
   int i, cpt;
   unsigned int cursor;
 
-  xbt_test_add1
+  xbt_test_add
       ("==== Push %d int, add 100 to each of them in parallel and check the results",
        NB_ELEM);
   d = xbt_dynar_new(sizeof(int), NULL);
   for (cpt = 0; cpt < NB_ELEM; cpt++) {
     xbt_dynar_push_as(d, int, cpt);     /* This is faster (and possible only with scalars) */
-    xbt_test_log2("Push %d, length=%lu", cpt, xbt_dynar_length(d));
+    xbt_test_log("Push %d, length=%lu", cpt, xbt_dynar_length(d));
   }
   xbt_dynar_dopar(d, add100);
   cpt = 100;
   xbt_dynar_foreach(d, cursor, i) {
-    xbt_test_assert2(i == cpt,
+    xbt_test_assert(i == cpt,
                      "The retrieved value is not the expected one (%d!=%d)",
                      i, cpt);
     cpt++;