X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/feb66679bd690f3df26956a35de11fba2ffcf61b..00e8231fa94528961cddaa1fe35e232de5438e76:/src/simix/smx_network.c

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 5f40e44e78..bc09a3e34b 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -1,263 +1,830 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2009 Cristian Rosa.
-   All rights reserved.                                          */
+/* Copyright (c) 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/log.h"
+#include "mc/mc.h"
+#include "xbt/dict.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
+                                "Logging specific to SIMIX (network)");
+
+static xbt_dict_t rdv_points = NULL;
+
+static XBT_INLINE void SIMIX_comm_start(smx_action_t action);
+static void SIMIX_comm_finish(smx_action_t action);
+static void SIMIX_waitany_req_remove_from_actions(smx_req_t req);
+static void SIMIX_comm_copy_data(smx_action_t comm);
+static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type);
+static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm);
+static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
+static smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
+										  int (*match_fun)(void *, void *), void *);
+static void SIMIX_rdv_free(void *data);
+
+void SIMIX_network_init(void)
+{
+  rdv_points = xbt_dict_new();
+}
+
+void SIMIX_network_exit(void)
+{
+  xbt_dict_free(&rdv_points);
+}
 
 /******************************************************************************/
 /*                           Rendez-Vous Points                               */
-/******************************************************************************/ 
+/******************************************************************************/
 
-/**
- *  \brief Creates a new rendez-vous point
- *  \param name The name of the rendez-vous point
- *  \return The created rendez-vous point
- */
-smx_rdv_t SIMIX_rdv_create(char *name)
+smx_rdv_t SIMIX_rdv_create(const char *name)
 {
-  smx_rdv_t rvp = xbt_new0(s_smx_rvpoint_t, 1);
-  rvp->name = xbt_strdup(name);
-  rvp->read = SIMIX_mutex_init();
-  rvp->write = SIMIX_mutex_init();
-  rvp->comm_mutex = SIMIX_mutex_init();
-  rvp->comm_fifo = xbt_fifo_new();
+  /* two processes may have pushed the same rdv_create request at the same time */
+  smx_rdv_t rdv = name ? xbt_dict_get_or_null(rdv_points, name) : NULL;
 
-  return rvp;
+  if (!rdv) {
+    rdv = xbt_new0(s_smx_rvpoint_t, 1);
+    rdv->name = name ? xbt_strdup(name) : NULL;
+    rdv->comm_fifo = xbt_fifo_new();
+
+    if (rdv->name)
+      xbt_dict_set(rdv_points, rdv->name, rdv, SIMIX_rdv_free);
+  }
+  return rdv;
 }
 
-/**
- *  \brief Destroy a rendez-vous point
- *  \param name The rendez-vous point to destroy
- */
-void SIMIX_rdv_destroy(smx_rdv_t rvp)
+void SIMIX_rdv_destroy(smx_rdv_t rdv)
+{
+  if (rdv->name)
+    xbt_dict_remove(rdv_points, rdv->name);
+}
+
+void SIMIX_rdv_free(void *data)
+{
+  smx_rdv_t rdv = (smx_rdv_t) data;
+  if (rdv->name)
+    xbt_free(rdv->name);
+  xbt_fifo_free(rdv->comm_fifo);
+  xbt_free(rdv);  
+}
+
+smx_rdv_t SIMIX_rdv_get_by_name(const char *name)
 {
-  xbt_free(rvp->name);
-  SIMIX_mutex_destroy(rvp->read);
-  SIMIX_mutex_destroy(rvp->write);
-  SIMIX_mutex_destroy(rvp->comm_mutex);
-  xbt_fifo_free(rvp->comm_fifo);
-  xbt_free(rvp);
+  return xbt_dict_get_or_null(rdv_points, name);
+}
+
+int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host)
+{
+  smx_action_t comm = NULL;
+  xbt_fifo_item_t item = NULL;
+  int count = 0;
+
+  xbt_fifo_foreach(rdv->comm_fifo, item, comm, smx_action_t) {
+    if (comm->comm.src_proc->smx_host == host)
+      count++;
+  }
+
+  return count;
+}
+
+smx_action_t SIMIX_rdv_get_head(smx_rdv_t rdv)
+{
+  return xbt_fifo_get_item_content(xbt_fifo_get_first_item(rdv->comm_fifo));
 }
 
 /**
  *  \brief Push a communication request into a rendez-vous point
- *  The communications request are dequeued by the two functions below
- *  \param rvp The rendez-vous point
+ *  \param rdv The rendez-vous point
  *  \param comm The communication request
  */
-static inline void SIMIX_rdv_push(smx_rdv_t rvp, smx_comm_t comm)
+static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm)
 {
-  xbt_fifo_push(rvp->comm_fifo, comm);
+  xbt_fifo_push(rdv->comm_fifo, comm);
+  comm->comm.rdv = rdv;
 }
 
 /**
- *  \brief Checks if there is a communication request queued in a rendez-vous matching our needs
- *  \param rvp The rendez-vous with the queue
- *  \param look_for_src boolean. True: we are receiver looking for sender; False: other way round
- *  \return The communication request if found, a newly created one otherwise.
+ *  \brief Remove a communication request from a rendez-vous point
+ *  \param rdv The rendez-vous point
+ *  \param comm The communication request
  */
-smx_comm_t SIMIX_rdv_get_request_or_create(smx_rdv_t rvp, int look_for_src) {
-  /* Get a communication request from the rendez-vous queue. If it is a receive
-     request then return it, otherwise put it again in the queue and return NULL
-   */
-  smx_comm_t comm_head = xbt_fifo_shift(rvp->comm_fifo);
-
-  if(comm_head != NULL) {
-    if (( look_for_src && comm_head->src_host != NULL) ||
-        (!look_for_src && comm_head->dst_host != NULL)) {
+static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm)
+{
+  xbt_fifo_remove(rdv->comm_fifo, comm);
+  comm->comm.rdv = NULL;
+}
 
-      SIMIX_communication_use(comm_head);
-      return comm_head;
+/**
+ *  \brief Checks if there is a communication action queued in a rendez-vous matching our needs
+ *  \param type The type of communication we are looking for (comm_send, comm_recv)
+ *  \return The communication action if found, NULL otherwise
+ */
+smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
+                                   int (*match_fun)(void *, void *), void *data)
+{
+  smx_action_t action;
+  xbt_fifo_item_t item;
+  void* req_data = NULL;
+
+  xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+    if (action->comm.type == SIMIX_COMM_SEND) {
+      req_data = action->comm.src_data;
+    } else if (action->comm.type == SIMIX_COMM_RECEIVE) {
+      req_data = action->comm.dst_data;
     }
+    if (action->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+      DEBUG1("Found a matching communication action %p", action);
+      xbt_fifo_remove_item(rdv->comm_fifo, item);
+      xbt_fifo_free_item(item);
+      action->comm.refcount++;
+      action->comm.rdv = NULL;
+      return action;
+    }
+    DEBUG3("Sorry, communication action %p does not match our needs:"
+           " its type is %d but we are looking for a comm of type %d",
+           action, action->comm.type, type);
   }
-  xbt_fifo_unshift(rvp->comm_fifo, comm_head);
-
-  /* no relevant peer found. Create a new comm action and set it up */
-  comm_head = SIMIX_communication_new(rvp);
-  SIMIX_rdv_push(rvp, comm_head);
-  SIMIX_communication_use(comm_head);
-
-  return comm_head;
+  DEBUG0("No matching communication action found");
+  return NULL;
 }
 
 /******************************************************************************/
-/*                           Communication Requests                           */
-/******************************************************************************/ 
+/*                            Comunication Actions                            */
+/******************************************************************************/
 
 /**
- *  \brief Creates a new communication request
- *  \param sender The process starting the communication (by send)
- *  \param receiver The process receiving the communication (by recv)
- *  \return the communication request
- */  
-smx_comm_t SIMIX_communication_new(smx_rdv_t rdv)
+ *  \brief Creates a new comunicate action
+ *  \param type The type of request (comm_send, comm_recv)
+ *  \return The new comunicate action
+ */
+smx_action_t SIMIX_comm_new(e_smx_comm_type_t type)
 {
+  smx_action_t act;
+
   /* alloc structures */
-  smx_comm_t comm = xbt_new0(s_smx_comm_t, 1);
-  comm->cond = SIMIX_cond_init();
+  act = xbt_new0(s_smx_action_t, 1);
+  act->type = SIMIX_ACTION_COMMUNICATE;
+  act->state = SIMIX_WAITING;
+  act->request_list = xbt_fifo_new();
 
-  comm->rdv = rdv;
+  /* set communication */
+  act->comm.type = type;
+  act->comm.refcount = 1;
 
-  return comm;
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  //initialize with unknown value
+  act->latency_limited = -1;
+#endif
+
+#ifdef HAVE_TRACING
+  act->category = NULL;
+#endif
+
+  DEBUG1("Create communicate action %p", act);
+
+  return act;
 }
 
 /**
- *  \brief Destroy a communication request
- *  \param comm The request to be destroyed
+ *  \brief Destroy a communicate action
+ *  \param action The communicate action to be destroyed
  */
-void SIMIX_communication_destroy(smx_comm_t comm)
+void SIMIX_comm_destroy(smx_action_t action)
+{
+  DEBUG2("Destroy action %p (refcount:%d)", action, action->comm.refcount);
+
+  if (action->comm.refcount <= 0)
+    xbt_die(bprintf("the refcount of comm %p is already 0 before decreasing it. That's a bug!",action));
+
+  action->comm.refcount--;
+  if (action->comm.refcount > 0)
+    return;
+  DEBUG2("Really free communication %p; refcount is now %d", action,
+        action->comm.refcount);
+
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ;
+#endif
+
+#ifdef HAVE_TRACING
+  TRACE_smx_action_destroy(action);
+#endif
+
+  if (action->name)
+    xbt_free(action->name);
+
+  xbt_fifo_free(action->request_list);
+
+  SIMIX_comm_destroy_internal_actions(action);
+
+  if(action->comm.detached)
+    ((void_f_pvoid_t)action->comm.src_data)(action->comm.src_buff);
+
+  xbt_free(action);
+}
+
+void SIMIX_comm_destroy_internal_actions(smx_action_t action)
+{
+  if (action->comm.surf_comm){
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    action->latency_limited = SIMIX_comm_is_latency_bounded(action);
+#endif
+    action->comm.surf_comm->model_type->action_unref(action->comm.surf_comm);
+    action->comm.surf_comm = NULL;
+  }
+
+  if (action->comm.src_timeout){
+    action->comm.src_timeout->model_type->action_unref(action->comm.src_timeout);
+    action->comm.src_timeout = NULL;
+  }
+
+  if (action->comm.dst_timeout){
+    action->comm.dst_timeout->model_type->action_unref(action->comm.dst_timeout);
+    action->comm.dst_timeout = NULL;
+  }
+}
+
+smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
+                              double task_size, double rate,
+                              void *src_buff, size_t src_buff_size,
+                              int (*match_fun)(void *, void *), void *data,
+                              int detached)
 {
-  comm->refcount--;
-  if(comm->refcount == 0){
-    if(comm->act != NULL)
-      SIMIX_action_destroy(comm->act);
+  smx_action_t action;
+
+  /* Look for communication request matching our needs.
+     If it is not found then create it and push it into the rendez-vous point */
+  action = SIMIX_rdv_get_request(rdv, SIMIX_COMM_RECEIVE, match_fun, data);
+
+  if (!action) {
+    action = SIMIX_comm_new(SIMIX_COMM_SEND);
+    SIMIX_rdv_push(rdv, action);
+  } else {
+    action->state = SIMIX_READY;
+    action->comm.type = SIMIX_COMM_READY;
+  }
 
-    if(comm->data != NULL)
-      xbt_free(comm->data);
+  /* If the communication action is detached then decrease the refcount
+   * by one, so it will be eliminated by the receivers destroy call */
+  if(detached){
+    action->comm.detached = 1;
+    action->comm.refcount--;
+  }
 
-    xbt_free(comm->cond);
-    xbt_free(comm);
+  /* Setup the communication request */
+  action->comm.src_proc = src_proc;
+  action->comm.task_size = task_size;
+  action->comm.rate = rate;
+  action->comm.src_buff = src_buff;
+  action->comm.src_buff_size = src_buff_size;
+  action->comm.src_data = data;
+
+  if (MC_IS_ENABLED) {
+    action->state = SIMIX_RUNNING;
+    return action;
   }
+
+  SIMIX_comm_start(action);
+  return action;
 }
 
-/**
- *  \brief Increase the number of users of the communication.
- *  \param comm The communication request
- *  Each communication request can be used by more than one process, so it is
- *  necessary to know number of them at destroy time, to avoid freeing stuff that
- *  maybe is in use by others.
- *  \
- */
-static inline void SIMIX_communication_use(smx_comm_t comm)
+smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv,
+                      void *dst_buff, size_t *dst_buff_size,
+                      int (*match_fun)(void *, void *), void *data)
+{
+  smx_action_t action;
+
+  /* Look for communication request matching our needs.
+   * If it is not found then create it and push it into the rendez-vous point
+   */
+  action = SIMIX_rdv_get_request(rdv, SIMIX_COMM_SEND, match_fun, data);
+
+  if (!action) {
+    action = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
+    SIMIX_rdv_push(rdv, action);
+  } else {
+    action->state = SIMIX_READY;
+    action->comm.type = SIMIX_COMM_READY;
+  }
+
+  /* Setup communication request */
+  action->comm.dst_proc = dst_proc;
+  action->comm.dst_buff = dst_buff;
+  action->comm.dst_buff_size = dst_buff_size;
+  action->comm.dst_data = data;
+
+  if (MC_IS_ENABLED) {
+    action->state = SIMIX_RUNNING;
+    return action;
+  }
+
+  SIMIX_comm_start(action);
+  return action;
+}
+
+void SIMIX_pre_comm_wait(smx_req_t req, int idx)
+{
+  smx_action_t action = req->comm_wait.comm;
+  double timeout = req->comm_wait.timeout;
+  surf_action_t sleep;
+
+  /* Associate this request to the action */
+  xbt_fifo_push(action->request_list, req);
+  req->issuer->waiting_action = action;
+
+  if (MC_IS_ENABLED){
+    if(idx == 0){
+      action->state = SIMIX_DONE;
+    }else{
+      /* If we reached this point, the wait request must have a timeout */
+      /* Otherwise it shouldn't be enabled and executed by the MC */
+      if(timeout == -1)
+        THROW_IMPOSSIBLE;
+
+      if(action->comm.src_proc == req->issuer)
+        action->state = SIMIX_SRC_TIMEOUT;
+      else
+        action->state = SIMIX_DST_TIMEOUT;
+    }
+
+    SIMIX_comm_finish(action);
+    return;
+  }
+
+  /* If the action has already finish perform the error handling, */
+  /* otherwise set up a waiting timeout on the right side         */
+  if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
+    SIMIX_comm_finish(action);
+  } else { /* if (timeout >= 0) { we need a surf sleep action even when there is no timeout, otherwise surf won't tell us when the host fails */
+    sleep = surf_workstation_model->extension.workstation.sleep(req->issuer->smx_host->host, timeout);
+    surf_workstation_model->action_data_set(sleep, action);
+
+    if (req->issuer == action->comm.src_proc)
+      action->comm.src_timeout = sleep;
+    else
+      action->comm.dst_timeout = sleep;
+  }
+}
+
+void SIMIX_pre_comm_test(smx_req_t req)
+{
+  smx_action_t action = req->comm_test.comm;
+
+  if(MC_IS_ENABLED){
+    req->comm_test.result = action->comm.src_proc && action->comm.dst_proc;
+    if(req->comm_test.result){
+      action->state = SIMIX_DONE;
+      xbt_fifo_push(action->request_list, req);
+      SIMIX_comm_finish(action);
+    }else{
+      SIMIX_request_answer(req);
+    }
+    return;
+  }
+
+  req->comm_test.result = (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING);
+  if (req->comm_test.result) {
+    xbt_fifo_push(action->request_list, req);
+    SIMIX_comm_finish(action);
+  } else {
+    SIMIX_request_answer(req);
+  }
+}
+
+void SIMIX_pre_comm_testany(smx_req_t req, int idx)
+{
+  unsigned int cursor;
+  smx_action_t action;
+  xbt_dynar_t actions = req->comm_testany.comms;
+  req->comm_testany.result = -1;
+
+  if (MC_IS_ENABLED){
+    if(idx == -1){
+      SIMIX_request_answer(req);
+    }else{
+      action = xbt_dynar_get_as(actions, idx, smx_action_t);
+      req->comm_testany.result = idx;
+      xbt_fifo_push(action->request_list, req);
+      action->state = SIMIX_DONE;
+      SIMIX_comm_finish(action);
+    }
+    return;
+  }
+
+  xbt_dynar_foreach(req->comm_testany.comms,cursor,action) {
+    if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
+      req->comm_testany.result = cursor;
+      xbt_fifo_push(action->request_list, req);
+      SIMIX_comm_finish(action);
+      return;
+    }
+  }
+  SIMIX_request_answer(req);
+}
+
+void SIMIX_pre_comm_waitany(smx_req_t req, int idx)
 {
-  comm->refcount++;
+  smx_action_t action;
+  unsigned int cursor = 0;
+  xbt_dynar_t actions = req->comm_waitany.comms;
+
+  if (MC_IS_ENABLED){
+    action = xbt_dynar_get_as(actions, idx, smx_action_t);
+    xbt_fifo_push(action->request_list, req);
+    req->comm_waitany.result = idx;
+    action->state = SIMIX_DONE;
+    SIMIX_comm_finish(action);
+    return;
+  }
+
+  xbt_dynar_foreach(actions, cursor, action){
+    /* Associate this request to the action */
+    xbt_fifo_push(action->request_list, req);
+    if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING){
+      SIMIX_comm_finish(action);
+      break;
+    }
+  }
+}
+
+void SIMIX_waitany_req_remove_from_actions(smx_req_t req)
+{
+  smx_action_t action;
+  unsigned int cursor = 0;
+  xbt_dynar_t actions = req->comm_waitany.comms;
+
+  xbt_dynar_foreach(actions, cursor, action){
+    xbt_fifo_remove(action->request_list, req);
+  }
 }
 
 /**
  *  \brief Start the simulation of a communication request
- *  \param comm The communicatino request
+ *  \param action The communication action
  */
-static inline void SIMIX_communication_start(smx_comm_t comm)
+static XBT_INLINE void SIMIX_comm_start(smx_action_t action)
 {
-  comm->act = SIMIX_action_communicate(comm->src_host, comm->dst_host, NULL, 
-      comm->data_size, comm->rate);
+  /* If both the sender and the receiver are already there, start the communication */
+  if (action->state == SIMIX_READY) {
+    smx_host_t sender = action->comm.src_proc->smx_host;
+    smx_host_t receiver = action->comm.dst_proc->smx_host;
+
+    DEBUG3("Starting communication %p from '%s' to '%s'", action,
+           SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
+
+    action->comm.surf_comm = surf_workstation_model->extension.workstation.
+        communicate(sender->host, receiver->host, action->comm.task_size, action->comm.rate);
+
+    surf_workstation_model->action_data_set(action->comm.surf_comm, action);
 
-  SIMIX_register_action_to_condition(comm->act, comm->cond);
+    action->state = SIMIX_RUNNING;
+
+#ifdef HAVE_TRACING
+    TRACE_smx_action_communicate(action, action->comm.src_proc);
+#endif
+
+    /* If a link is failed, detect it immediately */
+    if (surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED) {
+      DEBUG2("Communication from '%s' to '%s' failed to start because of a link failure",
+	  SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver));
+      action->state = SIMIX_LINK_FAILURE;
+      SIMIX_comm_destroy_internal_actions(action);
+    }
+
+    /* If any of the process is suspend, create the action but stop its execution,
+       it will be restarted when the sender process resume */
+    if (SIMIX_process_is_suspended(action->comm.src_proc) ||
+        SIMIX_process_is_suspended(action->comm.dst_proc)) {
+      /* FIXME: check what should happen with the action state */
+      surf_workstation_model->suspend(action->comm.surf_comm);
+    }
+  }
 }
 
-static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm)
+void SIMIX_comm_finish(smx_action_t action)
 {
-  __SIMIX_cond_wait(comm->cond);
-  if (comm->act) {
-    SIMIX_unregister_action_to_condition(comm->act, comm->cond);
-    SIMIX_action_destroy(comm->act);
-    comm->act=NULL;
+  smx_req_t req;
+
+  while ((req = xbt_fifo_shift(action->request_list))) {
+
+    /* If a waitany request is waiting for this action to finish, then remove
+       it from the other actions in the waitany list. Afterwards, get the
+       position of the actual action in the waitany request's actions dynar and
+       return it as the result of the call */
+    if (req->call == REQ_COMM_WAITANY) {
+      SIMIX_waitany_req_remove_from_actions(req);
+      if(!MC_IS_ENABLED)
+        req->comm_waitany.result = xbt_dynar_search(req->comm_waitany.comms, &action);
+    }
+
+    /* If the action is still in a rendez-vous point then remove from it */
+    if (action->comm.rdv)
+      SIMIX_rdv_remove(action->comm.rdv, action);
+
+    DEBUG1("SIMIX_comm_finish: action state = %d", action->state);
+
+    /* Check out for errors */
+    switch (action->state) {
+
+      case SIMIX_DONE:
+        DEBUG1("Communication %p complete!", action);
+        SIMIX_comm_copy_data(action);
+        break;
+
+      case SIMIX_SRC_TIMEOUT:
+        TRY {
+          THROW0(timeout_error, 0, "Communication timeouted because of sender");
+        }
+	CATCH(req->issuer->running_ctx->exception) {
+          req->issuer->doexception = 1;
+        }
+        break;
+
+      case SIMIX_DST_TIMEOUT:
+        TRY {
+          THROW0(timeout_error, 0, "Communication timeouted because of receiver");
+        }
+	CATCH(req->issuer->running_ctx->exception) {
+          req->issuer->doexception = 1;
+        }
+        break;
+
+      case SIMIX_SRC_HOST_FAILURE:
+        TRY {
+          if (req->issuer == action->comm.src_proc)
+            THROW0(host_error, 0, "Host failed");
+          else
+            THROW0(network_error, 0, "Remote peer failed");
+        }
+	CATCH(req->issuer->running_ctx->exception) {
+          req->issuer->doexception = 1;
+        }
+        break;
+
+      case SIMIX_DST_HOST_FAILURE:
+        TRY {
+          if (req->issuer == action->comm.dst_proc)
+            THROW0(host_error, 0, "Host failed");
+          else
+            THROW0(network_error, 0, "Remote peer failed");
+        }
+	CATCH(req->issuer->running_ctx->exception) {
+          req->issuer->doexception = 1;
+        }
+        break;
+
+      case SIMIX_LINK_FAILURE:
+        TRY {
+	  DEBUG5("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p)",
+	      action, action->comm.src_proc->smx_host->name, action->comm.dst_proc->smx_host->name,
+	      req->issuer->name, req->issuer);
+          THROW0(network_error, 0, "Link failure");
+        }
+	CATCH(req->issuer->running_ctx->exception) {
+          req->issuer->doexception = 1;
+        }
+        break;
+
+      default:
+        THROW_IMPOSSIBLE;
+    }
+
+    /* if there is an exception during a waitany or a testany, indicate the position of the failed communication */
+    if (req->issuer->doexception) {
+      if (req->call == REQ_COMM_WAITANY) {
+        req->issuer->running_ctx->exception.value = xbt_dynar_search(req->comm_waitany.comms, &action);
+      }
+      else if (req->call == REQ_COMM_TESTANY) {
+        req->issuer->running_ctx->exception.value = xbt_dynar_search(req->comm_testany.comms, &action);
+      }
+    }
+
+    req->issuer->waiting_action = NULL;
+    SIMIX_request_answer(req);
   }
-  /* Check for errors */
-  if (SIMIX_host_get_state(comm->dst_host) == 0){
-    THROW1(host_error, 0, "Destination host %s failed", comm->dst_host->name);
-  } else if (SIMIX_host_get_state(comm->src_host) == 0){
-    THROW1(host_error, 0, "Source host %s failed", comm->src_host->name);
-  } else if (SIMIX_action_get_state(comm->act) == SURF_ACTION_FAILED) {
-    THROW0(network_error, 0, "Link failure");
+}
+
+void SIMIX_post_comm(smx_action_t action)
+{
+  /* Update action state */
+  if (action->comm.src_timeout &&
+     surf_workstation_model->action_state_get(action->comm.src_timeout) == SURF_ACTION_DONE)
+     action->state = SIMIX_SRC_TIMEOUT;
+  else if (action->comm.dst_timeout &&
+          surf_workstation_model->action_state_get(action->comm.dst_timeout) == SURF_ACTION_DONE)
+     action->state = SIMIX_DST_TIMEOUT;
+  else if (action->comm.src_timeout &&
+          surf_workstation_model->action_state_get(action->comm.src_timeout) == SURF_ACTION_FAILED)
+     action->state = SIMIX_SRC_HOST_FAILURE;
+  else if (action->comm.dst_timeout &&
+          surf_workstation_model->action_state_get(action->comm.dst_timeout) == SURF_ACTION_FAILED)
+     action->state = SIMIX_DST_HOST_FAILURE;
+  else if (action->comm.surf_comm &&
+          surf_workstation_model->action_state_get(action->comm.surf_comm) == SURF_ACTION_FAILED)
+     action->state = SIMIX_LINK_FAILURE;
+  else
+    action->state = SIMIX_DONE;
+
+  DEBUG1("SIMIX_post_comm: action state = %d", action->state);
+
+  /* After this point the surf actions associated with the simix communicate
+     action are no longer needed, thus we delete them. */
+  SIMIX_comm_destroy_internal_actions(action);
+
+  /* If there are requests associated with the action, then answer them */
+  if (xbt_fifo_size(action->request_list))
+    SIMIX_comm_finish(action);
+}
+
+void SIMIX_comm_cancel(smx_action_t action)
+{
+  /* If the action is a waiting state means that it is still in a rdv */
+  /* so remove from it and delete it */
+  if (action->state == SIMIX_WAITING) {
+    SIMIX_rdv_remove(action->comm.rdv, action);
+    action->state = SIMIX_FAILED;
+  } else {
+    /* When running the MC there are no surf actions */
+    if(!MC_IS_ENABLED)
+      surf_workstation_model->action_cancel(action->comm.surf_comm);
   }
+}
 
+void SIMIX_comm_suspend(smx_action_t action)
+{
+  /*FIXME: shall we suspend also the timeout actions? */
+  surf_workstation_model->suspend(action->comm.surf_comm);
 }
-/******************************************************************************/
-/*                        Synchronous Communication                           */
-/******************************************************************************/
-/* Throws:
- *  - host_error if peer failed
- *  - network_error if network failed */
 
-void SIMIX_network_send(smx_rdv_t rdv, void *data, size_t size, double timeout, double rate)
+void SIMIX_comm_resume(smx_action_t action)
+{
+  /*FIXME: check what happen with the timeouts */
+  surf_workstation_model->resume(action->comm.surf_comm);
+}
+
+
+/************* Action Getters **************/
+
+/**
+ *  \brief get the amount remaining from the communication
+ *  \param action The communication
+ */
+double SIMIX_comm_get_remains(smx_action_t action)
 {
-  /*double start_time = SIMIX_get_clock();*/
-  void *smx_net_data;
-  smx_comm_t comm;
+  double remains;
 
-  /* Copy the message to the network */
-  /*FIXME here the MC should allocate the space from the network storage area */
-  smx_net_data = xbt_malloc(size);
-  memcpy(smx_net_data, data, size);
+  switch (action->state) {
 
-  comm = SIMIX_rdv_get_request_or_create(rdv,0);
-  comm->src_host = SIMIX_host_self();
-  comm->data = smx_net_data;
-  comm->data_size = size;
-  comm->rate = rate;
+    case SIMIX_RUNNING:
+      remains = surf_workstation_model->get_remains(action->comm.surf_comm);
+      break;
 
-  /* If the receiver is already there, start the communication */
-  /* If it's not here already, it will start that communication itself later on */
-  if(comm->dst_host != NULL)
-    SIMIX_communication_start(comm);
+    case SIMIX_WAITING:
+    case SIMIX_READY:
+      remains = 0; /*FIXME: check what should be returned */
+      break;
 
-  /* Wait for communication completion */
-  /* FIXME: if the semantic is non blocking, it shouldn't wait on the condition here */
-  /* FIXME: add timeout checking stuff */
-  SIMIX_communication_wait_for_completion(comm);
+    default:
+      remains = 0; /*FIXME: is this correct? */
+      break;
+  }
+  return remains;
+}
+
+e_smx_state_t SIMIX_comm_get_state(smx_action_t action)
+{
+  return action->state;
+}
 
-  SIMIX_communication_destroy(comm);
+/**
+ *  \brief Return the user data associated to the sender of the communication
+ *  \param action The communication
+ *  \return the user data
+ */
+void* SIMIX_comm_get_src_data(smx_action_t action)
+{
+  return action->comm.src_data;
 }
 
-void SIMIX_network_recv(smx_rdv_t rdv, void **data, size_t *size, double timeout)
+/**
+ *  \brief Return the user data associated to the receiver of the communication
+ *  \param action The communication
+ *  \return the user data
+ */
+void* SIMIX_comm_get_dst_data(smx_action_t action)
 {
-  /*double start_time = SIMIX_get_clock();*/
-  smx_comm_t comm;
-  smx_host_t my_host = SIMIX_host_self();
+  return action->comm.dst_data;
+}
 
-  comm = SIMIX_rdv_get_request_or_create(rdv,1);
-  comm->dst_host = SIMIX_host_self();
-  comm->dest_buff = data;
+void* SIMIX_comm_get_src_buff(smx_action_t action)
+{
+  return action->comm.src_buff;
+}
 
-  /* If the sender is already there, start the communication */
-  /* If it's not here already, it will start that communication itself later on */
-  if (comm->src_host != NULL)
-    SIMIX_communication_start(comm);
+void* SIMIX_comm_get_dst_buff(smx_action_t action)
+{
+  return action->comm.dst_buff;
+}
 
-  /* Wait for communication completion */
-  /* FIXME: if the semantic is non blocking, it shouldn't wait on the condition here */
-  /* FIXME: add timeout checking stuff */
-  SIMIX_communication_wait_for_completion(comm);
+size_t SIMIX_comm_get_src_buff_size(smx_action_t action)
+{
+  return action->comm.src_buff_size;
+}
 
-  /* We are OK, let's copy the message to receiver's buffer */
-  *size = *size < comm->data_size ? *size : comm->data_size;
-  memcpy(*data, comm->data, *size);
+size_t SIMIX_comm_get_dst_buff_size(smx_action_t action)
+{
+  size_t buff_size;
 
-  SIMIX_communication_destroy(comm);
+  if (action->comm.dst_buff_size)
+    buff_size = *(action->comm.dst_buff_size);
+  else
+    buff_size = 0;
+
+  return buff_size;
 }
 
-/******************************************************************************/
-/*                        Asynchronous Communication                          */
-/******************************************************************************/
+smx_process_t SIMIX_comm_get_src_proc(smx_action_t action)
+{
+  return action->comm.src_proc;
+}
 
-/*
-void SIMIX_network_wait(smx_action_t comm, double timeout)
+smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action)
 {
-    if (timeout > 0)
-      SIMIX_cond_wait_timeout(rvp_cond, rvp_comm_mutex, timeout - start_time);
-    else
-      SIMIX_cond_wait(rvp_cond, rvp_comm_mutex);    
+  return action->comm.dst_proc;
+}
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+/**
+ *  \brief verify if communication is latency bounded
+ *  \param comm The communication
+ */
+XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
+{
+  if (action->comm.surf_comm){
+      DEBUG1("Getting latency limited for surf_action (%p)", action->comm.surf_comm);
+      action->latency_limited = surf_workstation_model->get_latency_limited(action->comm.surf_comm);
+      DEBUG1("Action limited is %d", action->latency_limited);
+  }
+  return action->latency_limited;
 }
+#endif
 
+/******************************************************************************/
+/*                    SIMIX_comm_copy_data callbacks                       */
+/******************************************************************************/
+static void (*SIMIX_comm_copy_data_callback) (smx_action_t, size_t) =
+    &SIMIX_comm_copy_pointer_callback;
 
-XBT_PUBLIC(int) SIMIX_network_test(smx_action_t comm)
+void
+SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, size_t))
 {
-  if(SIMIX_action_get_state (comm) == SURF_ACTION_DONE){
-    memcpy(comm->data
+  SIMIX_comm_copy_data_callback = callback;
+}
 
-  return SIMIX_action_get_state (comm) == SURF_ACTION_DONE ? TRUE : FALSE;
-}*/
+void SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size)
+{
+  xbt_assert1((buff_size == sizeof(void *)),
+              "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
+  *(void **) (comm->comm.dst_buff) = comm->comm.src_buff;
+}
 
+void SIMIX_comm_copy_buffer_callback(smx_action_t comm, size_t buff_size)
+{
+  memcpy(comm->comm.dst_buff, comm->comm.src_buff, buff_size);
+}
 
+/**
+ *  \brief Copy the communication data from the sender's buffer to the receiver's one
+ *  \param comm The communication
+ */
+void SIMIX_comm_copy_data(smx_action_t comm)
+{
+  size_t buff_size = comm->comm.src_buff_size;
+  /* If there is no data to be copy then return */
+  if (!comm->comm.src_buff || !comm->comm.dst_buff || comm->comm.copied == 1)
+    return;
 
+  DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
+         comm,
+         comm->comm.src_proc->smx_host->name, comm->comm.src_buff,
+         comm->comm.dst_proc->smx_host->name, comm->comm.dst_buff, buff_size);
 
+  /* Copy at most dst_buff_size bytes of the message to receiver's buffer */
+  if (comm->comm.dst_buff_size)
+    buff_size = MIN(buff_size, *(comm->comm.dst_buff_size));
 
+  /* Update the receiver's buffer size to the copied amount */
+  if (comm->comm.dst_buff_size)
+    *comm->comm.dst_buff_size = buff_size;
 
+  if (buff_size == 0)
+    return;
 
+  (*SIMIX_comm_copy_data_callback) (comm, buff_size);
+
+  /* Set the copied flag so we copy data only once */
+  /* (this function might be called from both communication ends) */
+  comm->comm.copied = 1;
+}