X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b85ea23bb4697266132fffaebc5e55ef6cc14c0..f25af1e2829458e33a3a0b74c75865c89dff5f9e:/examples/msg/chord/chord.c

diff --git a/examples/msg/chord/chord.c b/examples/msg/chord/chord.c
index f7f145a70a..5b5a3b50f4 100644
--- a/examples/msg/chord/chord.c
+++ b/examples/msg/chord/chord.c
@@ -11,6 +11,8 @@
 #include "xbt/asserts.h"
 #include "mc/modelchecker.h"
 #include "mc/mc.h"
+#include "xbt/xbt_os_time.h"
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_chord,
                              "Messages specific for this msg example");
 
@@ -27,6 +29,8 @@ static int periodic_fix_fingers_delay = 120;
 static int periodic_check_predecessor_delay = 120;
 static int periodic_lookup_delay = 10;
 
+extern long int smx_total_comms;
+
 /**
  * Finger element.
  */
@@ -46,7 +50,6 @@ typedef struct node {
   char pred_mailbox[MAILBOX_NAME_SIZE];   // predecessor's mailbox name
   int next_finger_to_fix;                 // index of the next finger to fix in fix_fingers()
   msg_comm_t comm_receive;                // current communication to receive
-  xbt_dynar_t comms;                      // current communications being sent
   double last_change_date;                // last time I changed a finger or my predecessor
 } s_node_t, *node_t;
 
@@ -82,7 +85,7 @@ static void chord_initialize(void);
 static int normalize(int id);
 static int is_in_interval(int id, int start, int end);
 static void get_mailbox(int host_id, char* mailbox);
-static void task_data_destroy(task_data_t task_data);
+static void task_free(void* task);
 static void print_finger_table(node_t node);
 static void set_finger(node_t node, int finger_index, int id);
 static void set_predecessor(node_t node, int predecessor_id);
@@ -121,7 +124,7 @@ static void chord_initialize(void)
     pow = pow << 1;
   }
   nb_keys = pow;
-  DEBUG1("Sets nb_keys to %d", nb_keys);
+  XBT_DEBUG("Sets nb_keys to %d", nb_keys);
 }
 
 /**
@@ -181,12 +184,14 @@ static void get_mailbox(int node_id, char* mailbox)
 }
 
 /**
- * \brief Frees the memory used by some task data.
- * \param task_data the task data to destroy
+ * \brief Frees the memory used by a task.
+ * \param task the MSG task to destroy
  */
-static void task_data_destroy(task_data_t task_data)
+static void task_free(void* task)
 {
-  xbt_free(task_data);
+  // TODO add a parameter data_free_function to MSG_task_create?
+  xbt_free(MSG_task_get_data(task));
+  MSG_task_destroy(task);
 }
 
 /**
@@ -197,12 +202,12 @@ static void print_finger_table(node_t node)
 {
   if (XBT_LOG_ISENABLED(msg_chord, xbt_log_priority_verbose)) {
     int i;
-    VERB0("My finger table:");
-    VERB0("Start | Succ ");
+    XBT_VERB("My finger table:");
+    XBT_VERB("Start | Succ ");
     for (i = 0; i < nb_bits; i++) {
-      VERB2(" %3d  | %3d ", (node->id + powers2[i]) % nb_keys, node->fingers[i].id);
+      XBT_VERB(" %3d  | %3d ", (node->id + powers2[i]) % nb_keys, node->fingers[i].id);
     }
-    VERB1("Predecessor: %d", node->pred_id);
+    XBT_VERB("Predecessor: %d", node->pred_id);
   }
 }
 
@@ -218,7 +223,7 @@ static void set_finger(node_t node, int finger_index, int id)
     node->fingers[finger_index].id = id;
     get_mailbox(id, node->fingers[finger_index].mailbox);
     node->last_change_date = MSG_get_clock();
-    DEBUG2("My new finger #%d is %d", finger_index, id);
+    XBT_DEBUG("My new finger #%d is %d", finger_index, id);
   }
 }
 
@@ -237,7 +242,7 @@ static void set_predecessor(node_t node, int predecessor_id)
     }
     node->last_change_date = MSG_get_clock();
 
-    DEBUG1("My new predecessor is %d", predecessor_id);
+    XBT_DEBUG("My new predecessor is %d", predecessor_id);
   }
 }
 
@@ -252,16 +257,14 @@ int node(int argc, char *argv[])
 {
   /* Reduce the run size for the MC */
   if(MC_IS_ENABLED){
-    periodic_stabilize_delay = 3;
-    periodic_fix_fingers_delay = 3;
-    periodic_check_predecessor_delay = 3;
+    periodic_stabilize_delay = 8;
+    periodic_fix_fingers_delay = 8;
+    periodic_check_predecessor_delay = 8;
   }
 
   double init_time = MSG_get_clock();
   m_task_t task_received = NULL;
-  msg_comm_t comm_send = NULL;
   int i;
-  int index;
   int join_success = 0;
   double deadline;
   double next_stabilize_date = init_time + periodic_stabilize_delay;
@@ -276,7 +279,6 @@ int node(int argc, char *argv[])
   node.id = atoi(argv[1]);
   get_mailbox(node.id, node.mailbox);
   node.next_finger_to_fix = 0;
-  node.comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
   node.fingers = xbt_new0(s_finger_t, nb_bits);
   node.last_change_date = init_time;
 
@@ -297,10 +299,10 @@ int node(int argc, char *argv[])
 
     /*
     // sleep before starting
-    DEBUG1("Let's sleep during %f", sleep_time);
+    XBT_DEBUG("Let's sleep during %f", sleep_time);
     MSG_process_sleep(sleep_time);
     */
-    DEBUG0("Hey! Let's join the system.");
+    XBT_DEBUG("Hey! Let's join the system.");
 
     join_success = join(&node, known_id);
   }
@@ -337,7 +339,7 @@ int node(int argc, char *argv[])
 	}
         else {
           // nothing to do: sleep for a while
-          MSG_process_sleep(3);
+          MSG_process_sleep(5);
         }
       }
       else {
@@ -346,7 +348,7 @@ int node(int argc, char *argv[])
         MSG_error_t status = MSG_comm_get_status(node.comm_receive);
 
         if (status != MSG_OK) {
-          DEBUG0("Failed to receive a task. Nevermind.");
+          XBT_DEBUG("Failed to receive a task. Nevermind.");
           node.comm_receive = NULL;
         }
         else {
@@ -358,11 +360,12 @@ int node(int argc, char *argv[])
       }
 
       // see if some communications are finished
+      /*
       while ((index = MSG_comm_testany(node.comms)) != -1) {
         comm_send = xbt_dynar_get_as(node.comms, index, msg_comm_t);
         MSG_error_t status = MSG_comm_get_status(comm_send);
         xbt_dynar_remove_at(node.comms, index, &comm_send);
-        DEBUG3("Communication %p is finished with status %d, dynar size is now %lu",
+        XBT_DEBUG("Communication %p is finished with status %d, dynar size is now %lu",
             comm_send, status, xbt_dynar_length(node.comms));
 	m_task_t task = MSG_comm_get_task(comm_send);
         MSG_comm_destroy(comm_send);
@@ -371,6 +374,7 @@ int node(int argc, char *argv[])
 	  MSG_task_destroy(task);
 	}
       }
+      */
     }
 
     // clean unfinished comms sent
@@ -389,8 +393,8 @@ int node(int argc, char *argv[])
   }
 
   // stop the simulation
-  xbt_dynar_free(&node.comms);
   xbt_free(node.fingers);
+  XBT_INFO("Messages created: %lu", smx_total_comms);
   return 0;
 }
 
@@ -402,8 +406,7 @@ int node(int argc, char *argv[])
  */
 static void handle_task(node_t node, m_task_t task) {
 
-  DEBUG1("Handling task %p", task);
-  msg_comm_t comm = NULL;
+  XBT_DEBUG("Handling task %p", task);
   char mailbox[MAILBOX_NAME_SIZE];
   task_data_t task_data = (task_data_t) MSG_task_get_data(task);
   e_task_type_t type = task_data->type;
@@ -411,56 +414,51 @@ static void handle_task(node_t node, m_task_t task) {
   switch (type) {
 
     case TASK_FIND_SUCCESSOR:
-      DEBUG2("Receiving a 'Find Successor' request from %s for id %d",
+      XBT_DEBUG("Receiving a 'Find Successor' request from %s for id %d",
           task_data->issuer_host_name, task_data->request_id);
       // is my successor the successor?
       if (is_in_interval(task_data->request_id, node->id + 1, node->fingers[0].id)) {
         task_data->type = TASK_FIND_SUCCESSOR_ANSWER;
         task_data->answer_id = node->fingers[0].id;
-        DEBUG4("Sending back a 'Find Successor Answer' to %s (mailbox %s): the successor of %d is %d",
+        XBT_DEBUG("Sending back a 'Find Successor Answer' to %s (mailbox %s): the successor of %d is %d",
             task_data->issuer_host_name,
 	    task_data->answer_to,
             task_data->request_id, task_data->answer_id);
-        comm = MSG_task_isend(task, task_data->answer_to);
-        xbt_dynar_push(node->comms, &comm);
+        MSG_task_dsend(task, task_data->answer_to, task_free);
       }
       else {
         // otherwise, forward the request to the closest preceding finger in my table
         int closest = closest_preceding_node(node, task_data->request_id);
-        DEBUG2("Forwarding the 'Find Successor' request for id %d to my closest preceding finger %d",
+        XBT_DEBUG("Forwarding the 'Find Successor' request for id %d to my closest preceding finger %d",
             task_data->request_id, closest);
         get_mailbox(closest, mailbox);
-        comm = MSG_task_isend(task, mailbox);
-        xbt_dynar_push(node->comms, &comm);
+        MSG_task_dsend(task, mailbox, task_free);
       }
       break;
 
     case TASK_GET_PREDECESSOR:
-      DEBUG1("Receiving a 'Get Predecessor' request from %s", task_data->issuer_host_name);
+      XBT_DEBUG("Receiving a 'Get Predecessor' request from %s", task_data->issuer_host_name);
       task_data->type = TASK_GET_PREDECESSOR_ANSWER;
       task_data->answer_id = node->pred_id;
-      DEBUG3("Sending back a 'Get Predecessor Answer' to %s via mailbox '%s': my predecessor is %d",
+      XBT_DEBUG("Sending back a 'Get Predecessor Answer' to %s via mailbox '%s': my predecessor is %d",
           task_data->issuer_host_name,
           task_data->answer_to, task_data->answer_id);
-      comm = MSG_task_isend(task, task_data->answer_to);
-      xbt_dynar_push(node->comms, &comm);
+      MSG_task_dsend(task, task_data->answer_to, task_free);
       break;
 
     case TASK_NOTIFY:
       // someone is telling me that he may be my new predecessor
-      DEBUG1("Receiving a 'Notify' request from %s", task_data->issuer_host_name);
+      XBT_DEBUG("Receiving a 'Notify' request from %s", task_data->issuer_host_name);
       notify(node, task_data->request_id);
-      task_data_destroy(task_data);
-      MSG_task_destroy(task);
+      task_free(task);
       break;
 
     case TASK_PREDECESSOR_LEAVING:
       // my predecessor is about to quit
-      DEBUG1("Receiving a 'Predecessor Leaving' message from %s", task_data->issuer_host_name);
+      XBT_DEBUG("Receiving a 'Predecessor Leaving' message from %s", task_data->issuer_host_name);
       // modify my predecessor
       set_predecessor(node, task_data->request_id);
-      task_data_destroy(task_data);
-      MSG_task_destroy(task);
+      task_free(task);
       /*TODO :
       >> notify my new predecessor
       >> send a notify_predecessors !!
@@ -469,11 +467,10 @@ static void handle_task(node_t node, m_task_t task) {
 
     case TASK_SUCCESSOR_LEAVING:
       // my successor is about to quit
-      DEBUG1("Receiving a 'Successor Leaving' message from %s", task_data->issuer_host_name);
+      XBT_DEBUG("Receiving a 'Successor Leaving' message from %s", task_data->issuer_host_name);
       // modify my successor FIXME : this should be implicit ?
       set_finger(node, 0, task_data->request_id);
-      task_data_destroy(task_data);
-      MSG_task_destroy(task);
+      task_free(task);
       /* TODO
       >> notify my new successor
       >> update my table & predecessors table */
@@ -481,9 +478,8 @@ static void handle_task(node_t node, m_task_t task) {
 
     case TASK_FIND_SUCCESSOR_ANSWER:
     case TASK_GET_PREDECESSOR_ANSWER:
-      DEBUG2("Ignoring unexpected task of type %d (%p)", type, task);
-      task_data_destroy(task_data);
-      MSG_task_destroy(task);
+      XBT_DEBUG("Ignoring unexpected task of type %d (%p)", type, task);
+      task_free(task);
       break;
   }
 }
@@ -494,7 +490,7 @@ static void handle_task(node_t node, m_task_t task) {
  */
 static void create(node_t node)
 {
-  DEBUG0("Create a new Chord ring...");
+  XBT_DEBUG("Create a new Chord ring...");
   set_predecessor(node, -1); // -1 means that I have no predecessor
   print_finger_table(node);
 }
@@ -508,12 +504,19 @@ static void create(node_t node)
  */
 static int join(node_t node, int known_id)
 {
-  INFO2("Joining the ring with id %d, knowing node %d", node->id, known_id);
+  XBT_INFO("Joining the ring with id %d, knowing node %d", node->id, known_id);
   set_predecessor(node, -1); // no predecessor (yet)
 
+  /*
+  int i;
+  for (i = 0; i < nb_bits; i++) {
+    set_finger(node, i, known_id);
+  }
+  */
+
   int successor_id = remote_find_successor(node, known_id, node->id);
   if (successor_id == -1) {
-    INFO0("Cannot join the ring.");
+    XBT_INFO("Cannot join the ring.");
   }
   else {
     set_finger(node, 0, successor_id);
@@ -529,7 +532,7 @@ static int join(node_t node, int known_id)
  */
 static void leave(node_t node)
 {
-  DEBUG0("Well Guys! I Think it's time for me to quit ;)");
+  XBT_DEBUG("Well Guys! I Think it's time for me to quit ;)");
   quit_notify(node, 1);  // notify to my successor ( >>> 1 );
   quit_notify(node, -1); // notify my predecessor  ( >>> -1);
   // TODO ...
@@ -555,7 +558,7 @@ static void quit_notify(node_t node, int to)
   const char* to_mailbox = NULL;
   if (to == 1) {    // notify my successor
     to_mailbox = node->fingers[0].mailbox;
-    INFO2("Telling my Successor %d about my departure via mailbox %s",
+    XBT_INFO("Telling my Successor %d about my departure via mailbox %s",
 	  node->fingers[0].id, to_mailbox);
     req_data->type = TASK_PREDECESSOR_LEAVING;
   }
@@ -566,7 +569,7 @@ static void quit_notify(node_t node, int to)
     }
 
     to_mailbox = node->pred_mailbox;
-    INFO2("Telling my Predecessor %d about my departure via mailbox %s",
+    XBT_INFO("Telling my Predecessor %d about my departure via mailbox %s",
 	  node->pred_id, to_mailbox);
     req_data->type = TASK_SUCCESSOR_LEAVING;
   }
@@ -616,19 +619,18 @@ static int remote_find_successor(node_t node, int ask_to, int id)
 
   // send a "Find Successor" request to ask_to_id
   m_task_t task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
-  DEBUG3("Sending a 'Find Successor' request (task %p) to %d for id %d", task_sent, ask_to, id);
+  XBT_DEBUG("Sending a 'Find Successor' request (task %p) to %d for id %d", task_sent, ask_to, id);
   MSG_error_t res = MSG_task_send_with_timeout(task_sent, mailbox, timeout);
 
   if (res != MSG_OK) {
-    DEBUG3("Failed to send the 'Find Successor' request (task %p) to %d for id %d",
+    XBT_DEBUG("Failed to send the 'Find Successor' request (task %p) to %d for id %d",
         task_sent, ask_to, id);
-    MSG_task_destroy(task_sent);
-    task_data_destroy(req_data);
+    task_free(task_sent);
   }
   else {
 
     // receive the answer
-    DEBUG3("Sent a 'Find Successor' request (task %p) to %d for key %d, waiting for the answer",
+    XBT_DEBUG("Sent a 'Find Successor' request (task %p) to %d for key %d, waiting for the answer",
         task_sent, ask_to, id);
 
     do {
@@ -640,7 +642,7 @@ static int remote_find_successor(node_t node, int ask_to, int id)
       res = MSG_comm_wait(node->comm_receive, timeout);
 
       if (res != MSG_OK) {
-        DEBUG2("Failed to receive the answer to my 'Find Successor' request (task %p): %d",
+        XBT_DEBUG("Failed to receive the answer to my 'Find Successor' request (task %p): %d",
             task_sent, res);
         stop = 1;
 	MSG_comm_destroy(node->comm_receive);
@@ -648,7 +650,7 @@ static int remote_find_successor(node_t node, int ask_to, int id)
       }
       else {
         m_task_t task_received = MSG_comm_get_task(node->comm_receive);
-        DEBUG1("Received a task (%p)", task_received);
+        XBT_DEBUG("Received a task (%p)", task_received);
         task_data_t ans_data = MSG_task_get_data(task_received);
 
 	if (MC_IS_ENABLED) {
@@ -663,14 +665,13 @@ static int remote_find_successor(node_t node, int ask_to, int id)
         }
         else {
           // this is our answer
-          DEBUG4("Received the answer to my 'Find Successor' request for id %d (task %p): the successor of key %d is %d",
+          XBT_DEBUG("Received the answer to my 'Find Successor' request for id %d (task %p): the successor of key %d is %d",
               ans_data->request_id, task_received, id, ans_data->answer_id);
           successor = ans_data->answer_id;
           stop = 1;
 	  MSG_comm_destroy(node->comm_receive);
 	  node->comm_receive = NULL;
-          MSG_task_destroy(task_received);
-          task_data_destroy(req_data);
+          task_free(task_received);
         }
       }
     } while (!stop);
@@ -698,20 +699,19 @@ static int remote_get_predecessor(node_t node, int ask_to)
   req_data->issuer_host_name = MSG_host_get_name(MSG_host_self());
 
   // send a "Get Predecessor" request to ask_to_id
-  DEBUG1("Sending a 'Get Predecessor' request to %d", ask_to);
+  XBT_DEBUG("Sending a 'Get Predecessor' request to %d", ask_to);
   m_task_t task_sent = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
   MSG_error_t res = MSG_task_send_with_timeout(task_sent, mailbox, timeout);
 
   if (res != MSG_OK) {
-    DEBUG2("Failed to send the 'Get Predecessor' request (task %p) to %d",
+    XBT_DEBUG("Failed to send the 'Get Predecessor' request (task %p) to %d",
         task_sent, ask_to);
-    MSG_task_destroy(task_sent);
-    task_data_destroy(req_data);
+    task_free(task_sent);
   }
   else {
 
     // receive the answer
-    DEBUG3("Sent 'Get Predecessor' request (task %p) to %d, waiting for the answer on my mailbox '%s'",
+    XBT_DEBUG("Sent 'Get Predecessor' request (task %p) to %d, waiting for the answer on my mailbox '%s'",
         task_sent, ask_to, req_data->answer_to);
 
     do {
@@ -723,7 +723,7 @@ static int remote_get_predecessor(node_t node, int ask_to)
       res = MSG_comm_wait(node->comm_receive, timeout);
 
       if (res != MSG_OK) {
-        DEBUG2("Failed to receive the answer to my 'Get Predecessor' request (task %p): %d",
+        XBT_DEBUG("Failed to receive the answer to my 'Get Predecessor' request (task %p): %d",
             task_sent, res);
         stop = 1;
 	MSG_comm_destroy(node->comm_receive);
@@ -743,14 +743,13 @@ static int remote_get_predecessor(node_t node, int ask_to)
           handle_task(node, task_received);
         }
         else {
-          DEBUG3("Received the answer to my 'Get Predecessor' request (task %p): the predecessor of node %d is %d",
+          XBT_DEBUG("Received the answer to my 'Get Predecessor' request (task %p): the predecessor of node %d is %d",
               task_received, ask_to, ans_data->answer_id);
           predecessor_id = ans_data->answer_id;
           stop = 1;
 	  MSG_comm_destroy(node->comm_receive);
 	  node->comm_receive = NULL;
-          MSG_task_destroy(task_received);
-          task_data_destroy(req_data);
+          task_free(task_received);
         }
       }
     } while (!stop);
@@ -784,7 +783,7 @@ int closest_preceding_node(node_t node, int id)
  */
 static void stabilize(node_t node)
 {
-  DEBUG0("Stabilizing node");
+  XBT_DEBUG("Stabilizing node");
 
   // get the predecessor of my immediate successor
   int candidate_id;
@@ -820,7 +819,7 @@ static void notify(node_t node, int predecessor_candidate_id) {
     print_finger_table(node);
   }
   else {
-    DEBUG1("I don't have to change my predecessor to %d", predecessor_candidate_id);
+    XBT_DEBUG("I don't have to change my predecessor to %d", predecessor_candidate_id);
   }
 }
 
@@ -839,11 +838,10 @@ static void remote_notify(node_t node, int notify_id, int predecessor_candidate_
 
   // send a "Notify" request to notify_id
   m_task_t task = MSG_task_create(NULL, COMP_SIZE, COMM_SIZE, req_data);
-  DEBUG2("Sending a 'Notify' request (task %p) to %d", task, notify_id);
+  XBT_DEBUG("Sending a 'Notify' request (task %p) to %d", task, notify_id);
   char mailbox[MAILBOX_NAME_SIZE];
   get_mailbox(notify_id, mailbox);
-  msg_comm_t comm = MSG_task_isend(task, mailbox);
-  xbt_dynar_push(node->comms, &comm);
+  MSG_task_dsend(task, mailbox, task_free);
 }
 
 /**
@@ -853,7 +851,7 @@ static void remote_notify(node_t node, int notify_id, int predecessor_candidate_
  */
 static void fix_fingers(node_t node) {
 
-  DEBUG0("Fixing fingers");
+  XBT_DEBUG("Fixing fingers");
   int i = node->next_finger_to_fix;
   int id = find_successor(node, node->id + powers2[i]);
   if (id != -1) {
@@ -873,7 +871,7 @@ static void fix_fingers(node_t node) {
  */
 static void check_predecessor(node_t node)
 {
-  DEBUG0("Checking whether my predecessor is alive");
+  XBT_DEBUG("Checking whether my predecessor is alive");
   // TODO
 }
 
@@ -884,7 +882,7 @@ static void check_predecessor(node_t node)
 static void random_lookup(node_t node)
 {
   int id = 1337; // TODO pick a pseudorandom id
-  DEBUG1("Making a lookup request for id %d", id);
+  XBT_DEBUG("Making a lookup request for id %d", id);
   find_successor(node, id);
 }
 
@@ -893,6 +891,8 @@ static void random_lookup(node_t node)
  */
 int main(int argc, char *argv[])
 {
+  xbt_os_timer_t timer = xbt_os_timer_new();
+
   if (argc < 3) {
     printf("Usage: %s [-nb_bits=n] [-timeout=t] platform_file deployment_file\n", argv[0]);
     printf("example: %s ../msg_platform.xml chord.xml\n", argv[0]);
@@ -907,17 +907,17 @@ int main(int argc, char *argv[])
     int length = strlen("-nb_bits=");
     if (!strncmp(options[0], "-nb_bits=", length) && strlen(options[0]) > length) {
       nb_bits = atoi(options[0] + length);
-      DEBUG1("Set nb_bits to %d", nb_bits);
+      XBT_DEBUG("Set nb_bits to %d", nb_bits);
     }
     else {
 
       length = strlen("-timeout=");
       if (!strncmp(options[0], "-timeout=", length) && strlen(options[0]) > length) {
 	timeout = atoi(options[0] + length);
-	DEBUG1("Set timeout to %d", timeout);
+	XBT_DEBUG("Set timeout to %d", timeout);
       }
       else {
-	xbt_assert1(0, "Invalid chord option '%s'", options[0]);
+	xbt_die("Invalid chord option '%s'", options[0]);
       }
     }
     options++;
@@ -934,8 +934,11 @@ int main(int argc, char *argv[])
   MSG_function_register("node", node);
   MSG_launch_application(application_file);
 
+  xbt_os_timer_start(timer);
   MSG_error_t res = MSG_main();
-  INFO1("Simulation time: %g", MSG_get_clock());
+  xbt_os_timer_stop(timer);
+  XBT_CRITICAL("Simulation time %lf", xbt_os_timer_elapsed(timer));
+  XBT_INFO("Simulated time: %g", MSG_get_clock());
 
   MSG_clean();