X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f365d61a634d854a3244979c0524de3cf3a74f72..f6c9a2b6c90817616b0c13bae51d150b6fb46fcd:/src/msg/msg_mailbox.c?ds=sidebyside

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index e25051c3fc..8d575a6f2b 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -58,6 +58,7 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
 msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
                                          m_channel_t channel)
 {
+  XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias");
   xbt_assert((host != NULL), "Invalid host");
   xbt_assert((channel >= 0)
               && (channel < msg_global->max_channel), "Invalid channel %d",
@@ -153,21 +154,16 @@ 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
-    if (TRACE_is_enabled()) {
       smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
                                   t_simdata->rate, task, sizeof(void *),
-                                  NULL, NULL, 0);
-      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);
+                                  NULL, NULL, task, 0);
 #ifdef HAVE_TRACING
+    if (TRACE_is_enabled()) {
+      SIMIX_req_set_category(comm, task->category);
     }
 #endif
+     t_simdata->comm = comm;
+     SIMIX_req_comm_wait(comm, timeout);
   }
 
   CATCH(e) {
@@ -190,6 +186,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
     t_simdata->isused = 0;
   }
 
+
   p_simdata->waiting_task = NULL;
 #ifdef HAVE_TRACING
   if (call_end)