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 0b42753..031eabe 100644 (file)
--- a/examples/msg/actions/actions.c
+++ b/examples/msg/actions/actions.c
@@ -7,9 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */

+#include "msg/mailbox.h"        /* we play funny tricks with mailboxes and rdv points */

 #include "simix/simix.h"        /* semaphores for the barrier */
 #include "xbt.h"                /* calloc, printf */
 #include "simix/simix.h"        /* semaphores for the barrier */
 #include "xbt.h"                /* calloc, printf */

-#include "simgrid_config.h"     /* getline */

 #include "instr/instr_private.h"
 
 void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
 #include "instr/instr_private.h"
 
 void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);


@@ -39,7 +39,7 @@ static double parse_double(const char *string)
 
   value = strtod(string, &endptr);
   if (*endptr != '\0')
 
   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;
 }
 
   return value;
 }
 


@@ -81,14 +81,14 @@ static void action_send(const char *const *action)
   TRACE_smpi_send(rank, rank, dst_traced);
 #endif
 
   TRACE_smpi_send(rank, rank, dst_traced);
 #endif
 

-  DEBUG2("Entering Send: %s (size: %lg)", name, size);
+  XBT_DEBUG("Entering Send: %s (size: %lg)", name, size);

    if (size<65536) {
      action_Isend(action);
    } else {
      MSG_task_send(MSG_task_create(name, 0, size, NULL), to);
    }
    
    if (size<65536) {
      action_Isend(action);
    } else {
      MSG_task_send(MSG_task_create(name, 0, size, NULL), to);
    }
    

-   VERB2("%s %f", name, MSG_get_clock() - clock);
+   XBT_VERB("%s %f", name, MSG_get_clock() - clock);

 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);


@@ -109,16 +109,22 @@ static void action_Isend(const char *const *action)
 
 
   sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]);
 
 
   sprintf(to, "%s_%s", MSG_process_get_name(MSG_process_self()),action[2]);

-  msg_comm_t comm =
-      MSG_task_isend( MSG_task_create(to,0,parse_double(size),NULL), to);
+  m_task_t task = MSG_task_create(to,0,parse_double(size),NULL);
+  msg_comm_t comm = MSG_task_isend_with_matching(task, to, /*matching madness*/NULL,task);

   xbt_dynar_push(globals->isends,&comm);
 
   xbt_dynar_push(globals->isends,&comm);
 

-  DEBUG1("Isend on %s", MSG_process_get_name(MSG_process_self()));
-  VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+  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();
 }
 
 
   asynchronous_cleanup();
 }
 

+static int task_matching(void*ignored,void*sent_task) {
+  m_task_t t = (m_task_t)sent_task;
+  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 */
+}

 
 static void action_recv(const char *const *action)
 {
 
 static void action_recv(const char *const *action)
 {


@@ -133,16 +139,32 @@ static void action_recv(const char *const *action)
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
 

+  /* The next chunk is to deal with the fact that for short messages,
+   * if the send occurs before the receive, the message is already sent and
+   * buffered on receiver side when the recv() occurs.
+   *
+   * So the next chunk detects this fact and cancel the simix communication instead.
+   */
+
+  /* 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);
+  if (act!=NULL){
+    /* FIXME account for the memcopy time if needed */
+    SIMIX_comm_finish(act);
+    return;
+  }
+

 #ifdef HAVE_TRACING
   int rank = get_rank(MSG_process_get_name(MSG_process_self()));
   int src_traced = get_rank(action[2]);
   TRACE_smpi_ptp_in(rank, src_traced, rank, "recv");
 #endif
 
 #ifdef HAVE_TRACING
   int rank = get_rank(MSG_process_get_name(MSG_process_self()));
   int src_traced = get_rank(action[2]);
   TRACE_smpi_ptp_in(rank, src_traced, rank, "recv");
 #endif
 

-  DEBUG1("Receiving: %s", name);
+  XBT_DEBUG("Receiving: %s", name);

   MSG_task_receive(&task, mailbox_name);
   //  MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
   MSG_task_receive(&task, mailbox_name);
   //  MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));

-  VERB2("%s %f", name, MSG_get_clock() - clock);
+  XBT_VERB("%s %f", name, MSG_get_clock() - clock);

   MSG_task_destroy(task);
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
   MSG_task_destroy(task);
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))


@@ -161,7 +183,7 @@ static void action_Irecv(const char *const *action)
   double clock = MSG_get_clock();
   process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
 
   double clock = MSG_get_clock();
   process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
 

-  DEBUG1("Irecv on %s", MSG_process_get_name(MSG_process_self()));
+  XBT_DEBUG("Irecv on %s", MSG_process_get_name(MSG_process_self()));

 #ifdef HAVE_TRACING
   int rank = get_rank(MSG_process_get_name(MSG_process_self()));
   int src_traced = get_rank(action[2]);
 #ifdef HAVE_TRACING
   int rank = get_rank(MSG_process_get_name(MSG_process_self()));
   int src_traced = get_rank(action[2]);


@@ -181,7 +203,7 @@ static void action_Irecv(const char *const *action)
           mailbox);
   xbt_dynar_push(globals->irecvs,&c);
 
           mailbox);
   xbt_dynar_push(globals->irecvs,&c);
 

-  VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+  XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);

 
 #ifdef HAVE_TRACING
   TRACE_smpi_ptp_out(rank, src_traced, rank, "Irecv");
 
 #ifdef HAVE_TRACING
   TRACE_smpi_ptp_out(rank, src_traced, rank, "Irecv");


@@ -199,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());
 
   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))
       "action wait not preceded by any irecv: %s", xbt_str_join_array(action," "));
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))


@@ -211,14 +233,14 @@ static void action_wait(const char *const *action)
   TRACE_smpi_ptp_in(rank, src_traced, rank, "wait");
 #endif
 
   TRACE_smpi_ptp_in(rank, src_traced, rank, "wait");
 #endif
 

-  DEBUG1("Entering %s", name);
+  XBT_DEBUG("Entering %s", name);

   comm = xbt_dynar_pop_as(globals->irecvs,msg_comm_t);
   MSG_comm_wait(comm,-1);
   task = xbt_dynar_pop_as(globals->tasks,m_task_t);
   MSG_comm_destroy(comm);
   MSG_task_destroy(task);
 
   comm = xbt_dynar_pop_as(globals->irecvs,msg_comm_t);
   MSG_comm_wait(comm,-1);
   task = xbt_dynar_pop_as(globals->tasks,m_task_t);
   MSG_comm_destroy(comm);
   MSG_task_destroy(task);
 

-  VERB2("%s %f", name, MSG_get_clock() - clock);
+  XBT_VERB("%s %f", name, MSG_get_clock() - clock);

   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 #ifdef HAVE_TRACING
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 #ifdef HAVE_TRACING


@@ -244,7 +266,7 @@ static void action_barrier(const char *const *action)
     cond = SIMIX_req_cond_init();
     processes_arrived_sofar=0;
   }
     cond = SIMIX_req_cond_init();
     processes_arrived_sofar=0;
   }

-  DEBUG2("Entering barrier: %s (%d already there)", name,processes_arrived_sofar);
+  XBT_DEBUG("Entering barrier: %s (%d already there)", name,processes_arrived_sofar);

 
   SIMIX_req_mutex_lock(mutex);
   if (++processes_arrived_sofar == communicator_size) {
 
   SIMIX_req_mutex_lock(mutex);
   if (++processes_arrived_sofar == communicator_size) {


@@ -255,7 +277,7 @@ static void action_barrier(const char *const *action)
     SIMIX_req_mutex_unlock(mutex);
   }
 
     SIMIX_req_mutex_unlock(mutex);
   }
 

-  DEBUG1("Exiting barrier: %s", name);
+  XBT_DEBUG("Exiting barrier: %s", name);

 
   processes_arrived_sofar--;
   if (!processes_arrived_sofar) {
 
   processes_arrived_sofar--;
   if (!processes_arrived_sofar) {


@@ -282,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());
 
 
        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());
                        "can't use collective operations");
 
        process_name = MSG_process_get_name(MSG_process_self());


@@ -290,7 +312,7 @@ static void action_reduce(const char *const *action)
        reduce_identifier = bprintf("reduce_%d", counters->reduce_counter++);
 
        if (!strcmp(process_name, "p0")) {
        reduce_identifier = bprintf("reduce_%d", counters->reduce_counter++);
 
        if (!strcmp(process_name, "p0")) {

-               DEBUG2("%s: %s is the Root", reduce_identifier, process_name);
+               XBT_DEBUG("%s: %s is the Root", reduce_identifier, process_name);

 
                msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
            m_task_t *tasks = xbt_new0(m_task_t,communicator_size-1);
 
                msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
            m_task_t *tasks = xbt_new0(m_task_t,communicator_size-1);


@@ -306,20 +328,20 @@ static void action_reduce(const char *const *action)
            free(tasks);
 
            comp_task = MSG_task_create("reduce_comp", comp_size, 0, NULL);
            free(tasks);
 
            comp_task = MSG_task_create("reduce_comp", comp_size, 0, NULL);

-           DEBUG1("%s: computing 'reduce_comp'", reduce_identifier);
+           XBT_DEBUG("%s: computing 'reduce_comp'", reduce_identifier);

            MSG_task_execute(comp_task);
            MSG_task_destroy(comp_task);
            MSG_task_execute(comp_task);
            MSG_task_destroy(comp_task);

-           DEBUG1("%s: computed", reduce_identifier);
+           XBT_DEBUG("%s: computed", reduce_identifier);

 
        } else {
 
        } else {

-               DEBUG2("%s: %s sends", reduce_identifier, process_name);
+               XBT_DEBUG("%s: %s sends", reduce_identifier, process_name);

                sprintf(mailbox, "%s_%s_p0", reduce_identifier, process_name);
                sprintf(mailbox, "%s_%s_p0", reduce_identifier, process_name);

-           DEBUG1("put on %s", mailbox);
+           XBT_DEBUG("put on %s", mailbox);

            MSG_task_send(MSG_task_create(reduce_identifier, 0, comm_size, NULL),
                          mailbox);
        }
 
            MSG_task_send(MSG_task_create(reduce_identifier, 0, comm_size, NULL),
                          mailbox);
        }
 

-       VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+       XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);

        free(reduce_identifier);
 }
 
        free(reduce_identifier);
 }
 


@@ -335,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());
 
 
        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());
                        "can't use collective operations");
 
        process_name = MSG_process_get_name(MSG_process_self());


@@ -343,7 +365,7 @@ static void action_bcast(const char *const *action)
        bcast_identifier = bprintf("bcast_%d", counters->bcast_counter++);
 
        if (!strcmp(process_name, "p0")) {
        bcast_identifier = bprintf("bcast_%d", counters->bcast_counter++);
 
        if (!strcmp(process_name, "p0")) {

-               DEBUG2("%s: %s is the Root", bcast_identifier, process_name);
+               XBT_DEBUG("%s: %s is the Root", bcast_identifier, process_name);

 
            msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
 
 
            msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
 


@@ -358,17 +380,17 @@ static void action_bcast(const char *const *action)
               MSG_comm_destroy(comms[i-1]);
            free(comms);
 
               MSG_comm_destroy(comms[i-1]);
            free(comms);
 

-           DEBUG2("%s: all messages sent by %s have been received",
+           XBT_DEBUG("%s: all messages sent by %s have been received",

                   bcast_identifier, process_name);
 
        } else {
            sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name);
            MSG_task_receive(&task, mailbox);
            MSG_task_destroy(task);
                   bcast_identifier, process_name);
 
        } else {
            sprintf(mailbox, "%s_p0_%s", bcast_identifier, process_name);
            MSG_task_receive(&task, mailbox);
            MSG_task_destroy(task);

-           DEBUG2("%s: %s has received", bcast_identifier, process_name);
+           XBT_DEBUG("%s: %s has received", bcast_identifier, process_name);

        }
 
        }
 

-       VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+       XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);

        free(bcast_identifier);
 }
 
        free(bcast_identifier);
 }
 


@@ -382,9 +404,9 @@ static void action_sleep(const char *const *action)
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
 

-  DEBUG1("Entering %s", name);
+  XBT_DEBUG("Entering %s", name);

   MSG_process_sleep(parse_double(duration));
   MSG_process_sleep(parse_double(duration));

-  VERB2("%s %f ", name, MSG_get_clock() - clock);
+  XBT_VERB("%s %f ", name, MSG_get_clock() - clock);

 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);


@@ -402,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());
 
 
   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());
               "can't use collective operations");
 
   process_name = MSG_process_get_name(MSG_process_self());


@@ -410,7 +432,7 @@ static void action_allReduce(const char *const *action) {
   allreduce_identifier = bprintf("allReduce_%d", counters->allReduce_counter++);
 
   if (!strcmp(process_name, "p0")) {
   allreduce_identifier = bprintf("allReduce_%d", counters->allReduce_counter++);
 
   if (!strcmp(process_name, "p0")) {

-    DEBUG2("%s: %s is the Root", allreduce_identifier, process_name);
+    XBT_DEBUG("%s: %s is the Root", allreduce_identifier, process_name);

 
     msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
     m_task_t *tasks = xbt_new0(m_task_t,communicator_size-1);
 
     msg_comm_t *comms = xbt_new0(msg_comm_t,communicator_size-1);
     m_task_t *tasks = xbt_new0(m_task_t,communicator_size-1);


@@ -426,10 +448,10 @@ static void action_allReduce(const char *const *action) {
     free(tasks);
 
     comp_task = MSG_task_create("allReduce_comp", comp_size, 0, NULL);
     free(tasks);
 
     comp_task = MSG_task_create("allReduce_comp", comp_size, 0, NULL);

-    DEBUG1("%s: computing 'reduce_comp'", allreduce_identifier);
+    XBT_DEBUG("%s: computing 'reduce_comp'", allreduce_identifier);

     MSG_task_execute(comp_task);
     MSG_task_destroy(comp_task);
     MSG_task_execute(comp_task);
     MSG_task_destroy(comp_task);

-    DEBUG1("%s: computed", allreduce_identifier);
+    XBT_DEBUG("%s: computed", allreduce_identifier);

 
     for (i = 1; i < communicator_size; i++) {
       sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i);
 
     for (i = 1; i < communicator_size; i++) {
       sprintf(mailbox, "%s_p0_p%d", allreduce_identifier, i);


@@ -442,23 +464,23 @@ static void action_allReduce(const char *const *action) {
        MSG_comm_destroy(comms[i-1]);
     free(comms);
 
        MSG_comm_destroy(comms[i-1]);
     free(comms);
 

-    DEBUG2("%s: all messages sent by %s have been received",
+    XBT_DEBUG("%s: all messages sent by %s have been received",

            allreduce_identifier, process_name);
 
   } else {
            allreduce_identifier, process_name);
 
   } else {

-    DEBUG2("%s: %s sends", allreduce_identifier, process_name);
+    XBT_DEBUG("%s: %s sends", allreduce_identifier, process_name);

     sprintf(mailbox, "%s_%s_p0", allreduce_identifier, process_name);
     sprintf(mailbox, "%s_%s_p0", allreduce_identifier, process_name);

-    DEBUG1("put on %s", mailbox);
+    XBT_DEBUG("put on %s", mailbox);

     MSG_task_send(MSG_task_create(allreduce_identifier, 0, comm_size, NULL),
                   mailbox);
 
     sprintf(mailbox, "%s_p0_%s", allreduce_identifier, process_name);
     MSG_task_receive(&task, mailbox);
     MSG_task_destroy(task);
     MSG_task_send(MSG_task_create(allreduce_identifier, 0, comm_size, NULL),
                   mailbox);
 
     sprintf(mailbox, "%s_p0_%s", allreduce_identifier, process_name);
     MSG_task_receive(&task, mailbox);
     MSG_task_destroy(task);

-    DEBUG2("%s: %s has received", allreduce_identifier, process_name);
+    XBT_DEBUG("%s: %s has received", allreduce_identifier, process_name);

   }
 
   }
 

-  VERB2("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);
+  XBT_VERB("%s %f", xbt_str_join_array(action, " "), MSG_get_clock() - clock);

   free(allreduce_identifier);
 }
 
   free(allreduce_identifier);
 }
 


@@ -471,7 +493,7 @@ static void action_comm_size(const char *const *action)
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
   communicator_size = parse_double(size);
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
   communicator_size = parse_double(size);

-  VERB2("%s %f", name, MSG_get_clock() - clock);
+  XBT_VERB("%s %f", name, MSG_get_clock() - clock);

   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 }
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 }


@@ -485,10 +507,10 @@ static void action_compute(const char *const *action)
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");
 
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     name = xbt_str_join_array(action, " ");

-  DEBUG1("Entering %s", name);
+  XBT_DEBUG("Entering %s", name);

   MSG_task_execute(task);
   MSG_task_destroy(task);
   MSG_task_execute(task);
   MSG_task_destroy(task);

-  VERB2("%s %f", name, MSG_get_clock() - clock);
+  XBT_VERB("%s %f", name, MSG_get_clock() - clock);

   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 }
   if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
     free(name);
 }


@@ -498,7 +520,7 @@ static void action_init(const char *const *action)
 #ifdef HAVE_TRACING
   TRACE_smpi_init(get_rank(MSG_process_get_name(MSG_process_self())));
 #endif
 #ifdef HAVE_TRACING
   TRACE_smpi_init(get_rank(MSG_process_get_name(MSG_process_self())));
 #endif

-  DEBUG0("Initialize the counters");
+  XBT_DEBUG("Initialize the counters");

   process_globals_t globals = (process_globals_t) calloc(1, sizeof(s_process_globals_t));
   globals->isends = xbt_dynar_new(sizeof(msg_comm_t),NULL);
   globals->irecvs = xbt_dynar_new(sizeof(msg_comm_t),NULL);
   process_globals_t globals = (process_globals_t) calloc(1, sizeof(s_process_globals_t));
   globals->isends = xbt_dynar_new(sizeof(msg_comm_t),NULL);
   globals->irecvs = xbt_dynar_new(sizeof(msg_comm_t),NULL);


@@ -568,7 +590,7 @@ int main(int argc, char *argv[])
   /* Actually do the simulation using MSG_action_trace_run */
   res = MSG_action_trace_run(argv[3]);  // it's ok to pass a NULL argument here
 
   /* Actually do the simulation using MSG_action_trace_run */
   res = MSG_action_trace_run(argv[3]);  // it's ok to pass a NULL argument here
 

-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());

   MSG_clean();
 
   if (res == MSG_OK)
   MSG_clean();
 
   if (res == MSG_OK)