X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..5f6cef8bdac64b84b4886b2f2c6a89b65763dc09:/src/xbt/xbt_synchro.c diff --git a/src/xbt/xbt_synchro.c b/src/xbt/xbt_synchro.c index 9cb027926c..5b78e0a0cf 100644 --- 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 */ - INFO1("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; @@ -71,7 +71,7 @@ XBT_LOG_DEFAULT_CATEGORY(xbt_dyn); static void add100(int rank, void *data) { - //INFO2("Thread%d: Add 100 to %d",rank,*(int*)data); + //XBT_INFO("Thread%d: Add 100 to %d",rank,*(int*)data); *(int *) data += 100; } @@ -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++;