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

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index f9ac690d6f..41a86d0d11 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -9,6 +9,9 @@
 #include "private.h"
 #include "xbt/log.h"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
+                                "Logging specific to SIMIX (network)");
+
 /******************************************************************************/
 /*                           Rendez-Vous Points                               */
 /******************************************************************************/ 
@@ -20,81 +23,121 @@
  */
 smx_rdv_t SIMIX_rdv_create(const char *name)
 {
-  smx_rdv_t rvp = xbt_new0(s_smx_rvpoint_t, 1);
-  rvp->name = name ? xbt_strdup(name) : NULL;
-  rvp->read = SIMIX_mutex_init();
-  rvp->write = SIMIX_mutex_init();
-  rvp->comm_fifo = xbt_fifo_new();
+  smx_rdv_t rdv = xbt_new0(s_smx_rvpoint_t, 1);
+  rdv->name = name ? xbt_strdup(name) : NULL;
+  rdv->read = SIMIX_mutex_init();
+  rdv->write = SIMIX_mutex_init();
+  rdv->comm_fifo = xbt_fifo_new();
 
-  return rvp;
+  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(rvp->name)
-    xbt_free(rvp->name);
-  SIMIX_mutex_destroy(rvp->read);
-  SIMIX_mutex_destroy(rvp->write);
-  xbt_fifo_free(rvp->comm_fifo);
-  xbt_free(rvp);
+  if(rdv->name)
+    xbt_free(rdv->name);
+  SIMIX_mutex_destroy(rdv->read);
+  SIMIX_mutex_destroy(rdv->write);
+  xbt_fifo_free(rdv->comm_fifo);
+  xbt_free(rdv);
 }
 
 /**
  *  \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 inline void SIMIX_rdv_push(smx_rdv_t rdv, smx_comm_t comm)
 {
-  xbt_fifo_push(rvp->comm_fifo, comm);
+  xbt_fifo_push(rdv->comm_fifo, comm);
+  comm->rdv = rdv;
 }
 
+/**
+ *  \brief Remove a communication request from a rendez-vous point
+ *  \param rdv The rendez-vous point
+ *  \param comm The communication request
+ */
+static inline void SIMIX_rdv_remove(smx_rdv_t rdv, smx_comm_t comm)
+{
+  xbt_fifo_remove(rdv->comm_fifo, comm);
+  comm->rdv = NULL;
+}
+  
 /**
  *  \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, or a newly created one otherwise.
+ *  \param type The type of communication we are looking for (comm_send, comm_recv)
+ *  \return The communication request if found, NULL otherwise.
  */
-smx_comm_t SIMIX_rdv_get_request(smx_rdv_t rvp, int (filter)(smx_comm_t, void*), void *arg) {
-  smx_comm_t comm;
-  xbt_fifo_item_t item;
-
-  /* Traverse the rendez-vous queue looking for a comm request matching the
-     filter conditions. If found return it and remove it from the list. */
-  xbt_fifo_foreach(rvp->comm_fifo, item, comm, smx_comm_t) {
-    if(filter(comm, arg)){
-      SIMIX_communication_use(comm);
-      xbt_fifo_remove_item(rvp->comm_fifo, item);
-      return comm;
-    }
+smx_comm_t SIMIX_rdv_get_request(smx_rdv_t rdv, smx_comm_type_t type)
+{
+  smx_comm_t comm = (smx_comm_t)xbt_fifo_get_item_content(
+                                  xbt_fifo_get_first_item(rdv->comm_fifo));
+
+  if(comm && comm->type == type){
+    DEBUG0("Communication request found!");
+    xbt_fifo_shift(rdv->comm_fifo);
+    SIMIX_communication_use(comm);
+    return comm;
   }
 
   /* no relevant request found. Return NULL */
+  DEBUG0("Communication request not found");
   return NULL;
 }
 
+/**
+ *  \brief counts the number of communication requests of a given host pending
+ *         on a rendez-vous point
+ *  \param rdv The rendez-vous point
+ *  \param host The host to be counted
+ *  \return The number of comm request pending in the rdv
+ */
+int 
+SIMIX_rdv_get_count_waiting_comm(smx_rdv_t rdv, smx_host_t host)
+{
+  smx_comm_t comm = NULL;
+  xbt_fifo_item_t item = NULL;
+  int count = 0;
+
+  xbt_fifo_foreach(rdv->comm_fifo, item, comm, smx_comm_t) {
+    if (comm->src_proc->smx_host == host)
+      count++;
+  }
+
+  return count;
+}
+
+/**
+ *  \brief returns the communication at the head of the rendez-vous
+ *  \param rdv The rendez-vous point
+ *  \return The communication or NULL if empty
+ */
+smx_comm_t SIMIX_rdv_get_head(smx_rdv_t rdv)
+{
+  return (smx_comm_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(rdv->comm_fifo));
+}
+
+
 /******************************************************************************/
 /*                           Communication Requests                           */
 /******************************************************************************/ 
 
 /**
  *  \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
+ *  \param type The type of communication (comm_send, comm_recv)
+ *  \return The new communication request
  */  
-smx_comm_t SIMIX_communication_new(smx_comm_type_t type, smx_rdv_t rdv)
+smx_comm_t SIMIX_communication_new(smx_comm_type_t type)
 {
   /* alloc structures */
   smx_comm_t comm = xbt_new0(s_smx_comm_t, 1);
   comm->type = type;
   comm->cond = SIMIX_cond_init();
-  comm->rdv = rdv;
   comm->refcount = 1;
   
   return comm;
@@ -136,13 +179,25 @@ static inline void SIMIX_communication_use(smx_comm_t comm)
 static inline void SIMIX_communication_start(smx_comm_t comm)
 {
   /* If both the sender and the receiver are already there, start the communication */
-  if(comm->src_host != NULL && comm->dst_host != NULL){
-    comm->act = SIMIX_action_communicate(comm->src_host, comm->dst_host, NULL, 
+  if(comm->src_proc && comm->dst_proc){
+    DEBUG1("Starting communication %p", comm);
+    comm->act = SIMIX_action_communicate(comm->src_proc->smx_host, 
+                                         comm->dst_proc->smx_host, NULL, 
                                          comm->task_size, comm->rate);
-    /* Add the communication as user data into the action, so it can be reached from it later */
+
+    /* If any of the process is suspend, create the action but stop its execution,
+       it will be restart when the sender process resume */
+    if(SIMIX_process_is_suspended(comm->src_proc) || 
+       SIMIX_process_is_suspended(comm->dst_proc)) {
+      SIMIX_action_set_priority(comm->act, 0);
+    }
+    
+    /* Add the communication as user data of the action */
     comm->act->data = comm;
     
     SIMIX_register_action_to_condition(comm->act, comm->cond);
+  }else{
+    DEBUG1("Communication %p cannot be started, peer missing", comm);
   }
 }
 
@@ -159,6 +214,8 @@ static inline void SIMIX_communication_start(smx_comm_t comm)
 static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, double timeout)
 {
   xbt_ex_t e;
+
+  DEBUG1("Waiting for the completion of communication %p", comm);
   
   if(timeout > 0){
     TRY{
@@ -166,78 +223,81 @@ static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, doub
     }
     CATCH(e){
       /* If it's a timeout then cancel the communication and signal the other peer */
-      if(e.category == timeout_error)
-        SIMIX_action_cancel(comm->act);
-        SIMIX_cond_signal(comm->cond);   
+      if(e.category == timeout_error){
+        DEBUG1("Communication timeout! %p", comm);
+        if(comm->act && SIMIX_action_get_state(comm->act) == SURF_ACTION_RUNNING)
+          SIMIX_communication_cancel(comm);
+        else
+          SIMIX_rdv_remove(comm->rdv, comm);
+          
+        SIMIX_cond_signal(comm->cond);
+        SIMIX_communication_destroy(comm);
+      }
       RETHROW;
     }
   }else{
     SIMIX_cond_wait(comm->cond, NULL);
   }
 
-  SIMIX_unregister_action_to_condition(comm->act, comm->cond);
+  DEBUG1("Communication %p complete! Let's check for errors", comm);
   
   /* 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);
+  if(!SIMIX_host_get_state(SIMIX_host_self())){
+    SIMIX_communication_destroy(comm);
+    THROW0(host_error, 0, "Host failed");
   } else if (SIMIX_action_get_state(comm->act) == SURF_ACTION_FAILED){
+    SIMIX_communication_destroy(comm);
     THROW0(network_error, 0, "Link failure");
   }
+
+  SIMIX_unregister_action_to_condition(comm->act, comm->cond);
 }
 
+void SIMIX_communication_cancel(smx_comm_t comm)
+{
+  SIMIX_action_cancel(comm->act);
+}
+
+double SIMIX_communication_get_remains(smx_comm_t comm)
+{
+  return SIMIX_action_get_remains(comm->act);
+}  
+
 /**
  *  \brief Copy the communication data from the sender's buffer to the receiver's one
  *  \param comm The communication
  */
 void SIMIX_network_copy_data(smx_comm_t comm)
 {
-  /* Copy the minimum between the size of the sender's message and the size of the
-     receiver's buffer */
-  *comm->dest_buff_size = *comm->dest_buff_size < comm->data_size ? 
-                            *comm->dest_buff_size : comm->data_size;
+  size_t src_buff_size = comm->src_buff_size;
+  size_t dst_buff_size = *comm->dst_buff_size;
+  
+  /* Copy at most dst_buff_size bytes of the message to receiver's buffer */
+  dst_buff_size = MIN(dst_buff_size, src_buff_size);
+  
+  /* Update the receiver's buffer size to the copied amount */
+  *comm->dst_buff_size = dst_buff_size;
 
-  memcpy(comm->dest_buff, comm->data, *comm->dest_buff_size);
-}
+  if(dst_buff_size == 0)
+    return;
 
-/**
- *  \brief Checks if a communication is a send request
- *  \param comm The communication
- *  \return Boolean value
- */
-int SIMIX_communication_isSend(smx_comm_t comm)
-{
-  return comm->type == comm_send ? TRUE : FALSE;
+  memcpy(comm->dst_buff, comm->src_buff, dst_buff_size);
+
+  DEBUG4("Copying comm %p data from %s -> %s (%zu bytes)", 
+         comm, comm->src_proc->smx_host->name, comm->dst_proc->smx_host->name,
+         dst_buff_size);
 }
 
 /**
- *  \brief Checks if a communication is a recv request
+ *  \brief Return the user data associated to the communication
  *  \param comm The communication
- *  \return Boolean value
+ *  \return the user data
  */
-int SIMIX_communication_isRecv(smx_comm_t comm)
-{
-  return comm->type == comm_recv ? TRUE : FALSE;
-}
-
-/* FIXME: move to some other place */
-int comm_filter_get(smx_comm_t comm, void *arg)
+void *SIMIX_communication_get_data(smx_comm_t comm)
 {
-  if(comm->type == comm_send){
-    if(arg && comm->src_host != (smx_host_t)arg)
-     return FALSE;
-    else
-     return TRUE;
-  }else{
-    return FALSE;
-  }
+  return comm->data;
 }
 
-int comm_filter_put(smx_comm_t comm, void *arg)
-{
-  return comm->type == comm_recv ? TRUE : FALSE;
-}
 /******************************************************************************/
 /*                        Synchronous Communication                           */
 /******************************************************************************/
@@ -247,32 +307,34 @@ int comm_filter_put(smx_comm_t comm, void *arg)
  *   - network_error if network failed or peer issued a timeout
  */
 void SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate, 
-                        double timeout, void *data, size_t data_size,
-                        int (filter)(smx_comm_t, void *), void *arg)
+                        double timeout, void *src_buff, size_t src_buff_size,
+                        smx_comm_t *comm_ref, void *data)
 {
   smx_comm_t comm;
-
+  
   /* Look for communication request matching our needs. 
      If it is not found then create it and push it into the rendez-vous point */
-  comm = SIMIX_rdv_get_request(rdv, filter, arg);
+  comm = SIMIX_rdv_get_request(rdv, comm_recv);
 
-  if(comm == NULL){
-    comm = SIMIX_communication_new(comm_send, rdv);
+  if(!comm){
+    comm = SIMIX_communication_new(comm_send);
     SIMIX_rdv_push(rdv, comm);
   }
 
+  /* Update the communication reference with the comm to be used */
+  *comm_ref = comm;
+  
   /* Setup the communication request */
-  comm->src_host = SIMIX_host_self();
+  comm->src_proc = SIMIX_process_self();
   comm->task_size = task_size;
   comm->rate = rate;
+  comm->src_buff = src_buff;
+  comm->src_buff_size = src_buff_size;
   comm->data = data;
-  comm->data_size = data_size;
 
   SIMIX_communication_start(comm);
 
   /* 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, timeout);
 
   SIMIX_communication_destroy(comm);
@@ -283,30 +345,31 @@ void SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate,
  *   - timeout_error if communication reached the timeout specified
  *   - network_error if network failed or peer issued a timeout
  */
-void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *data, 
-                        size_t *data_size, int (filter)(smx_comm_t, void *), void *arg)
+void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buff, 
+                        size_t *dst_buff_size, smx_comm_t *comm_ref)
 {
   smx_comm_t comm;
 
   /* Look for communication request matching our needs. 
      If it is not found then create it and push it into the rendez-vous point */
-  comm = SIMIX_rdv_get_request(rdv, filter, arg);
+  comm = SIMIX_rdv_get_request(rdv, comm_send);
 
-  if(comm == NULL){
-    comm = SIMIX_communication_new(comm_send, rdv);
+  if(!comm){
+    comm = SIMIX_communication_new(comm_recv);
     SIMIX_rdv_push(rdv, comm);
   }
 
+  /* Update the communication reference with the comm to be used */
+  *comm_ref = comm;
+ 
   /* Setup communication request */
-  comm->dst_host = SIMIX_host_self();
-  comm->dest_buff = data;
-  comm->dest_buff_size = data_size;
+  comm->dst_proc = SIMIX_process_self();
+  comm->dst_buff = dst_buff;
+  comm->dst_buff_size = dst_buff_size;
 
   SIMIX_communication_start(comm);
 
   /* 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, timeout);
 
   SIMIX_communication_destroy(comm);
@@ -319,20 +382,12 @@ void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *data,
 /*
 void SIMIX_network_wait(smx_action_t comm, double timeout)
 {
-    if (timeout > 0)
-      SIMIX_cond_wait_timeout(rvp_cond, rvp_comm_mutex, timeout - start_time);
-    else
-      SIMIX_cond_wait(rvp_cond, rvp_comm_mutex);    
-
+  TO BE IMPLEMENTED
 }
 
-
 XBT_PUBLIC(int) SIMIX_network_test(smx_action_t comm)
 {
-  if(SIMIX_action_get_state (comm) == SURF_ACTION_DONE){
-    memcpy(comm->data
-
-  return SIMIX_action_get_state (comm) == SURF_ACTION_DONE ? TRUE : FALSE;
+  TO BE IMPLEMENTED
 }*/