Use variadic macros

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

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index a8963ea..031eabe 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -12,9 +12,6 @@
 #include "xbt.h"                /* calloc, printf */
 #include "instr/instr_private.h"
 
-#include "msg/private.h" /* You don't want to know why, trust us */
-#include "simix/private.h"
-
 void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actions,
@@ -42,7 +39,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;
 }
 
@@ -116,17 +113,6 @@ static void action_Isend(const char *const *action)
   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);
-  }
-
   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);
 
@@ -162,19 +148,11 @@ static void action_recv(const char *const *action)
 
   /* make sure the rdv is created on need by asking to MSG instead of simix directly */
   smx_rdv_t rdv = MSG_mailbox_get_by_alias(mailbox_name);
-  smx_action_t act = SIMIX_comm_get_send_match(rdv, task_matching, NULL);
+  smx_action_t act = SIMIX_comm_get_send_match(rdv,task_matching,NULL);
   if (act!=NULL){
     /* FIXME account for the memcopy time if needed */
-    task = act->comm.src_data;
-
-    if (task->simdata->message_size < 65536) {
-      act->comm.refcount--; /* See action_send for more pain */
-      if(act->state == SIMIX_DONE)
-        SIMIX_comm_finish(act);
-      else
-        SIMIX_req_comm_wait(act, -1.0);
-      return;
-    }
+    SIMIX_comm_finish(act);
+    return;
   }
 
 #ifdef HAVE_TRACING
@@ -243,7 +221,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))
@@ -326,7 +304,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());
@@ -379,7 +357,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());
@@ -446,7 +424,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());