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

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 40face355c..de7af8c0d9 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -171,7 +171,17 @@ void SIMIX_communication_destroy(smx_comm_t comm)
     SIMIX_action_destroy(comm->act);
     comm->act = NULL;
   }
-  
+
+  if(comm->src_timeout){
+    SIMIX_action_destroy(comm->src_timeout);
+    comm->src_timeout = NULL;
+  }
+
+  if(comm->dst_timeout){
+      SIMIX_action_destroy(comm->dst_timeout);
+      comm->dst_timeout = NULL;
+    }
+
   xbt_free(comm);
 }
 
@@ -230,35 +240,47 @@ 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;
+  smx_action_t act_sleep = NULL;
+  int src_timeout = 0;
+  int dst_timeout = 0;
 
   DEBUG1("Waiting for the completion of communication %p", comm);
   
-  if(timeout > 0){
-    TRY{
-      SIMIX_sem_acquire_timeout(comm->sem, timeout);
-    }
-    CATCH(e){
-      /* If there is a timeout then cancel the communication if it is running or 
-         remove it from the rendez-vous otherwise. Then signal the other peer,
-         destroy the communication and retrow the exception. */
-      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);
-
-        /* Make sure that everyone sleeping on that semaphore is awake, and that nobody will ever block on it */
-        SIMIX_sem_release_forever(comm->sem);
-        SIMIX_communication_destroy(comm);
-      }
-      RETHROW;
-    }
+  if (timeout >= 0) {
+    act_sleep = SIMIX_action_sleep(SIMIX_host_self(), timeout);
+		if(SIMIX_process_self()==comm->src_proc)
+			comm->src_timeout = act_sleep;
+		else
+			comm->dst_timeout = act_sleep;
+    SIMIX_action_set_name(act_sleep,bprintf("Timeout for comm %p and wait on semaphore %p (max_duration:%f)", comm, comm->sem,timeout));
+    SIMIX_register_action_to_semaphore(act_sleep, comm->sem);
+    SIMIX_process_self()->waiting_action = act_sleep;
+    SIMIX_sem_block_onto(comm->sem);
+    SIMIX_process_self()->waiting_action = NULL;
+    SIMIX_unregister_action_to_semaphore(act_sleep, comm->sem);
   } else {
     SIMIX_sem_acquire(comm->sem);
   }
 
+  /* Check for timeouts */
+  if ((src_timeout = ((comm->src_timeout) && (SIMIX_action_get_state(comm->src_timeout) == SURF_ACTION_DONE))) ||
+      (dst_timeout = ((comm->dst_timeout) && (SIMIX_action_get_state(comm->dst_timeout) == SURF_ACTION_DONE))) ) {
+			/* Somebody did a timeout! */
+    if (src_timeout) DEBUG1("Communication timeout from the src! %p", comm);
+    if (dst_timeout) DEBUG1("Communication timeout from the dst! %p", comm);
+
+    if(comm->act && SIMIX_action_get_state(comm->act) == SURF_ACTION_RUNNING)
+      SIMIX_communication_cancel(comm);
+    else if (comm->rdv)
+      SIMIX_rdv_remove(comm->rdv, comm);
+
+    /* Make sure that everyone sleeping on that semaphore is awake, and that nobody will ever block on it */
+    SIMIX_sem_release_forever(comm->sem);
+    SIMIX_communication_destroy(comm);
+
+    THROW1(timeout_error, 0, "Communication timeouted because of %s",src_timeout?"the source":"the destination");
+  }
+
   DEBUG1("Communication %p complete! Let's check for errors", comm);
 
   /* Make sure that everyone sleeping on that semaphore is awake, and that nobody will ever block on it */
@@ -282,7 +304,8 @@ static inline void SIMIX_communication_wait_for_completion(smx_comm_t comm, doub
  */
 XBT_INLINE void SIMIX_communication_cancel(smx_comm_t comm)
 {
-  SIMIX_action_cancel(comm->act);
+  if (comm->act)
+    SIMIX_action_cancel(comm->act);
 }
 
 /**
@@ -304,24 +327,33 @@ void SIMIX_network_copy_data(smx_comm_t comm)
   if(!comm->src_buff || !comm->dst_buff)
     return;
   
-  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);
+  size_t buff_size = comm->src_buff_size;
+  if (comm->dst_buff_size)
+    buff_size = MIN(buff_size,*(comm->dst_buff_size));
   
   /* Update the receiver's buffer size to the copied amount */
   if (comm->dst_buff_size)
-    *comm->dst_buff_size = dst_buff_size;
+    *comm->dst_buff_size = buff_size;
 
-  if(dst_buff_size == 0)
+  if(buff_size == 0)
     return;
 
-  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);
+#ifdef HAVE_RUBY /* FIXME: KILLME */
+  INFO6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
+      comm,
+      comm->src_proc->smx_host->name, comm->src_buff,
+      comm->dst_proc->smx_host->name, comm->dst_buff,
+      buff_size);
+#else
+  DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
+      comm,
+      comm->src_proc->smx_host->name, comm->src_buff,
+      comm->dst_proc->smx_host->name, comm->dst_buff,
+      buff_size);
+#endif
+
+  memcpy(comm->dst_buff, comm->src_buff, buff_size);
 }
 
 /**