From d4dfbe38abab90351c83a110a51a468b45eb53bc Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 4 May 2018 16:06:00 +0200 Subject: [PATCH 1/1] Cosmetics: define function before use. --- src/kernel/activity/ConditionVariableImpl.cpp | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp index 2ed96a7a28..06836e0fb8 100644 --- a/src/kernel/activity/ConditionVariableImpl.cpp +++ b/src/kernel/activity/ConditionVariableImpl.cpp @@ -11,10 +11,29 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition variables"); +/********************************* Condition **********************************/ + static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer, - smx_simcall_t simcall); + smx_simcall_t simcall) +{ + XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall); + smx_activity_t synchro = nullptr; -/********************************* Condition **********************************/ + XBT_DEBUG("Wait condition %p", cond); + + /* If there is a mutex unlock it */ + /* FIXME: what happens if the issuer is not the owner of the mutex? */ + if (mutex != nullptr) { + cond->mutex = mutex; + mutex->unlock(issuer); + } + + synchro = SIMIX_synchro_wait(issuer->host, timeout); + synchro->simcalls.push_front(simcall); + issuer->waiting_synchro = synchro; + cond->sleeping.push_back(*simcall->issuer); + XBT_OUT(); +} /** * \brief Handle a condition waiting simcall without timeouts @@ -40,28 +59,6 @@ void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, s XBT_OUT(); } -static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer, - smx_simcall_t simcall) -{ - XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall); - smx_activity_t synchro = nullptr; - - XBT_DEBUG("Wait condition %p", cond); - - /* If there is a mutex unlock it */ - /* FIXME: what happens if the issuer is not the owner of the mutex? */ - if (mutex != nullptr) { - cond->mutex = mutex; - mutex->unlock(issuer); - } - - synchro = SIMIX_synchro_wait(issuer->host, timeout); - synchro->simcalls.push_front(simcall); - issuer->waiting_synchro = synchro; - cond->sleeping.push_back(*simcall->issuer); - XBT_OUT(); -} - namespace simgrid { namespace kernel { namespace activity { -- 2.20.1