X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/792ca8f49deee03354efe006a1dec6c43d2d6b07..c4aa4cede2e91d6f21df5c34bb55ad8bf0207e2a:/src/msg/msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 409801c85f..3aa3a90553 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -8,93 +8,46 @@
 
 #include "mailbox.h"
 #include "msg/private.h"
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
                                 "Logging specific to MSG (mailbox)");
 
-static xbt_dict_t msg_mailboxes = NULL;
-
-void MSG_mailbox_mod_init(void)
-{
-  msg_mailboxes = xbt_dict_new();
-}
-
-void MSG_mailbox_mod_exit(void)
-{
-  xbt_dict_free(&msg_mailboxes);
-}
-
-msg_mailbox_t MSG_mailbox_create(const char *alias)
-{
-  msg_mailbox_t mailbox = xbt_new0(s_msg_mailbox_t, 1);
-
-  mailbox->cond = NULL;
-  mailbox->alias = alias ? xbt_strdup(alias) : NULL;
-  mailbox->rdv = SIMIX_rdv_create(alias);
-  
-  return mailbox;
-}
-
 msg_mailbox_t MSG_mailbox_new(const char *alias)
 {
-  msg_mailbox_t mailbox = MSG_mailbox_create(alias);
-
-  /* add the mbox in the dictionary */
-  xbt_dict_set(msg_mailboxes, alias, mailbox, MSG_mailbox_free);
-
-  return mailbox;
+  return SIMIX_req_rdv_create(alias);
 }
 
 void MSG_mailbox_free(void *mailbox)
 {
-  msg_mailbox_t _mailbox = (msg_mailbox_t) mailbox;
-
-  free(_mailbox->alias);
-  SIMIX_rdv_destroy(_mailbox->rdv);
-  
-  free(_mailbox);
-}
-
-smx_cond_t MSG_mailbox_get_cond(msg_mailbox_t mailbox)
-{
-  return mailbox->cond;
+  SIMIX_req_rdv_destroy((msg_mailbox_t)mailbox);
 }
 
 int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
 {
-  return (NULL == SIMIX_rdv_get_head(mailbox->rdv));
+  return (NULL == SIMIX_req_rdv_get_head(mailbox));
 }
 
 m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
 {
-  smx_comm_t comm = SIMIX_rdv_get_head(mailbox->rdv);
+  smx_action_t comm = SIMIX_req_rdv_get_head(mailbox);
 
-  if(!comm)
-    return NULL; 
-  
-  return (m_task_t)SIMIX_communication_get_data(comm);
-}
+  if (!comm)
+    return NULL;
 
-int
-MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox, m_host_t host)
-{
-  return SIMIX_rdv_get_count_waiting_comm (mailbox->rdv, host->simdata->smx_host);
-}
-
-void MSG_mailbox_set_cond(msg_mailbox_t mailbox, smx_cond_t cond)
-{
-  mailbox->cond = cond;
+  return (m_task_t) SIMIX_req_comm_get_src_data(comm);
 }
 
-const char *MSG_mailbox_get_alias(msg_mailbox_t mailbox)
+int
+MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
+                                         m_host_t host)
 {
-  return mailbox->alias;
+  return SIMIX_req_rdv_comm_count_by_host(mailbox,
+                                      host->simdata->smx_host);
 }
 
 msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
 {
 
-  msg_mailbox_t mailbox = xbt_dict_get_or_null(msg_mailboxes, alias);
+  msg_mailbox_t mailbox = SIMIX_req_rdv_get_by_name(alias);
 
   if (!mailbox)
     mailbox = MSG_mailbox_new(alias);
@@ -102,7 +55,8 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
   return mailbox;
 }
 
-msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel)
+msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
+                                         m_channel_t channel)
 {
   xbt_assert0((host != NULL), "Invalid host");
   xbt_assert1((channel >= 0)
@@ -113,66 +67,67 @@ msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel)
 }
 
 MSG_error_t
-MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t *task, m_host_t host,
-                         double timeout)
+MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
+                         m_host_t host, double timeout)
 {
   xbt_ex_t e;
   MSG_error_t ret = MSG_OK;
-  smx_comm_t comm;
-
+  volatile smx_action_t comm = NULL;
+#ifdef HAVE_TRACING
+  double start_time = 0;
+#endif
   /* We no longer support getting a task from a specific host */
-  if (host) THROW_UNIMPLEMENTED;
+  if (host)
+    THROW_UNIMPLEMENTED;
 
   CHECK_HOST();
 #ifdef HAVE_TRACING
-  TRACE_msg_task_get_start ();
-  double start_time = MSG_get_clock();
+  TRACE_msg_task_get_start();
+  start_time = MSG_get_clock();
 #endif
 
-  memset(&comm,0,sizeof(comm));
-
-  /* Kept for compatibility with older implementation */
-  xbt_assert1(!MSG_mailbox_get_cond(mailbox),
-              "A process is already blocked on this channel %s", 
-              MSG_mailbox_get_alias(mailbox));
-
   /* Sanity check */
   xbt_assert0(task, "Null pointer for the task storage");
 
   if (*task)
-    CRITICAL0("MSG_task_get() was asked to write in a non empty task struct.");
+    CRITICAL0
+        ("MSG_task_get() was asked to write in a non empty task struct.");
 
   /* Try to receive it by calling SIMIX network layer */
-  TRY{
-    SIMIX_network_recv(mailbox->rdv, timeout, task, NULL, &comm);
-    //INFO2("Got task %s from %s",(*task)->name,mailbox->alias);
-    (*task)->simdata->refcount--;
+  TRY {
+    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->isused=0;
   }
-  CATCH(e){
-    switch(e.category){
-      case host_error:
-        ret = MSG_HOST_FAILURE;
-        break;
-      case network_error:
-        ret = MSG_TRANSFER_FAILURE;
-        break;
-      case timeout_error:
-        ret = MSG_TIMEOUT;
-        break;      
-      default:
-        xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
+  CATCH(e) {
+    switch (e.category) {
+    case host_error:
+      ret = MSG_HOST_FAILURE;
+      break;
+    case network_error:
+      ret = MSG_TRANSFER_FAILURE;
+      break;
+    case timeout_error:
+      ret = MSG_TIMEOUT;
+      break;
+    default:
+      RETHROW;
     }
-    xbt_ex_free(e);        
+    xbt_ex_free(e);
+  }
+  if (comm != NULL) {
+    SIMIX_req_comm_destroy(comm);
   }
 
   if (ret != MSG_HOST_FAILURE &&
-      ret != MSG_TRANSFER_FAILURE &&
-      ret != MSG_TIMEOUT){
+      ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
 #ifdef HAVE_TRACING
-    TRACE_msg_task_get_end (start_time, *task);
+    TRACE_msg_task_get_end(start_time, *task);
 #endif
   }
-  MSG_RETURN(ret);        
+  MSG_RETURN(ret);
 }
 
 MSG_error_t
@@ -183,60 +138,68 @@ 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
   CHECK_HOST();
 
 #ifdef HAVE_TRACING
-  int call_end = TRACE_msg_task_put_start (task); //must be after CHECK_HOST()
+  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{
-    /* Kept for semantical compatibility with older implementation */
-    if(mailbox->cond)
-      SIMIX_cond_signal(mailbox->cond);
 
-    SIMIX_network_send(mailbox->rdv, t_simdata->message_size, t_simdata->rate,
-                       timeout, task, sizeof(void*), &t_simdata->comm, task);
+  /* Try to send it by calling SIMIX network layer */
+  TRY {
+    comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+             t_simdata->rate, task, sizeof(void *), NULL, NULL);
+    t_simdata->comm = comm;
+#ifdef HAVE_TRACING
+    SIMIX_req_set_category(comm, task->category);
+#endif
+    SIMIX_req_comm_wait(comm, timeout);
   }
 
-  CATCH(e){
-    switch(e.category){
-      case host_error:
-        ret = MSG_HOST_FAILURE;
-        break;
-      case network_error:
-        ret = MSG_TRANSFER_FAILURE;
-        break;
-      case timeout_error:
-        ret = MSG_TIMEOUT;
-        break;
-      default:
-        xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
+  CATCH(e) {
+    switch (e.category) {
+    case host_error:
+      ret = MSG_HOST_FAILURE;
+      break;
+    case network_error:
+      ret = MSG_TRANSFER_FAILURE;
+      break;
+    case timeout_error:
+      ret = MSG_TIMEOUT;
+      break;
+    default:
+      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;
 #ifdef HAVE_TRACING
-  if (call_end) TRACE_msg_task_put_end ();
+  if (call_end)
+    TRACE_msg_task_put_end();
 #endif
-  MSG_RETURN(ret);        
+  MSG_RETURN(ret);
 }