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

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 48d2b824c1..ab3e89f70a 100644
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -1,3 +1,11 @@
+/* Mailboxes in MSG */
+
+/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* 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. */
+
 #include "mailbox.h"
 #include "msg/private.h"
 
@@ -20,10 +28,8 @@ msg_mailbox_t MSG_mailbox_create(const char *alias)
 {
   msg_mailbox_t mailbox = xbt_new0(s_msg_mailbox_t, 1);
 
-  mailbox->tasks = xbt_fifo_new();
   mailbox->cond = NULL;
   mailbox->alias = alias ? xbt_strdup(alias) : NULL;
-  mailbox->hostname = NULL;
   mailbox->rdv = SIMIX_rdv_create(alias);
   
   return mailbox;
@@ -43,10 +49,6 @@ void MSG_mailbox_free(void *mailbox)
 {
   msg_mailbox_t _mailbox = (msg_mailbox_t) mailbox;
 
-  if (_mailbox->hostname)
-    free(_mailbox->hostname);
-
-  xbt_fifo_free(_mailbox->tasks);
   free(_mailbox->alias);
   SIMIX_rdv_destroy(_mailbox->rdv);
   
@@ -58,59 +60,25 @@ smx_cond_t MSG_mailbox_get_cond(msg_mailbox_t mailbox)
   return mailbox->cond;
 }
 
-void MSG_mailbox_remove(msg_mailbox_t mailbox, m_task_t task)
-{
-  xbt_fifo_remove(mailbox->tasks, task);
-}
-
 int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
 {
-  return (NULL == xbt_fifo_get_first_item(mailbox->tasks));
-}
-
-m_task_t MSG_mailbox_pop_head(msg_mailbox_t mailbox)
-{
-  return (m_task_t) xbt_fifo_shift(mailbox->tasks);
+  return (NULL == SIMIX_rdv_get_head(mailbox->rdv));
 }
 
 m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
 {
-  xbt_fifo_item_t item;
-
-  if (!(item = xbt_fifo_get_first_item(mailbox->tasks)))
-    return NULL;
-
-  return (m_task_t) xbt_fifo_get_item_content(item);
-}
-
-
-m_task_t MSG_mailbox_get_first_host_task(msg_mailbox_t mailbox, m_host_t host)
-{
-  m_task_t task = NULL;
-  xbt_fifo_item_t item = NULL;
-
-  xbt_fifo_foreach(mailbox->tasks, item, task, m_task_t)
-    if (task->simdata->source == host) {
-    xbt_fifo_remove_item(mailbox->tasks, item);
-    return task;
-  }
+  smx_comm_t comm = SIMIX_rdv_get_head(mailbox->rdv);
 
-  return NULL;
+  if(!comm)
+    return NULL; 
+  
+  return (m_task_t)SIMIX_communication_get_data(comm);
 }
 
 int
 MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox, m_host_t host)
 {
-  m_task_t task = NULL;
-  xbt_fifo_item_t item = NULL;
-  int count = 0;
-
-  xbt_fifo_foreach(mailbox->tasks, item, task, m_task_t) {
-    if (task->simdata->source == host)
-      count++;
-  }
-
-  return count;
+  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)
@@ -123,25 +91,13 @@ const char *MSG_mailbox_get_alias(msg_mailbox_t mailbox)
   return mailbox->alias;
 }
 
-const char *MSG_mailbox_get_hostname(msg_mailbox_t mailbox)
-{
-  return mailbox->hostname;
-}
-
-void MSG_mailbox_set_hostname(msg_mailbox_t mailbox, const char *hostname)
-{
-  mailbox->hostname = xbt_strdup(hostname);
-}
-
 msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
 {
 
   msg_mailbox_t mailbox = xbt_dict_get_or_null(msg_mailboxes, alias);
 
-  if (!mailbox) {
+  if (!mailbox)
     mailbox = MSG_mailbox_new(alias);
-    MSG_mailbox_set_hostname(mailbox, MSG_host_self()->name);
-  }
 
   return mailbox;
 }
@@ -157,27 +113,42 @@ 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;
-  smx_host_t smx_host;
-  size_t task_size = sizeof(void*);
+  MSG_error_t ret = MSG_OK;
+  smx_comm_t comm;
+#ifdef HAVE_TRACING
+  double start_time = 0;
+#endif
+  /* We no longer support getting a task from a specific host */
+  if (host) THROW_UNIMPLEMENTED;
+
   CHECK_HOST();
+#ifdef HAVE_TRACING
+  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.");
 
-  smx_host = host ? host->simdata->smx_host : NULL;
-  
+  /* Try to receive it by calling SIMIX network layer */
   TRY{
-    SIMIX_network_recv(mailbox->rdv, timeout, task, &task_size, 
-                       comm_filter_get, smx_host);
+    SIMIX_network_recv(mailbox->rdv, timeout, task, NULL, &comm);
+    //INFO2("Got task %s from %s",(*task)->name,mailbox->alias);
+    (*task)->simdata->refcount--;
   }
   CATCH(e){
     switch(e.category){
@@ -188,19 +159,22 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t *task,
         ret = MSG_TRANSFER_FAILURE;
         break;
       case timeout_error:
-        ret = MSG_TRANSFER_FAILURE;
+        ret = MSG_TIMEOUT;
         break;      
       default:
-        ret = MSG_OK;
-        RETHROW;
-        break;
-        /*xbt_die("Unhandled SIMIX network exception");*/
+        xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
     }
-    xbt_ex_free(e);
-    MSG_RETURN(ret);        
+    xbt_ex_free(e);        
+  }
+
+  if (ret != MSG_HOST_FAILURE &&
+      ret != MSG_TRANSFER_FAILURE &&
+      ret != MSG_TIMEOUT){
+#ifdef HAVE_TRACING
+    TRACE_msg_task_get_end (start_time, *task);
+#endif
   }
- 
-  MSG_RETURN (MSG_OK);
+  MSG_RETURN(ret);        
 }
 
 MSG_error_t
@@ -208,43 +182,40 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
                              double timeout)
 {
   xbt_ex_t e;
-  MSG_error_t ret;
-  m_process_t process = MSG_process_self();
-  const char *hostname;
+  MSG_error_t ret = MSG_OK;
   simdata_task_t t_simdata = NULL;
-  m_host_t local_host = NULL;
-  m_host_t remote_host = NULL;
-
+  m_process_t process = MSG_process_self();
+#ifdef HAVE_TRACING
+  int call_end = 0;
+#endif
   CHECK_HOST();
 
+#ifdef HAVE_TRACING
+  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_process_get_host(process);
+  t_simdata->source = MSG_host_self();
 
   xbt_assert0(t_simdata->refcount == 1,
               "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
 
-  t_simdata->comm = NULL;
-
-  /*t_simdata->refcount++;*/
-  local_host = ((simdata_process_t) process->simdata)->m_host;
+  t_simdata->refcount++;
   msg_global->sent_msg++;
 
-  /* get the host name containing the mailbox */
-  hostname = MSG_mailbox_get_hostname(mailbox);
-
-  remote_host = MSG_get_host_by_name(hostname);
-
-  if (!remote_host)
-    THROW1(not_found_error, 0, "Host %s not fount", hostname);
-
-  DEBUG4("Trying to send a task (%g kB) from %s to %s on the channel %s",
-         t_simdata->message_size / 1000, local_host->name,
-         remote_host->name, MSG_mailbox_get_alias(mailbox));
-
+  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 *), comm_filter_put, NULL);
+                       timeout, task, sizeof(void*), &t_simdata->comm, task);
   }
 
   CATCH(e){
@@ -256,18 +227,20 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
         ret = MSG_TRANSFER_FAILURE;
         break;
       case timeout_error:
-        ret = MSG_TRANSFER_FAILURE;
-        break;      
-      default:
-        ret = MSG_OK;
-        RETHROW;
+        ret = MSG_TIMEOUT;
         break;
-        /*xbt_die("Unhandled SIMIX network exception");*/
+      default:
+        xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
     }
     xbt_ex_free(e);
-    MSG_RETURN(ret);        
+
+    /* Decrement the refcount only on failure */
+    t_simdata->refcount--;
   }
 
- /* t_simdata->refcount--;*/
-  MSG_RETURN (MSG_OK);
+  process->simdata->waiting_task = NULL;
+#ifdef HAVE_TRACING
+  if (call_end) TRACE_msg_task_put_end ();
+#endif
+  MSG_RETURN(ret);        
 }