From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 20 Oct 2009 13:10:31 +0000 (+0000)
Subject: Implement smx_comm_t SIMIX_network_waitany(xbt_dynar_t comms)
X-Git-Tag: SVN~904
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/62923a33166a3bca4b65351fbe26f170e42dd24f

Implement smx_comm_t SIMIX_network_waitany(xbt_dynar_t comms)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6810 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 8e69b5bf3a..6e9d3601c6 100644
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -218,7 +218,7 @@ XBT_PUBLIC(void) SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buf
 XBT_PUBLIC(smx_comm_t) SIMIX_network_isend(smx_rdv_t rdv, double task_size, double rate,
                                            void *src_buff, size_t src_buff_size, void *data);
 XBT_PUBLIC(smx_comm_t) SIMIX_network_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size);
-
+XBT_PUBLIC(smx_comm_t) SIMIX_network_waitany(xbt_dynar_t comms);
 XBT_PUBLIC(void) SIMIX_network_wait(smx_comm_t comm, double timeout);
 XBT_PUBLIC(int) SIMIX_network_test(smx_comm_t comm);
 
diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 9f3b1758eb..0f2bd0b4d5 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -431,6 +431,7 @@ smx_comm_t SIMIX_network_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_s
   return comm;
 }
 
+/** @brief blocks until the communication terminates or the timeout occurs */
 void SIMIX_network_wait(smx_comm_t comm, double timeout) {
   /* Wait for communication completion */
   SIMIX_communication_wait_for_completion(comm, timeout);
@@ -443,9 +444,46 @@ int SIMIX_network_test(smx_comm_t comm) {
   return comm->sem?SIMIX_sem_would_block(comm->sem):0;
 }
 
+/** @brief wait for the completion of any communication of a set
+ *
+ *  @Returns the communication which finished, destroy it after identifying which one it is (not removed from the dynar)
+ */
+smx_comm_t SIMIX_network_waitany(xbt_dynar_t comms) {
+  xbt_dynar_t sems = xbt_dynar_new(sizeof(smx_sem_t),NULL);
+  unsigned int cursor;
+  smx_comm_t comm,comm_finished=NULL;
+  smx_sem_t sem;
+
+  xbt_dynar_foreach(comms,cursor,comm){
+    xbt_dynar_push(sems,&(comm->sem));
+  }
 
+  DEBUG1("Waiting for the completion of communication set %p", comms);
 
+  sem = SIMIX_sem_acquire_any(sems);
+  xbt_dynar_foreach(comms,cursor,comm){
+    if (comm->sem == sem) {
+      comm_finished = comm;
+    }
+  }
+  xbt_assert0(comm_finished,"Cannot find which communication finished");
 
+  DEBUG1("Communication %p complete! Let's check for errors", comm_finished);
 
+  /* Make sure that everyone sleeping on that semaphore is awake,
+   * and that nobody will ever block on it */
+  SIMIX_sem_release_forever(comm_finished->sem);
 
+  /* Check for errors other than timeouts (they are catched above) */
+  if(!SIMIX_host_get_state(SIMIX_host_self())){
+    if(comm_finished->rdv)
+      SIMIX_rdv_remove(comm_finished->rdv, comm_finished);
+    SIMIX_communication_destroy(comm_finished);
+    THROW0(host_error, 0, "Host failed");
+  } else if (SIMIX_action_get_state(comm_finished->act) == SURF_ACTION_FAILED){
+    SIMIX_communication_destroy(comm_finished);
+    THROW0(network_error, 0, "Link failure");
+  }
 
+  return comm_finished;
+}