- if(timeout > 0){
- TRY{
- SIMIX_cond_wait_timeout(comm->cond, NULL, 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);
-
- SIMIX_cond_signal(comm->cond);
- SIMIX_communication_destroy(comm);
- }
- RETHROW;
- }
- }else{
- SIMIX_cond_wait(comm->cond, NULL);
+ 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");