X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/36f55a5f2d60d4c9d96c0f7a4473dc24638cd7d1..28e032fe2974bf84e0414e4d3d4cd89a38752dae:/src/msg/msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 7e5e577098..c2081d7dbb 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -29,7 +29,7 @@ int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
 
 msg_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
 {
-  smx_action_t comm = simcall_rdv_get_head(mailbox);
+  smx_synchro_t comm = simcall_rdv_get_head(mailbox);
 
   if (!comm)
     return NULL;
@@ -116,10 +116,8 @@ MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task,
   if (host)
     THROW_UNIMPLEMENTED;
 
-#ifdef HAVE_TRACING
   TRACE_msg_task_get_start();
   double start_time = MSG_get_clock();
-#endif
 
   /* Sanity check */
   xbt_assert(task, "Null pointer for the task storage");
@@ -130,9 +128,11 @@ MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task,
 
   /* Try to receive it by calling SIMIX network layer */
   TRY {
-    simcall_comm_recv(mailbox, task, NULL, NULL, NULL, timeout, rate);
+    simcall_comm_recv(mailbox, task, NULL, NULL, NULL, NULL, timeout, rate);
     XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
-    (*task)->simdata->isused=0;
+    if (msg_global->debug_multiple_use && (*task)->simdata->isused!=0)
+      xbt_ex_free(*(xbt_ex_t*)(*task)->simdata->isused);
+    (*task)->simdata->isused = 0;
   }
   CATCH(e) {
     switch (e.category) {
@@ -145,19 +145,20 @@ MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task,
     case timeout_error:
       ret = MSG_TIMEOUT;
       break;
+    case host_error:
+      ret = MSG_HOST_FAILURE;
+      break;
     default:
       RETHROW;
     }
     xbt_ex_free(e);
   }
 
-#ifdef HAVE_TRACING
   if (ret != MSG_HOST_FAILURE &&
       ret != MSG_TRANSFER_FAILURE &&
       ret != MSG_TIMEOUT) {
     TRACE_msg_task_get_end(start_time, *task);
   }
-#endif
   MSG_RETURN(ret);
 }
 
@@ -165,15 +166,12 @@ msg_error_t
 MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
                              double timeout)
 {
-  xbt_ex_t e;
   msg_error_t ret = MSG_OK;
   simdata_task_t t_simdata = NULL;
   msg_process_t process = MSG_process_self();
   simdata_process_t p_simdata = SIMIX_process_self_get_data(process);
 
-#ifdef HAVE_TRACING
   int call_end = TRACE_msg_task_put_start(task);    //must be after CHECK_HOST()
-#endif
 
   /* Prepare the task to send */
   t_simdata = task->simdata;
@@ -181,16 +179,18 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
   t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
 
   if (t_simdata->isused != 0) {
-    if (msg_global->multiple_backtraces){
+    if (msg_global->debug_multiple_use){
       XBT_ERROR("This task is already used in there:");
       xbt_backtrace_display(t_simdata->isused);
-      THROWF(unknown_error, 0, "And you try to reuse it from here. You cannot send it now. Go fix your code!");
+      XBT_ERROR("And you try to reuse it from here:");
+      xbt_backtrace_display_current();
     } else {
-      THROWF(unknown_error, 0, "This task is still being used somewhere else. You cannot send it now. Go fix your code! (use --cfg=msg/multiple_backtraces:on to get the backtrace of the other process)");
+      xbt_assert(t_simdata->isused == 0,
+                 "This task is still being used somewhere else. You cannot send it now. Go fix your code! (use --cfg=msg/debug_multiple_use:on to get the backtrace of the other process)");
     }
   }
 
-  if (msg_global->multiple_backtraces)
+  if (msg_global->debug_multiple_use)
     MSG_BT(t_simdata->isused, "Using Backtrace");
   else
     t_simdata->isused = (void*)1;
@@ -200,17 +200,15 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
 
   p_simdata->waiting_task = task;
 
+  xbt_ex_t e;
   /* Try to send it by calling SIMIX network layer */
   TRY {
-    smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call  */
-    comm = simcall_comm_isend(mailbox, t_simdata->message_size,
+    smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call  */
+    comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount,
                                   t_simdata->rate, task, sizeof(void *),
-                                  NULL, NULL, task, 0);
-#ifdef HAVE_TRACING
-    if (TRACE_is_enabled()) {
+                                  NULL, NULL, NULL, task, 0);
+    if (TRACE_is_enabled())
       simcall_set_category(comm, task->category);
-    }
-#endif
      t_simdata->comm = comm;
      simcall_comm_wait(comm, timeout);
   }
@@ -232,15 +230,15 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
     xbt_ex_free(e);
 
     /* If the send failed, it is not used anymore */
+    if (msg_global->debug_multiple_use && t_simdata->isused!=0)
+      xbt_ex_free(*(xbt_ex_t*)t_simdata->isused);
     t_simdata->isused = 0;
   }
 
 
   p_simdata->waiting_task = NULL;
-#ifdef HAVE_TRACING
   if (call_end)
     TRACE_msg_task_put_end();
-#endif
   MSG_RETURN(ret);
 }