Cosmetics: use XBT_LOG_EXTERNAL_DEFAULT_CATEGORY where possible.

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

diff --git a/src/xbt/xbt_synchro.c b/src/xbt/xbt_synchro.c
index 9cb0279..7b2993d 100644 (file)
--- a/src/xbt/xbt_synchro.c
+++ b/src/xbt/xbt_synchro.c
@@ -29,7 +29,7 @@ static void worker_wait_n_free(void *w)
 static void worker_wrapper(void *w)
 {
   worker_data_t me = (worker_data_t) w;
-  (*me->function) (me->rank, xbt_dynar_get_ptr(me->data, me->rank));
+  me->function(me->rank, xbt_dynar_get_ptr(me->data, me->rank));
 }
 
 void xbt_dynar_dopar(xbt_dynar_t datas, void_f_int_pvoid_t function)
@@ -38,15 +38,15 @@ void xbt_dynar_dopar(xbt_dynar_t datas, void_f_int_pvoid_t function)
       xbt_dynar_new(sizeof(worker_data_t), worker_wait_n_free);
   unsigned int cursor;
   void *data;
-  if (xbt_dynar_length(datas) == 0)
+  if (xbt_dynar_is_empty(datas))
     return;                     /* nothing to do */
   if (xbt_dynar_length(datas) == 1) {
     /* don't start any new thread, do it directly */
-    (*function) (0, xbt_dynar_get_ptr(datas, 0));
+    function(0, xbt_dynar_get_ptr(datas, 0));
     return;
   }
   /* Start all workers */
-  INFO1("Dopar for %ld elements", xbt_dynar_length(datas));
+  XBT_DEBUG("Dopar for %lu 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;
@@ -66,12 +66,11 @@ void xbt_dynar_dopar(xbt_dynar_t datas, void_f_int_pvoid_t function)
 #include "xbt/synchro.h"
 
 XBT_TEST_SUITE("synchro", "Advanced synchronization mecanisms");
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
-XBT_LOG_DEFAULT_CATEGORY(xbt_dyn);
+XBT_LOG_EXTERNAL_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 +80,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++;