Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix the logic of refcount in msg_task_t by ... killing it. It's now a boolean indicat...
[simgrid.git] / src / msg / gos.c
index 0e0acdf..92dfac4 100644 (file)
-/*     $Id$     */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2004, 2005, 2006, 2007, 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"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gos, msg,
-                               "Logging specific to MSG (gos)");
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "mc/mc.h"
+#include "xbt/log.h"
+#include "mailbox.h"
 
-/** \defgroup msg_gos_functions MSG Operating System Functions
- *  \brief This section describes the functions that can be used
- *  by an agent for handling some task.
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg,
+                                "Logging specific to MSG (gos)");
+
+/** \ingroup msg_gos_functions
+ *
+ * \brief Return the last value returned by a MSG function (except
+ * MSG_get_errno...).
  */
+MSG_error_t MSG_get_errno(void)
+{
+  return PROCESS_GET_ERRNO();
+}
 
-/* \ingroup msg_gos_functions
- * \brief This function is now deprecated and useless. Please stop using it.
+/** \ingroup msg_gos_functions
+ * \brief Executes a task and waits for its termination.
+ *
+ * This function is used for describing the behavior of an agent. It
+ * takes only one parameter.
+ * \param task a #m_task_t to execute on the location on which the
+ agent is running.
+ * \return #MSG_FATAL if \a task is not properly initialized and
+ * #MSG_OK otherwise.
  */
-MSG_error_t MSG_process_start(m_process_t process)
+MSG_error_t MSG_task_execute(m_task_t task)
 {
-  xbt_assert0(0,"This function is now deprecated and useless. Please stop using it.");
+  simdata_task_t simdata = NULL;
+  m_process_t self = MSG_process_self();
+  CHECK_HOST();
+
+  simdata = task->simdata;
+
+  xbt_assert0(simdata->host_nb == 0,
+              "This is a parallel task. Go to hell.");
+
+#ifdef HAVE_TRACING
+  TRACE_msg_task_execute_start(task);
+#endif
+
+  xbt_assert1((!simdata->compute) && (task->simdata->isused == 0),
+              "This task is executed somewhere else. Go fix your code! %d",
+              task->simdata->isused);
+
+  DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name);
+
+  if (simdata->computation_amount == 0) {
+#ifdef HAVE_TRACING
+    TRACE_msg_task_execute_end(task);
+#endif
+    return MSG_OK;
+  }
+  simdata->isused=1;
+  simdata->compute =
+      SIMIX_req_host_execute(task->name, SIMIX_host_self(),
+                           simdata->computation_amount);
+  SIMIX_req_host_execution_set_priority(simdata->compute, simdata->priority);
+#ifdef HAVE_TRACING
+  SIMIX_req_set_category(simdata->compute, task->category);
+#endif
+
+  self->simdata->waiting_action = simdata->compute;
+  SIMIX_req_host_execution_wait(simdata->compute);
+  self->simdata->waiting_action = NULL;
+
+  simdata->isused=0;
+
+  DEBUG2("Execution task '%s' finished in state %d", task->name, SIMIX_req_host_execution_get_state(task->simdata->compute));
+  if (SIMIX_req_host_execution_get_state(task->simdata->compute) == SIMIX_DONE) {
+    /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+    SIMIX_req_host_execution_destroy(task->simdata->compute);
+    simdata->computation_amount = 0.0;
+    simdata->comm = NULL;
+    simdata->compute = NULL;
+#ifdef HAVE_TRACING
+    TRACE_msg_task_execute_end(task);
+#endif
+    MSG_RETURN(MSG_OK);
+  } else if (SIMIX_req_host_get_state(SIMIX_host_self()) == 0) {
+    /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+    SIMIX_req_host_execution_destroy(task->simdata->compute);
+    simdata->comm = NULL;
+    simdata->compute = NULL;
+#ifdef HAVE_TRACING
+    TRACE_msg_task_execute_end(task);
+#endif
+    MSG_RETURN(MSG_HOST_FAILURE);
+  } else {
+    /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+    SIMIX_req_host_execution_destroy(task->simdata->compute);
+    simdata->comm = NULL;
+    simdata->compute = NULL;
+#ifdef HAVE_TRACING
+    TRACE_msg_task_execute_end(task);
+#endif
+    MSG_RETURN(MSG_TASK_CANCELLED);
+  }
+}
+
+/** \ingroup m_task_management
+ * \brief Creates a new #m_task_t (a parallel one....).
+ *
+ * A constructor for #m_task_t taking six arguments and returning the
+ corresponding object.
+ * \param name a name for the object. It is for user-level information
+ and can be NULL.
+ * \param host_nb the number of hosts implied in the parallel task.
+ * \param host_list an array of \p host_nb m_host_t.
+ * \param computation_amount an array of \p host_nb
+ doubles. computation_amount[i] is the total number of operations
+ that have to be performed on host_list[i].
+ * \param communication_amount an array of \p host_nb* \p host_nb doubles.
+ * \param data a pointer to any data may want to attach to the new
+ object.  It is for user-level information and can be NULL. It can
+ be retrieved with the function \ref MSG_task_get_data.
+ * \see m_task_t
+ * \return The new corresponding object.
+ */
+m_task_t
+MSG_parallel_task_create(const char *name, int host_nb,
+                         const m_host_t * host_list,
+                         double *computation_amount,
+                         double *communication_amount, void *data)
+{
+  int i;
+  simdata_task_t simdata = xbt_new0(s_simdata_task_t, 1);
+  m_task_t task = xbt_new0(s_m_task_t, 1);
+  task->simdata = simdata;
+
+  /* Task structure */
+  task->name = xbt_strdup(name);
+  task->data = data;
+
+  /* Simulator Data */
+  simdata->computation_amount = 0;
+  simdata->message_size = 0;
+  simdata->compute = NULL;
+  simdata->comm = NULL;
+  simdata->rate = -1.0;
+  simdata->isused = 0;
+  simdata->sender = NULL;
+  simdata->receiver = NULL;
+  simdata->source = NULL;
+
+  simdata->host_nb = host_nb;
+  simdata->host_list = xbt_new0(smx_host_t, host_nb);
+  simdata->comp_amount = computation_amount;
+  simdata->comm_amount = communication_amount;
+
+  for (i = 0; i < host_nb; i++)
+    simdata->host_list[i] = host_list[i]->simdata->smx_host;
+
+  return task;
+}
+
+MSG_error_t MSG_parallel_task_execute(m_task_t task)
+{
+  simdata_task_t simdata = NULL;
+  m_process_t self = MSG_process_self();
+  CHECK_HOST();
+
+  simdata = task->simdata;
+
+  xbt_assert0((!simdata->compute)
+              && (task->simdata->isused == 0),
+              "This task is executed somewhere else. Go fix your code!");
+
+  xbt_assert0(simdata->host_nb,
+              "This is not a parallel task. Go to hell.");
+
+  DEBUG1("Parallel computing on %s", MSG_process_self()->simdata->m_host->name);
+
+  simdata->isused=1;
+
+  simdata->compute =
+      SIMIX_req_host_parallel_execute(task->name, simdata->host_nb,
+                                  simdata->host_list,
+                                  simdata->comp_amount,
+                                  simdata->comm_amount, 1.0, -1.0);
+  DEBUG1("Parallel execution action created: %p", simdata->compute);
+
+  self->simdata->waiting_action = simdata->compute;
+  SIMIX_req_host_execution_wait(simdata->compute);
+  self->simdata->waiting_action = NULL;
+
+  DEBUG2("Finished waiting for execution of action %p, state = %d", simdata->compute, SIMIX_req_host_execution_get_state(task->simdata->compute));
+
+  simdata->isused=0;
+
+  if (SIMIX_req_host_execution_get_state(task->simdata->compute) == SIMIX_DONE) {
+    /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+    SIMIX_req_host_execution_destroy(task->simdata->compute);
+    simdata->computation_amount = 0.0;
+    simdata->comm = NULL;
+    simdata->compute = NULL;
+    MSG_RETURN(MSG_OK);
+  } else if (SIMIX_req_host_get_state(SIMIX_host_self()) == 0) {
+    /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+    SIMIX_req_host_execution_destroy(task->simdata->compute);
+    simdata->comm = NULL;
+    simdata->compute = NULL;
+    MSG_RETURN(MSG_HOST_FAILURE);
+  } else {
+    /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
+    SIMIX_req_host_execution_destroy(task->simdata->compute);
+    simdata->comm = NULL;
+    simdata->compute = NULL;
+    MSG_RETURN(MSG_TASK_CANCELLED);
+  }
+}
+
+
+/** \ingroup msg_gos_functions
+ * \brief Sleep for the specified number of seconds
+ *
+ * Makes the current process sleep until \a time seconds have elapsed.
+ *
+ * \param nb_sec a number of second
+ */
+MSG_error_t MSG_process_sleep(double nb_sec)
+{
+  e_smx_state_t state;
+  /*m_process_t proc = MSG_process_self();*/
+
+#ifdef HAVE_TRACING
+  TRACE_msg_process_sleep_in(MSG_process_self());
+#endif
+
+  /* create action to sleep */
+  state = SIMIX_req_process_sleep(nb_sec);
+
+  /*proc->simdata->waiting_action = act_sleep;
+
+  FIXME: check if not setting the waiting_action breaks something on msg
+  
+  proc->simdata->waiting_action = NULL;*/
   
-  return MSG_OK;
+  if (state == SIMIX_DONE) {
+    if (SIMIX_req_host_get_state(SIMIX_host_self()) == SURF_RESOURCE_OFF) {
+#ifdef HAVE_TRACING
+      TRACE_msg_process_sleep_out(MSG_process_self());
+#endif
+      MSG_RETURN(MSG_HOST_FAILURE);
+    }
+  } else {
+#ifdef HAVE_TRACING
+    TRACE_msg_process_sleep_out(MSG_process_self());
+#endif
+    MSG_RETURN(MSG_HOST_FAILURE);
+  }
+#ifdef HAVE_TRACING
+  TRACE_msg_process_sleep_out(MSG_process_self());
+#endif
+  MSG_RETURN(MSG_OK);
+}
+
+/** \ingroup msg_gos_functions
+ * \brief Listen on \a channel and waits for receiving a task from \a host.
+ *
+ * It takes three parameters.
+ * \param task a memory location for storing a #m_task_t. It will
+ hold a task when this function will return. Thus \a task should not
+ be equal to \c NULL and \a *task should be equal to \c NULL. If one of
+ those two condition does not hold, there will be a warning message.
+ * \param channel the channel on which the agent should be
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
+ * \param host the host that is to be watched.
+ * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
+ if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
+ */
+MSG_error_t
+MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host)
+{
+  return MSG_task_get_ext(task, channel, -1, host);
 }
 
 /** \ingroup msg_gos_functions
@@ -31,19 +291,18 @@ MSG_error_t MSG_process_start(m_process_t process)
  *
  * It takes two parameters.
  * \param task a memory location for storing a #m_task_t. It will
  hold a task when this function will return. Thus \a task should not
  be equal to \c NULL and \a *task should be equal to \c NULL. If one of
  those two condition does not hold, there will be a warning message.
+ hold a task when this function will return. Thus \a task should not
+ be equal to \c NULL and \a *task should be equal to \c NULL. If one of
+ those two condition does not hold, there will be a warning message.
  * \param channel the channel on which the agent should be
  listening. This value has to be >=0 and < than the maximal
  number of channels fixed with MSG_set_channel_number().
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
  * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
  * if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
  */
-MSG_error_t MSG_task_get(m_task_t * task,
-                        m_channel_t channel)
+MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel)
 {
-  return MSG_task_get_with_time_out(task, channel, -1);
+  return MSG_task_get_with_timeout(task, channel, -1);
 }
 
 /** \ingroup msg_gos_functions
@@ -51,220 +310,261 @@ MSG_error_t MSG_task_get(m_task_t * task,
  *
  * It takes three parameters.
  * \param task a memory location for storing a #m_task_t. It will
  hold a task when this function will return. Thus \a task should not
  be equal to \c NULL and \a *task should be equal to \c NULL. If one of
  those two condition does not hold, there will be a warning message.
+ hold a task when this function will return. Thus \a task should not
+ be equal to \c NULL and \a *task should be equal to \c NULL. If one of
+ those two condition does not hold, there will be a warning message.
  * \param channel the channel on which the agent should be
  listening. This value has to be >=0 and < than the maximal
  number of channels fixed with MSG_set_channel_number().
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
  * \param max_duration the maximum time to wait for a task before giving
-    up. In such a case, \a task will not be modified and will still be
-    equal to \c NULL when returning.
+ up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task
+ will not be modified and will still be
+ equal to \c NULL when returning.
  * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
  if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
+ if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
  */
-
-MSG_error_t MSG_task_get_with_time_out(m_task_t * task,
-                                      m_channel_t channel,
-                                      double max_duration)
+MSG_error_t
+MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel,
+                          double max_duration)
 {
-  m_process_t process = MSG_process_self();
-  m_task_t t = NULL;
-  m_host_t h = NULL;
-  simdata_task_t t_simdata = NULL;
-  simdata_host_t h_simdata = NULL;
-  int warning = 0;
-  int first_time = 1;
-  e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
-  
-  CHECK_HOST();
-  /* Sanity check */
-  xbt_assert0(task,"Null pointer for the task\n");
+  return MSG_task_get_ext(task, channel, max_duration, NULL);
+}
+
+/** \defgroup msg_gos_functions MSG Operating System Functions
+ *  \brief This section describes the functions that can be used
+ *  by an agent for handling some task.
+ */
 
-  if (*task) 
-    CRITICAL0("MSG_task_get() was asked to write in a non empty task struct.");
+MSG_error_t
+MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout,
+                 m_host_t host)
+{
+  xbt_assert1((channel >= 0)
+              && (channel < msg_global->max_channel), "Invalid channel %d",
+              channel);
+
+  return
+      MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel
+                               (MSG_host_self(), channel), task, host,
+                               timeout);
+}
 
-  /* Get the task */
-  h = MSG_host_self();
-  h_simdata = h->simdata;
+MSG_error_t
+MSG_task_receive_from_host(m_task_t * task, const char *alias,
+                           m_host_t host)
+{
+  return MSG_task_receive_ext(task, alias, -1, host);
+}
 
-  DEBUG2("Waiting for a task on channel %d (%s)", channel,h->name);
+MSG_error_t MSG_task_receive(m_task_t * task, const char *alias)
+{
+  return MSG_task_receive_with_timeout(task, alias, -1);
+}
 
-  while ((t = xbt_fifo_shift(h_simdata->mbox[channel])) == NULL) {
-    if(max_duration>0) {
-      if(!first_time) {
-       MSG_RETURN(MSG_OK);
-      }
-    }
-    xbt_assert2(!(h_simdata->sleeping[channel]),
-               "A process (%s(%d)) is already blocked on this channel",
-               h_simdata->sleeping[channel]->name,
-               h_simdata->sleeping[channel]->simdata->PID);
-    h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
-    if(max_duration>0) {
-      __MSG_process_block(max_duration);
-    } else {
-      __MSG_process_block(-1);
-    }
-    if(surf_workstation_resource->extension_public->get_state(h_simdata->host) 
-       == SURF_CPU_OFF)
-      MSG_RETURN(MSG_HOST_FAILURE);
-    h_simdata->sleeping[channel] = NULL;
-    first_time = 0;
-    /* OK, we should both be ready now. Are you there ? */
-  }
+MSG_error_t
+MSG_task_receive_with_timeout(m_task_t * task, const char *alias,
+                              double timeout)
+{
+  return MSG_task_receive_ext(task, alias, timeout, NULL);
+}
 
-  t_simdata = t->simdata;
-  /*   *task = __MSG_task_copy(t); */
-  *task=t;
+MSG_error_t
+MSG_task_receive_ext(m_task_t * task, const char *alias, double timeout,
+                     m_host_t host)
+{
+  DEBUG1
+      ("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'",
+       alias);
+  return MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task,
+                                  host, timeout);
+}
 
-  /* Transfer */
-  t_simdata->using++;
+/** \ingroup msg_gos_functions
+ * \brief Send a task on a channel.
+ *
+ * This function takes two parameter.
+ * \param task a #m_task_t to send on another location.
+ * \param alias the channel on which the agent should put this
+ task. This value has to be >=0 and < than the maximal number of
+ channels fixed with MSG_set_channel_number().
+ * \return the msg_comm_t communication.
+ */
+msg_comm_t MSG_task_isend(m_task_t task, const char *alias)
+{
+  simdata_task_t t_simdata = NULL;
+  m_process_t process = MSG_process_self();
+  msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
 
-  t_simdata->comm = surf_workstation_resource->extension_public->
-    communicate(MSG_process_get_host(t_simdata->sender)->simdata->host,
-               h->simdata->host, t_simdata->message_size,t_simdata->rate);
-  
-  surf_workstation_resource->common_public->action_set_data(t_simdata->comm,t);
+  CHECK_HOST();
 
-  if(__MSG_process_isBlocked(t_simdata->sender)) 
-    __MSG_process_unblock(t_simdata->sender);
+  /* FIXME: these functions are not tracable */
 
-  PAJE_PROCESS_PUSH_STATE(process,"C");  
+  /* Prepare the task to send */
+  t_simdata = task->simdata;
+  t_simdata->sender = process;
+  t_simdata->source = MSG_host_self();
 
-  do {
-    __MSG_task_wait_event(process, t);
-    state=surf_workstation_resource->common_public->action_get_state(t_simdata->comm);
-  } while (state==SURF_ACTION_RUNNING);
+  xbt_assert0(t_simdata->isused == 0,
+              "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
 
-  if(t->simdata->using>1) {
-    xbt_fifo_unshift(msg_global->process_to_run,process);
-    xbt_context_yield();
-  }
+  t_simdata->isused=1;
+  msg_global->sent_msg++;
 
-  PAJE_PROCESS_POP_STATE(process);
-  PAJE_COMM_STOP(process,t,channel);
+  /* Send it by calling SIMIX network layer */
 
-  if(state == SURF_ACTION_DONE) {
-    if(surf_workstation_resource->common_public->action_free(t_simdata->comm)) 
-      t_simdata->comm = NULL;
-    MSG_RETURN(MSG_OK);
-  } else if(surf_workstation_resource->extension_public->get_state(h_simdata->host) 
-         == SURF_CPU_OFF) {
-    if(surf_workstation_resource->common_public->action_free(t_simdata->comm)) 
-      t_simdata->comm = NULL;
-    MSG_RETURN(MSG_HOST_FAILURE);
-  } else {
-    if(surf_workstation_resource->common_public->action_free(t_simdata->comm)) 
-      t_simdata->comm = NULL;
-    MSG_RETURN(MSG_TRANSFER_FAILURE);
-  }
+  return SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+                             t_simdata->rate, task, sizeof(void *), NULL,
+                             &t_simdata->comm);
 }
 
 /** \ingroup msg_gos_functions
- * \brief Test whether there is a pending communication on a channel.
+ * \brief Listen on a channel for receiving a task from an asynchronous communication.
  *
- * It takes one parameter.
- * \param channel the channel on which the agent should be
-   listening. This value has to be >=0 and < than the maximal
-   number of channels fixed with MSG_set_channel_number().
- * \return 1 if there is a pending communication and 0 otherwise
+ * It takes two parameters.
+ * \param task a memory location for storing a #m_task_t.
+ * \param alias the channel on which the agent should be
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
+ * \return the msg_comm_t communication.
  */
-int MSG_task_Iprobe(m_channel_t channel)
+msg_comm_t MSG_task_irecv(m_task_t * task, const char *alias)
 {
-  m_host_t h = NULL;
-  simdata_host_t h_simdata = NULL;
+  smx_rdv_t rdv = MSG_mailbox_get_by_alias(alias);
 
-  DEBUG2("Probing on channel %d (%s)", channel,h->name);
   CHECK_HOST();
-  h = MSG_host_self();
-  h_simdata = h->simdata;
-  return(xbt_fifo_getFirstItem(h_simdata->mbox[channel])!=NULL);
+
+  /* FIXME: these functions are not tracable */
+
+  /* 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.");
+
+  /* Try to receive it by calling SIMIX network layer */
+  return SIMIX_req_comm_irecv(rdv, task, NULL, NULL, NULL);
 }
 
 /** \ingroup msg_gos_functions
- * \brief Test whether there is a pending communication on a channel, and who sent it.
+ * \brief Test the status of a communication.
  *
  * It takes one parameter.
- * \param channel the channel on which the agent should be
-   listening. This value has to be >=0 and < than the maximal
-   number of channels fixed with MSG_set_channel_number().
- * \return -1 if there is no pending communication and the PID of the process who sent it otherwise
+ * \param comm the communication to test.
+ * \return the status of the communication:
+ *             TRUE : the communication is completed
+ *             FALSE: the communication is incompleted
+ * If the status is FALSE, don't forget to use MSG_process_sleep() after the test.
  */
-int MSG_task_probe_from(m_channel_t channel)
+int MSG_comm_test(msg_comm_t comm)
 {
-  m_host_t h = NULL;
-  simdata_host_t h_simdata = NULL;
-  xbt_fifo_item_t item;
-  m_task_t t;
-
-  CHECK_HOST();
-  h = MSG_host_self();
-  h_simdata = h->simdata;
-
-  DEBUG2("Probing on channel %d (%s)", channel,h->name);
-   
-  item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]);
-  if (!item || !(t = xbt_fifo_get_item_content(item)))
-    return -1;
-   
-  return MSG_process_get_PID(t->simdata->sender);
+  return SIMIX_req_comm_test(comm);
 }
 
-MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
-                                   int *PID)
+/** \ingroup msg_gos_functions
+ * \brief After received TRUE to MSG_comm_test(), the communication must be destroyed.
+ *
+ * It takes one parameter.
+ * \param comm the communication to destroy.
+ */
+void MSG_comm_destroy(msg_comm_t comm)
 {
-  m_host_t h = NULL;
-  simdata_host_t h_simdata = NULL;
-  xbt_fifo_item_t item;
-  m_task_t t;
-  int first_time = 1;
-  m_process_t process = MSG_process_self();
-
-  if(PID) {
-    *PID = -1;
+  if (SIMIX_req_comm_get_src_proc(comm) != SIMIX_process_self()) {
+    m_task_t task;
+    task = (m_task_t) SIMIX_req_comm_get_src_buff(comm);
+    task->simdata->isused=0;
   }
+  SIMIX_req_comm_destroy(comm);
+}
 
-  if(max_duration==0.0) {
-    return MSG_task_probe_from(channel);
-  } else {
-    CHECK_HOST();
-    h = MSG_host_self();
-    h_simdata = h->simdata;
-    
-    DEBUG2("Probing on channel %d (%s)", channel,h->name);
-    while(!(item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) {
-      if(max_duration>0) {
-       if(!first_time) {
-         MSG_RETURN(MSG_OK);
-       }
-      }
-      xbt_assert2(!(h_simdata->sleeping[channel]),
-                 "A process (%s(%d)) is already blocked on this channel",
-                 h_simdata->sleeping[channel]->name,
-                 h_simdata->sleeping[channel]->simdata->PID);
-      h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
-      if(max_duration>0) {
-       __MSG_process_block(max_duration);
-      } else {
-       __MSG_process_block(-1);
-      }
-      if(surf_workstation_resource->extension_public->get_state(h_simdata->host) 
-        == SURF_CPU_OFF) {
-       MSG_RETURN(MSG_HOST_FAILURE);
-      }
-      h_simdata->sleeping[channel] = NULL;
-      first_time = 0;
-    }
-    if (!item || !(t = xbt_fifo_get_item_content(item))) {
-      MSG_RETURN(MSG_OK);
+/** \ingroup msg_gos_functions
+ * \brief Wait for the completion of a communication.
+ *
+ * It takes two parameters.
+ * \param comm the communication to wait.
+ * \param timeout Wait until the communication terminates or the timeout occurs
+ * \return MSG_error_t
+ */
+MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
+{
+  xbt_ex_t e;
+  MSG_error_t res = MSG_OK;
+  TRY {
+    SIMIX_req_comm_wait(comm, timeout);
+
+    if (SIMIX_req_comm_get_src_proc(comm) != SIMIX_process_self()) {
+      m_task_t task;
+      task = (m_task_t) SIMIX_req_comm_get_src_buff(comm);
+      task->simdata->isused=0;
     }
-    if(PID) {
-      *PID = MSG_process_get_PID(t->simdata->sender);
+
+    /* FIXME: these functions are not tracable */
+  }
+  CATCH(e) {
+    switch (e.category) {
+    case host_error:
+      res = MSG_HOST_FAILURE;
+      break;
+    case network_error:
+      res = MSG_TRANSFER_FAILURE;
+      break;
+    case timeout_error:
+      res = MSG_TIMEOUT;
+      break;
+    default:
+      xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg));
     }
-    MSG_RETURN(MSG_OK);
+    xbt_ex_free(e);
   }
+  return res;
 }
+
+/** \ingroup msg_gos_functions
+* \brief This function is called by a sender and permit to wait for each communication
+*
+* It takes three parameters.
+* \param comm a vector of communication
+* \param nb_elem is the size of the comm vector
+* \param timeout for each call of  MSG_comm_wait
+*/
+void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout)
+{
+  int i = 0;
+  for (i = 0; i < nb_elem; i++) {
+    MSG_comm_wait(comm[i], timeout);
+  }
+}
+
+/** \ingroup msg_gos_functions
+* \brief This function wait for the first completed communication
+*
+* It takes on parameter.
+* \param comms a vector of communication
+* \return the position of the completed communication from the xbt_dynar_t.
+*/
+int MSG_comm_waitany(xbt_dynar_t comms)
+{
+  return SIMIX_req_comm_waitany(comms);
+}
+
+/** \ingroup msg_gos_functions
+* \brief This function wait for the first completed communication
+*
+* It takes on parameter.
+* \param comms a vector of communication
+* \return the position of the completed communication, if any, or -1 if none was completed
+*/
+int MSG_comm_testany(xbt_dynar_t comms)
+{
+  return SIMIX_req_comm_testany(comms);
+}
+
+m_task_t MSG_comm_get_task(msg_comm_t comm)
+{
+  xbt_assert0(comm, "Invalid parameters");
+  return (m_task_t) SIMIX_req_comm_get_src_buff(comm);
+}
+
 /** \ingroup msg_gos_functions
  * \brief Put a task on a channel of an host and waits for the end of the
  * transmission.
@@ -272,250 +572,213 @@ MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
  * This function is used for describing the behavior of an agent. It
  * takes three parameter.
  * \param task a #m_task_t to send on another location. This task
  will not be usable anymore when the function will return. There is
  no automatic task duplication and you have to save your parameters
  before calling this function. Tasks are unique and once it has been
  sent to another location, you should not access it anymore. You do
  not need to call MSG_task_destroy() but to avoid using, as an
  effect of inattention, this task anymore, you definitely should
  renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task
  can be transfered iff it has been correctly created with
  MSG_task_create().
+ will not be usable anymore when the function will return. There is
+ no automatic task duplication and you have to save your parameters
+ before calling this function. Tasks are unique and once it has been
+ sent to another location, you should not access it anymore. You do
+ not need to call MSG_task_destroy() but to avoid using, as an
+ effect of inattention, this task anymore, you definitely should
+ renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task
+ can be transfered iff it has been correctly created with
+ MSG_task_create().
  * \param dest the destination of the message
  * \param channel the channel on which the agent should put this
  task. This value has to be >=0 and < than the maximal number of
  channels fixed with MSG_set_channel_number().
+ task. This value has to be >=0 and < than the maximal number of
+ channels fixed with MSG_set_channel_number().
  * \return #MSG_FATAL if \a task is not properly initialized and
- * #MSG_OK otherwise.
+ * #MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which
+ * this function was called was shut down. Returns
+ * #MSG_TRANSFER_FAILURE if the transfer could not be properly done
+ * (network failure, dest failure)
  */
-MSG_error_t MSG_task_put(m_task_t task,
-                        m_host_t dest, m_channel_t channel)
+MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel)
 {
-  m_process_t process = MSG_process_self();
-  simdata_task_t task_simdata = NULL;
-  e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
-  m_host_t local_host = NULL;
-  m_host_t remote_host = NULL;
-
-  CHECK_HOST();
-
-  task_simdata = task->simdata;
-  task_simdata->sender = process;
-  xbt_assert0(task_simdata->using==1,"Gargl!");
-  task_simdata->comm = NULL;
-  
-  local_host = ((simdata_process_t) process->simdata)->host;
-  remote_host = dest;
-
-  DEBUG4("Trying to send a task (%g Mb) from %s to %s on channel %d", 
-        task->simdata->message_size,local_host->name, remote_host->name, channel);
-
-  xbt_fifo_push(((simdata_host_t) remote_host->simdata)->
-               mbox[channel], task);
-
-  PAJE_COMM_START(process,task,channel);
-    
-  if(remote_host->simdata->sleeping[channel]) 
-    __MSG_process_unblock(remote_host->simdata->sleeping[channel]);
-
-  process->simdata->put_host = dest;
-  process->simdata->put_channel = channel;
-  while(!(task_simdata->comm)) 
-    __MSG_process_block(-1);
-  surf_workstation_resource->common_public->action_use(task_simdata->comm);
-  process->simdata->put_host = NULL;
-  process->simdata->put_channel = -1;
-
-
-  PAJE_PROCESS_PUSH_STATE(process,"C");  
-
-  state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm);
-  while (state==SURF_ACTION_RUNNING) {
-    __MSG_task_wait_event(process, task);
-    state=surf_workstation_resource->common_public->action_get_state(task_simdata->comm);
-  }
-    
-  MSG_task_destroy(task);
-
-  PAJE_PROCESS_POP_STATE(process);  
-
-  if(state == SURF_ACTION_DONE) {
-    if(surf_workstation_resource->common_public->action_free(task_simdata->comm)) 
-      task_simdata->comm = NULL;
-    MSG_RETURN(MSG_OK);
-  } else if(surf_workstation_resource->extension_public->get_state(local_host->simdata->host) 
-           == SURF_CPU_OFF) {
-    if(surf_workstation_resource->common_public->action_free(task_simdata->comm)) 
-      task_simdata->comm = NULL;
-    MSG_RETURN(MSG_HOST_FAILURE);
-  } else { 
-    if(surf_workstation_resource->common_public->action_free(task_simdata->comm)) 
-      task_simdata->comm = NULL;
-    MSG_RETURN(MSG_TRANSFER_FAILURE);
-  }
+  return MSG_task_put_with_timeout(task, dest, channel, -1.0);
 }
 
 /** \ingroup msg_gos_functions
- * \brief Does exactly the same as MSG_task_put but with a bounded transmition 
+ * \brief Does exactly the same as MSG_task_put but with a bounded transmition
  * rate.
  *
  * \sa MSG_task_put
  */
-MSG_error_t MSG_task_put_bounded(m_task_t task,
-                                m_host_t dest, m_channel_t channel,
-                                double max_rate)
+MSG_error_t
+MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel,
+                     double maxrate)
 {
-  task->simdata->rate=max_rate;
-  return(MSG_task_put(task, dest, channel));
-  task->simdata->rate=-1.0;
+  task->simdata->rate = maxrate;
+  return MSG_task_put(task, dest, channel);
 }
 
-/** \ingroup msg_gos_functions
- * \brief Executes a task and waits for its termination.
+/** \ingroup msg_gos_functions \brief Put a task on a channel of an
+ * host (with a timeout on the waiting of the destination host) and
+ * waits for the end of the transmission.
  *
  * This function is used for describing the behavior of an agent. It
- * takes only one parameter.
- * \param task a #m_task_t to execute on the location on which the
-   agent is running.
+ * takes four parameter.
+ * \param task a #m_task_t to send on another location. This task
+ will not be usable anymore when the function will return. There is
+ no automatic task duplication and you have to save your parameters
+ before calling this function. Tasks are unique and once it has been
+ sent to another location, you should not access it anymore. You do
+ not need to call MSG_task_destroy() but to avoid using, as an
+ effect of inattention, this task anymore, you definitely should
+ renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task
+ can be transfered iff it has been correctly created with
+ MSG_task_create().
+ * \param dest the destination of the message
+ * \param channel the channel on which the agent should put this
+ task. This value has to be >=0 and < than the maximal number of
+ channels fixed with MSG_set_channel_number().
+ * \param timeout the maximum time to wait for a task before giving
+ up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task
+ will not be modified
  * \return #MSG_FATAL if \a task is not properly initialized and
- * #MSG_OK otherwise.
+#MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which
+this function was called was shut down. Returns
+#MSG_TRANSFER_FAILURE if the transfer could not be properly done
+(network failure, dest failure, timeout...)
  */
-MSG_error_t MSG_task_execute(m_task_t task)
+MSG_error_t
+MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
+                          m_channel_t channel, double timeout)
 {
-  m_process_t process = MSG_process_self();
-  MSG_error_t res;
+  xbt_assert1((channel >= 0)
+              && (channel < msg_global->max_channel), "Invalid channel %d",
+              channel);
+
+  DEBUG1("MSG_task_put_with_timout: Trying to send a task to '%s'", dest->name);
+  return
+      MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_channel
+                                   (dest, channel), task, timeout);
+}
 
-  DEBUG1("Computing on %s", process->simdata->host->name);
+MSG_error_t MSG_task_send(m_task_t task, const char *alias)
+{
+  DEBUG1("MSG_task_send: Trying to send a message on mailbox '%s'", alias);
+  return MSG_task_send_with_timeout(task, alias, -1);
+}
 
-  __MSG_task_execute(process, task);
 
-  PAJE_PROCESS_PUSH_STATE(process,"E");  
-  res = __MSG_wait_for_computation(process,task);
-  PAJE_PROCESS_POP_STATE(process);
-  return res;
+MSG_error_t
+MSG_task_send_bounded(m_task_t task, const char *alias, double maxrate)
+{
+  task->simdata->rate = maxrate;
+  return MSG_task_send(task, alias);
 }
 
-void __MSG_task_execute(m_process_t process, m_task_t task)
+
+MSG_error_t
+MSG_task_send_with_timeout(m_task_t task, const char *alias,
+                           double timeout)
 {
-  simdata_task_t simdata = NULL;
+  return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias),
+                                      task, timeout);
+}
 
+int MSG_task_listen(const char *alias)
+{
   CHECK_HOST();
 
-  simdata = task->simdata;
-
-  simdata->compute = surf_workstation_resource->extension_public->
-    execute(MSG_process_get_host(process)->simdata->host,
-           simdata->computation_amount);
-  surf_workstation_resource->common_public->action_set_data(simdata->compute,task);
+  return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias));
 }
 
-MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task)
+/** \ingroup msg_gos_functions
+ * \brief Test whether there is a pending communication on a channel.
+ *
+ * It takes one parameter.
+ * \param channel the channel on which the agent should be
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
+ * \return 1 if there is a pending communication and 0 otherwise
+ */
+int MSG_task_Iprobe(m_channel_t channel)
 {
-  e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
-  simdata_task_t simdata = task->simdata;
+  xbt_assert1((channel >= 0)
+              && (channel < msg_global->max_channel), "Invalid channel %d",
+              channel);
 
-  simdata->using++;
-  do {
-    __MSG_task_wait_event(process, task);
-    state=surf_workstation_resource->common_public->action_get_state(simdata->compute);
-  } while (state==SURF_ACTION_RUNNING);
-  simdata->using--;
-    
+  CHECK_HOST();
 
-  if(state == SURF_ACTION_DONE) {
-    if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
-      simdata->compute = NULL;
-    MSG_RETURN(MSG_OK);
-  } else if(surf_workstation_resource->extension_public->
-           get_state(MSG_process_get_host(process)->simdata->host) 
-           == SURF_CPU_OFF) {
-    if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
-      simdata->compute = NULL;
-    MSG_RETURN(MSG_HOST_FAILURE);
-  } else {
-    if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
-      simdata->compute = NULL;
-    MSG_RETURN(MSG_TRANSFER_FAILURE);
-  }
+  return
+      !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel
+                            (MSG_host_self(), channel));
 }
 
 /** \ingroup msg_gos_functions
- * \brief Sleep for the specified number of seconds
- *
* Makes the current process sleep until \a time seconds have elapsed.
+
+ * \brief Return the number of tasks waiting to be received on a \a
channel and sent by \a host.
  *
- * \param nb_sec a number of second
+ * It takes two parameters.
+ * \param channel the channel on which the agent should be
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
+ * \param host the host that is to be watched.
+ * \return the number of tasks waiting to be received on \a channel
+ and sent by \a host.
  */
-MSG_error_t MSG_process_sleep(double nb_sec)
+int MSG_task_probe_from_host(int channel, m_host_t host)
 {
-  e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM;
-  m_process_t process = MSG_process_self();
-  m_task_t dummy = NULL;
-  simdata_task_t simdata = NULL;
+  xbt_assert1((channel >= 0)
+              && (channel < msg_global->max_channel), "Invalid channel %d",
+              channel);
 
   CHECK_HOST();
-  dummy = MSG_task_create("MSG_sleep", nb_sec, 0.0, NULL);
-  simdata = dummy->simdata;
 
-  simdata->compute = surf_workstation_resource->extension_public->
-    sleep(MSG_process_get_host(process)->simdata->host,
-           simdata->computation_amount);
-  surf_workstation_resource->common_public->action_set_data(simdata->compute,dummy);
+  return
+      MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel
+                                               (MSG_host_self(), channel),
+                                               host);
 
-  
-  simdata->using++;
-  do {
-    __MSG_task_wait_event(process, dummy);
-    state=surf_workstation_resource->common_public->action_get_state(simdata->compute);
-  } while (state==SURF_ACTION_RUNNING);
-  simdata->using--;
-    
-  if(state == SURF_ACTION_DONE) {
-    if(surf_workstation_resource->extension_public->
-       get_state(MSG_process_get_host(process)->simdata->host) 
-       == SURF_CPU_OFF) {
-      if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
-       simdata->compute = NULL;
-      MSG_RETURN(MSG_HOST_FAILURE);
-    }
-    if(__MSG_process_isBlocked(process)) {
-      __MSG_process_unblock(MSG_process_self());
-    }
-    if(surf_workstation_resource->extension_public->
-       get_state(MSG_process_get_host(process)->simdata->host) 
-       == SURF_CPU_OFF) {
-      if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
-       simdata->compute = NULL;
-      MSG_RETURN(MSG_HOST_FAILURE);
-    }
-    if(surf_workstation_resource->common_public->action_free(simdata->compute)) 
-      simdata->compute = NULL;
-    MSG_task_destroy(dummy);
-    MSG_RETURN(MSG_OK);
-  } else MSG_RETURN(MSG_HOST_FAILURE);
 }
 
-/** \ingroup msg_gos_functions
- * \brief Return the number of MSG tasks currently running on a
- * the host of the current running process.
- */
-static int MSG_get_msgload(void) 
+int MSG_task_listen_from_host(const char *alias, m_host_t host)
 {
-  m_process_t process;
-   
   CHECK_HOST();
-  
-  xbt_assert0(0, "This function is still to be specified correctly (what do you mean by 'load', exactly?). In the meantime, please don't use it");
-  process = MSG_process_self();
-  return xbt_fifo_size(process->simdata->host->simdata->process_list);
+
+  return
+      MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias
+                                               (alias), host);
 }
 
 /** \ingroup msg_gos_functions
+ * \brief Test whether there is a pending communication on a channel, and who sent it.
  *
- * \brief Return the the last value returned by a MSG function (except
- * MSG_get_errno...).
+ * It takes one parameter.
+ * \param channel the channel on which the agent should be
+ listening. This value has to be >=0 and < than the maximal
+ number of channels fixed with MSG_set_channel_number().
+ * \return -1 if there is no pending communication and the PID of the process who sent it otherwise
  */
-MSG_error_t MSG_get_errno(void)
+int MSG_task_probe_from(m_channel_t channel)
 {
-  return PROCESS_GET_ERRNO();
+  m_task_t task;
+
+  CHECK_HOST();
+
+  xbt_assert1((channel >= 0)
+              && (channel < msg_global->max_channel), "Invalid channel %d",
+              channel);
+
+  if (NULL ==
+      (task =
+       MSG_mailbox_get_head(MSG_mailbox_get_by_channel
+                            (MSG_host_self(), channel))))
+    return -1;
+
+  return MSG_process_get_PID(task->simdata->sender);
+}
+
+int MSG_task_listen_from(const char *alias)
+{
+  m_task_t task;
+
+  CHECK_HOST();
+
+  if (NULL ==
+      (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias))))
+    return -1;
+
+  return MSG_process_get_PID(task->simdata->sender);
 }