X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/011a7ae6ffccbf20e1b5b6b62f99e28e9b3e809c..1485fe26372c540b07a9a86a5d08155d06d77e81:/src/simix/smx_synchro.cpp diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index fe1fa3f0c8..cf91e4a819 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -42,6 +42,7 @@ void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall) case SIMCALL_COND_WAIT_TIMEOUT: simgrid::xbt::intrusive_erase(simcall_cond_wait_timeout__get__cond(simcall)->sleeping, *process); + simcall_cond_wait_timeout__set__result(simcall, 1); // signal a timeout break; case SIMCALL_SEM_ACQUIRE: @@ -50,6 +51,7 @@ void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall) case SIMCALL_SEM_ACQUIRE_TIMEOUT: simgrid::xbt::intrusive_erase(simcall_sem_acquire_timeout__get__sem(simcall)->sleeping, *process); + simcall_sem_acquire_timeout__set__result(simcall, 1); // signal a timeout break; default: @@ -61,22 +63,14 @@ void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall) void SIMIX_synchro_finish(smx_activity_t synchro) { XBT_IN("(%p)", synchro.get()); - smx_simcall_t simcall = synchro->simcalls.front(); - synchro->simcalls.pop_front(); + smx_simcall_t simcall = synchro->simcalls_.front(); + synchro->simcalls_.pop_front(); - switch (synchro->state) { - - case SIMIX_SRC_TIMEOUT: - SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Synchro's wait timeout"); - break; - - case SIMIX_FAILED: - simcall->issuer->context->iwannadie = 1; - break; - - default: + if (synchro->state_ != SIMIX_SRC_TIMEOUT) { + if (synchro->state_ == SIMIX_FAILED) + simcall->issuer->context_->iwannadie = 1; + else THROW_IMPOSSIBLE; - break; } SIMIX_synchro_stop_waiting(simcall->issuer, simcall); @@ -152,8 +146,8 @@ static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer, XBT_DEBUG("Wait semaphore %p (timeout:%f)", sem, timeout); if (sem->value <= 0) { - synchro = SIMIX_synchro_wait(issuer->host, timeout); - synchro->simcalls.push_front(simcall); + synchro = SIMIX_synchro_wait(issuer->host_, timeout); + synchro->simcalls_.push_front(simcall); issuer->waiting_synchro = synchro; sem->sleeping.push_back(*issuer); } else { @@ -179,6 +173,7 @@ void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem) void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout) { XBT_IN("(%p)",simcall); + simcall_sem_acquire_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout _SIMIX_sem_wait(sem, timeout, simcall->issuer, simcall); XBT_OUT(); }