Improve parametrization of the pmm example.

[simgrid.git] / examples / msg / actions / actions.c

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 52c89a4..8676880 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -42,7 +42,7 @@ static double parse_double(const char *string)
 
   value = strtod(string, &endptr);
   if (*endptr != '\0')
-    THROW1(unknown_error, 0, "%s is not a double", string);
+    THROWF(unknown_error, 0, "%s is not a double", string);
   return value;
 }
 
@@ -124,25 +124,25 @@ static void action_Isend(const char *const *action)
   if(SIMIX_comm_has_recv_match(rdv, task_recv_matching, NULL)) {
     XBT_DEBUG("Switching back to MSG_task_send: %s", to);
     MSG_task_send(task, to);
-    return;
-  }
+  } else {
 
-  msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
-  xbt_dynar_push(globals->isends,&comm);
-
-  if (task->simdata->message_size < 65536) {
-    /* Close your eyes, it burns ! */
-    comm->s_comm->comm.dst_proc = SIMIX_process_get_by_name(action[2]);
-    comm->s_comm->comm.dst_buff = NULL;
-    comm->s_comm->comm.dst_buff_size = NULL;
-    comm->s_comm->comm.dst_data = NULL;
-    comm->s_comm->state = SIMIX_READY;
-    comm->s_comm->comm.refcount++;
-    SIMIX_comm_start(comm->s_comm);
-  }
+    msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);
+    xbt_dynar_push(globals->isends,&comm);
 
-  XBT_DEBUG("Isend on %s", MSG_process_get_name(MSG_process_self()));
-  XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+    if (task->simdata->message_size < 65536) {
+      /* Close your eyes, it burns ! */
+      comm->s_comm->comm.dst_proc = SIMIX_process_get_by_name(action[2]);
+      comm->s_comm->comm.dst_buff = NULL;
+      comm->s_comm->comm.dst_buff_size = NULL;
+      comm->s_comm->comm.dst_data = NULL;
+      comm->s_comm->state = SIMIX_READY;
+      comm->s_comm->comm.refcount++;
+      SIMIX_comm_start(comm->s_comm);
+    }
+
+    XBT_DEBUG("Isend on %s", MSG_process_get_name(MSG_process_self()));
+    XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+  }
 
   asynchronous_cleanup();
 }
@@ -259,7 +259,7 @@ static void action_wait(const char *const *action)
   double clock = MSG_get_clock();
   process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
 
-  xbt_assert1(xbt_dynar_length(globals->irecvs),
+  xbt_assert(xbt_dynar_length(globals->irecvs),
       "action wait not preceded by any irecv: %s", xbt_str_join_array(action," "));
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
@@ -342,7 +342,7 @@ static void action_reduce(const char *const *action)
 
        process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
 
-       xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+       xbt_assert(communicator_size, "Size of Communicator is not defined, "
                        "can't use collective operations");
 
        process_name = MSG_process_get_name(MSG_process_self());
@@ -395,7 +395,7 @@ static void action_bcast(const char *const *action)
 
        process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
 
-       xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+       xbt_assert(communicator_size, "Size of Communicator is not defined, "
                        "can't use collective operations");
 
        process_name = MSG_process_get_name(MSG_process_self());
@@ -462,7 +462,7 @@ static void action_allReduce(const char *const *action) {
 
   process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
 
-  xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+  xbt_assert(communicator_size, "Size of Communicator is not defined, "
               "can't use collective operations");
 
   process_name = MSG_process_get_name(MSG_process_self());