X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93400d8225df04f5be18bb8f8fcca31293b92636..cb6c404ed6a176ee440c09957a8fd9f34918a29b:/src/msg/msg_mailbox.c

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 3425a413dc..997b138659 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -1,92 +1,54 @@
-#include "mailbox.h"
-#include "msg/private.h"
+/* Mailboxes in MSG */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
-                                "Logging specific to MSG (mailbox)");
+/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-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);
-}
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-msg_mailbox_t MSG_mailbox_create(const char *alias)
-{
-  msg_mailbox_t mailbox = xbt_new0(s_msg_mailbox_t, 1);
+#include "msg_mailbox.h"
+#include "msg_private.h"
 
-  mailbox->cond = NULL;
-  mailbox->alias = alias ? xbt_strdup(alias) : NULL;
-  mailbox->rdv = SIMIX_rdv_create(alias);
-  
-  return mailbox;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
+                                "Logging specific to MSG (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 simcall_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;
+  simcall_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 == simcall_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 = simcall_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) simcall_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 simcall_rdv_comm_count_by_host(mailbox,
+                                      host->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 = simcall_rdv_get_by_name(alias);
 
   if (!mailbox)
     mailbox = MSG_mailbox_new(alias);
@@ -94,65 +56,59 @@ 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)
-{
-  xbt_assert0((host != NULL), "Invalid host");
-  xbt_assert1((channel >= 0)
-              && (channel < msg_global->max_channel), "Invalid channel %d",
-              channel);
-
-  return host->simdata->mailboxes[(size_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;
-  size_t task_size = sizeof(void*);
   MSG_error_t ret = MSG_OK;
-  smx_comm_t comm;
-  CHECK_HOST();
+  /* We no longer support getting a task from a specific host */
+  if (host)
+    THROW_UNIMPLEMENTED;
 
-  /* 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));
+#ifdef HAVE_TRACING
+  TRACE_msg_task_get_start();
+  volatile double start_time = MSG_get_clock();
+#endif
 
   /* Sanity check */
-  xbt_assert0(task, "Null pointer for the task storage");
+  xbt_assert(task, "Null pointer for the task storage");
 
   if (*task)
-    CRITICAL0
-      ("MSG_task_get() was asked to write in a non empty task struct.");
-
-  /* We no longer support getting a task from a specific host */
-  if(host)
-    THROW_UNIMPLEMENTED;
+    XBT_WARN
+        ("Asked to write the received task in a non empty struct -- proceeding.");
 
   /* Try to receive it by calling SIMIX network layer */
-  TRY{
-    SIMIX_network_recv(mailbox->rdv, timeout, task, &task_size, &comm);
-    (*task)->simdata->refcount--;
+  TRY {
+    simcall_comm_recv(mailbox, task, NULL, NULL, NULL, timeout);
+    XBT_DEBUG("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_FAILURE;
-        break;      
-      default:
-        xbt_die("Unhandled SIMIX network exception");
+  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);
+  }
+
+#ifdef HAVE_TRACING
+  if (ret != MSG_HOST_FAILURE &&
+      ret != MSG_TRANSFER_FAILURE &&
+      ret != MSG_TIMEOUT) {
+    TRACE_msg_task_get_end(start_time, *task);
   }
-  
-  MSG_RETURN(ret);        
+#endif
+  MSG_RETURN(ret);
 }
 
 MSG_error_t
@@ -163,53 +119,77 @@ 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();
-  
-  CHECK_HOST();
+  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;
   t_simdata->sender = process;
-  t_simdata->source = MSG_host_self();
+  t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
 
-  xbt_assert0(t_simdata->refcount == 1,
+  xbt_assert(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;
+  t_simdata->comm = NULL;
   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);
+  p_simdata->waiting_task = task;
+
+  /* Try to send it by calling SIMIX network layer */
+  TRY {
+      smx_action_t comm = simcall_comm_isend(mailbox, t_simdata->message_size,
+                                  t_simdata->rate, task, sizeof(void *),
+                                  NULL, NULL, task, 0);
+#ifdef HAVE_TRACING
+    if (TRACE_is_enabled()) {
+      simcall_set_category(comm, task->category);
+    }
+#endif
+     t_simdata->comm = comm;
+     simcall_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_FAILURE;
-        break;
-      default:
-        xbt_die("Unhandled SIMIX network exception");
+  CATCH(e) {
+    switch (e.category) {
+    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;
   }
 
-  process->simdata->waiting_task = NULL;
-   
-  MSG_RETURN(ret);        
+
+  p_simdata->waiting_task = NULL;
+#ifdef HAVE_TRACING
+  if (call_end)
+    TRACE_msg_task_put_end();
+#endif
+  MSG_RETURN(ret);
+}
+
+#ifdef MSG_USE_DEPRECATED
+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",
+              channel);
+
+  return host->mailboxes[(size_t) channel];
 }
+#endif