X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/163f8696544cfc2c11a545b9ed06011903780031..9f62e12607e183452816941da3e99bb5efda40d0:/src/simix/smx_synchro.cpp diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index d7deecfa12..7fd7af1ffe 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -20,8 +20,8 @@ smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout) simgrid::kernel::activity::RawImplPtr sync = simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl()); - sync->sleep = smx_host->pimpl_cpu->sleep(timeout); - sync->sleep->set_data(sync.get()); + sync->surf_action_ = smx_host->pimpl_cpu->sleep(timeout); + sync->surf_action_->set_data(sync.get()); XBT_OUT(); return sync; } @@ -65,16 +65,15 @@ void SIMIX_synchro_finish(smx_activity_t synchro) smx_simcall_t simcall = synchro->simcalls_.front(); synchro->simcalls_.pop_front(); - if (synchro->state_ != SIMIX_SRC_TIMEOUT) { - if (synchro->state_ == SIMIX_FAILED) - simcall->issuer->context_->iwannadie = 1; - else - THROW_IMPOSSIBLE; - } - SIMIX_synchro_stop_waiting(simcall->issuer, simcall); simcall->issuer->waiting_synchro = nullptr; - SIMIX_simcall_answer(simcall); + + if (synchro->state_ != SIMIX_SRC_TIMEOUT) { + xbt_assert(synchro->state_ == SIMIX_FAILED); + simcall->issuer->context_->iwannadie = true; + } else { + SIMIX_simcall_answer(simcall); + } XBT_OUT(); } @@ -89,18 +88,6 @@ smx_sem_t SIMIX_sem_init(unsigned int value) return sem; } -/** @brief Destroys a semaphore */ -void SIMIX_sem_destroy(smx_sem_t sem) -{ - XBT_IN("(%p)",sem); - XBT_DEBUG("Destroy semaphore %p", sem); - if (sem != nullptr) { - xbt_assert(sem->sleeping.empty(), "Cannot destroy semaphore since someone is still using it"); - delete sem; - } - XBT_OUT(); -} - /** @brief release the semaphore * * Unlock a process waiting on the semaphore. @@ -157,7 +144,7 @@ static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_actor_t issuer, } /** - * \brief Handles a sem acquire simcall without timeout. + * @brief Handles a sem acquire simcall without timeout. */ void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem) { @@ -167,7 +154,7 @@ void simcall_HANDLER_sem_acquire(smx_simcall_t simcall, smx_sem_t sem) } /** - * \brief Handles a sem acquire simcall with timeout. + * @brief Handles a sem acquire simcall with timeout. */ void simcall_HANDLER_sem_acquire_timeout(smx_simcall_t simcall, smx_sem_t sem, double timeout) {