X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ca1291c2f63ca6235f4b4885c48413a900aade4..940e66fc202b3dd374e229cb0acce2d4700ed987:/src/msg/msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 979b95786e..cd5990b3cb 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -158,14 +158,20 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
   /* Try to send it by calling SIMIX network layer */
   TRY {
 #ifdef HAVE_TRACING
-    comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
-        t_simdata->rate, task, sizeof(void *), NULL, NULL, 0);
-    t_simdata->comm = comm;
-    SIMIX_req_set_category(comm, task->category);
-    SIMIX_req_comm_wait(comm, timeout);
-#else
-    SIMIX_req_comm_send(mailbox, t_simdata->message_size,
-        t_simdata->rate, task, sizeof(void*), NULL, NULL, timeout);
+    if (TRACE_is_active()) {
+      comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+                                  t_simdata->rate, task, sizeof(void *),
+                                  NULL, NULL, 0);
+      t_simdata->comm = comm;
+      SIMIX_req_set_category(comm, task->category);
+      SIMIX_req_comm_wait(comm, timeout);
+    } else {
+#endif
+      SIMIX_req_comm_send(mailbox, t_simdata->message_size,
+                          t_simdata->rate, task, sizeof(void*),
+                          NULL, NULL, timeout);
+#ifdef HAVE_TRACING
+    }
 #endif
   }