X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0..2f810149832a2d855c33d0df5b02d736c2081e41:/examples/gras/replay/replay.c diff --git a/examples/gras/replay/replay.c b/examples/gras/replay/replay.c index dbe3c90c8e..fb1babee26 100644 --- a/examples/gras/replay/replay.c +++ b/examples/gras/replay/replay.c @@ -56,7 +56,7 @@ int master(int argc, char *argv[]) xbt_workload_elm_t cmd; xbt_dict_cursor_t dict_cursor; - xbt_dict_t pals_int = xbt_dict_new(); + xbt_dict_t pals_int = xbt_dict_new_homogeneous(NULL); xbt_dynar_foreach(cmds, cursor, cmd) { int *p = xbt_dict_get_or_null(pals_int, cmd->who); if (!p) { @@ -67,8 +67,8 @@ int master(int argc, char *argv[]) /* friends, we're ready. Come and play */ XBT_INFO("Wait for peers for a while. I need %d peers", - xbt_dict_size(pals_int)); - while (xbt_dynar_length(peers) < xbt_dict_size(pals_int)) { + xbt_dict_length(pals_int)); + while (xbt_dynar_length(peers) < xbt_dict_length(pals_int)) { TRY { gras_msg_handle(20); } @@ -88,7 +88,7 @@ int master(int argc, char *argv[]) xbt_dict_free(&pals_int); /* Check who came */ - xbt_dict_t pals = xbt_dict_new(); + xbt_dict_t pals = xbt_dict_new_homogeneous(NULL); gras_socket_t pal; xbt_dynar_foreach(peers, cursor, peer) { //XBT_INFO("%s is here",peer->name); @@ -199,7 +199,7 @@ int worker(int argc, char *argv[]) int connected = 0; gras_cb_register("commands", worker_commands_cb); - globals->peers = xbt_dict_new(); + globals->peers = xbt_dict_new_homogeneous(NULL); if (gras_if_RL()) XBT_INFO("Sensor %s starting. Connecting to master on %s", @@ -239,7 +239,7 @@ int worker(int argc, char *argv[]) switch (cmd->action) { case XBT_WORKLOAD_COMPUTE: /* If any communication were queued, do them in parallel */ - if (xbt_dynar_length(cmd_to_go)) { + if (!xbt_dynar_is_empty(cmd_to_go)) { TRY { xbt_dynar_dopar(cmd_to_go, do_command); xbt_dynar_reset(cmd_to_go); @@ -268,7 +268,7 @@ int worker(int argc, char *argv[]) /* do in parallel any communication still queued */ XBT_INFO("Do %ld pending communications after end of TODO list", xbt_dynar_length(cmd_to_go)); - if (xbt_dynar_length(cmd_to_go)) { + if (!xbt_dynar_is_empty(cmd_to_go)) { xbt_dynar_dopar(cmd_to_go, do_command); xbt_dynar_reset(cmd_to_go); }