X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58dafbd87b78b301688890c49eeada71390cfb77..8a7a5f10297e28c98d9c77e2985e96627a43e95e:/src/msg/msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index c49896ef7d..194c133aea 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
 
 msg_mailbox_t MSG_mailbox_new(const char *alias)
 {
-  return SIMIX_req_rdv_create(alias ? xbt_strdup(alias) : NULL);
+  return SIMIX_req_rdv_create(alias);
 }
 
 void MSG_mailbox_free(void *mailbox)
@@ -33,7 +33,7 @@ m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
   if (!comm)
     return NULL;
 
-  return (m_task_t) SIMIX_req_comm_get_data(comm);
+  return (m_task_t) SIMIX_req_comm_get_src_data(comm);
 }
 
 int
@@ -72,7 +72,7 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
 {
   xbt_ex_t e;
   MSG_error_t ret = MSG_OK;
-  smx_action_t comm = NULL;
+  volatile smx_action_t comm = NULL;
 #ifdef HAVE_TRACING
   double start_time = 0;
 #endif
@@ -95,10 +95,11 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
 
   /* Try to receive it by calling SIMIX network layer */
   TRY {
-    comm = SIMIX_req_comm_irecv(mailbox, task, NULL);
+    comm = SIMIX_req_comm_irecv(mailbox, task, NULL, NULL, NULL);
     SIMIX_req_comm_wait(comm, timeout);
+    (*task)->simdata->comm = comm;
     DEBUG2("Got task %s from %p",(*task)->name,mailbox);
-    (*task)->simdata->refcount--;
+    (*task)->simdata->isused=0;
   }
   CATCH(e) {
     switch (e.category) {
@@ -112,11 +113,13 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
       ret = MSG_TIMEOUT;
       break;
     default:
-    	xbt_backtrace_display(&e);
-      xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg));
+      RETHROW;
     }
     xbt_ex_free(e);
   }
+  if (comm != NULL) {
+    //SIMIX_req_comm_destroy(comm);
+  }
 
   if (ret != MSG_HOST_FAILURE &&
       ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
@@ -135,6 +138,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
   MSG_error_t ret = MSG_OK;
   simdata_task_t t_simdata = NULL;
   m_process_t process = MSG_process_self();
+  volatile smx_action_t comm = NULL;
 #ifdef HAVE_TRACING
   int call_end = 0;
 #endif
@@ -144,28 +148,28 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
   call_end = TRACE_msg_task_put_start(task);    //must be after CHECK_HOST()
 #endif
 
-
   /* Prepare the task to send */
   t_simdata = task->simdata;
   t_simdata->sender = process;
   t_simdata->source = MSG_host_self();
 
-  xbt_assert0(t_simdata->refcount == 1,
+  xbt_assert0(t_simdata->isused == 0,
               "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
 
-  t_simdata->refcount++;
+  t_simdata->isused=1;
   msg_global->sent_msg++;
 
   process->simdata->waiting_task = task;
 
   /* Try to send it by calling SIMIX network layer */
   TRY {
-    t_simdata->comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
-                       t_simdata->rate, task, sizeof(void *), task);
+    comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+             t_simdata->rate, task, sizeof(void *), NULL, NULL, 0);
+    t_simdata->comm = comm;
 #ifdef HAVE_TRACING
-    SIMIX_req_set_category(t_simdata->comm, task->category);
+    SIMIX_req_set_category(comm, task->category);
 #endif
-    SIMIX_req_comm_wait(t_simdata->comm, timeout);
+    SIMIX_req_comm_wait(comm, timeout);
   }
 
   CATCH(e) {
@@ -180,12 +184,16 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
       ret = MSG_TIMEOUT;
       break;
     default:
-      xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg));
+      RETHROW;
     }
     xbt_ex_free(e);
 
-    /* Decrement the refcount only on failure */
-    t_simdata->refcount--;
+    /* If the send failed, it is not used anymore */
+    t_simdata->isused=0;
+  }
+
+  if (comm != NULL) {
+    //SIMIX_req_comm_destroy(comm);
   }
 
   process->simdata->waiting_task = NULL;