X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f6cef8bdac64b84b4886b2f2c6a89b65763dc09..a093e1d3dad9c1e9af6473e1f96e7d5f76a4dac1:/src/xbt/xbt_synchro.c diff --git a/src/xbt/xbt_synchro.c b/src/xbt/xbt_synchro.c index 5b78e0a0cf..7b2993d259 100644 --- 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 */ - XBT_DEBUG("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,8 +66,7 @@ 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) {