merge branches

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

diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c
index 255dd1b..f3b9299 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -12,8 +12,6 @@
 #include "xbt.h"                /* calloc, printf */
 #include "instr/instr_private.h"
 
-void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
-
 XBT_LOG_NEW_DEFAULT_CATEGORY(actions,
                              "Messages specific for this msg example");
 int communicator_size = 0;
@@ -39,7 +37,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;
 }
 
@@ -119,9 +117,9 @@ static void action_Isend(const char *const *action)
   asynchronous_cleanup();
 }
 
-static int task_matching(void*sent_task,void*ignored) {
+static int task_matching(void*ignored,void*sent_task) {
   m_task_t t = (m_task_t)sent_task;
-  if (MSG_task_get_data_size(t)<65536)
+  if (t!=NULL && MSG_task_get_data_size(t)<65536)
     return 1; /* that's supposed to be already arrived */
   return 0; /* rendez-vous mode: it's not there yet */
 }
@@ -221,7 +219,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))
@@ -304,7 +302,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());
@@ -357,7 +355,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());
@@ -424,7 +422,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());
@@ -548,8 +546,6 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  smx_factory_initializer_to_use = SIMIX_ctx_raw_factory_init;
-
   /* Check the given arguments */
   MSG_global_init(&argc, argv);
   if (argc < 3) {