Use kernelImmediate for simcall cond_init.

[simgrid.git] / src / kernel / activity / ConditionVariableImpl.cpp

diff --git a/src/kernel/activity/ConditionVariableImpl.cpp b/src/kernel/activity/ConditionVariableImpl.cpp
index 80aaae6..2ed96a7 100644 (file)
--- a/src/kernel/activity/ConditionVariableImpl.cpp
+++ b/src/kernel/activity/ConditionVariableImpl.cpp
@@ -16,24 +16,8 @@ static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
 
 /********************************* Condition **********************************/
 
-/**
- * \brief Initialize a condition.
- *
- * Allocates and creates the data for the condition.
- * It have to be called before the use of the condition.
- * \return A condition
- */
-smx_cond_t SIMIX_cond_init()
-{
-  XBT_IN("()");
-  smx_cond_t cond = new simgrid::kernel::activity::ConditionVariableImpl();
-  XBT_OUT();
-  return cond;
-}
-
 /**
  * \brief Handle a condition waiting simcall without timeouts
- * \param simcall the simcall
  */
 void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
 {
@@ -46,7 +30,6 @@ void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex
 
 /**
  * \brief Handle a condition waiting simcall with timeouts
- * \param simcall the simcall
  */
 void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
 {
@@ -91,7 +74,6 @@ ConditionVariableImpl::~ConditionVariableImpl() = default;
  *
  * Signalizes a condition and wakes up a sleeping process.
  * If there are no process sleeping, no action is done.
- * \param cond A condition
  */
 void ConditionVariableImpl::signal()
 {
@@ -108,14 +90,14 @@ void ConditionVariableImpl::signal()
 
     /* Now transform the cond wait simcall into a mutex lock one */
     smx_simcall_t simcall = &proc.simcall;
-    smx_mutex_t mutex;
+    smx_mutex_t simcall_mutex;
     if (simcall->call == SIMCALL_COND_WAIT)
-      mutex = simcall_cond_wait__get__mutex(simcall);
+      simcall_mutex = simcall_cond_wait__get__mutex(simcall);
     else
-      mutex = simcall_cond_wait_timeout__get__mutex(simcall);
+      simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
     simcall->call = SIMCALL_MUTEX_LOCK;
 
-    simcall_HANDLER_mutex_lock(simcall, mutex);
+    simcall_HANDLER_mutex_lock(simcall, simcall_mutex);
   }
   XBT_OUT();
 }