ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
- simix::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+ kernel::actor::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
return ConditionVariablePtr(&cond->cond_, false);
}
*/
void ConditionVariable::notify_one()
{
- simgrid::simix::simcall([this]() { cond_->signal(); });
+ simgrid::kernel::actor::simcall([this]() { cond_->signal(); });
}
void ConditionVariable::notify_all()
{
- simgrid::simix::simcall([this]() { cond_->broadcast(); });
+ simgrid::kernel::actor::simcall([this]() { cond_->broadcast(); });
}
void intrusive_ptr_add_ref(ConditionVariable* cond)
sg_cond_t sg_cond_init()
{
simgrid::kernel::activity::ConditionVariableImpl* cond =
- simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
+ simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
return new simgrid::s4u::ConditionVariable(cond);
}
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
- return static_cast<int>(cond->wait_for(lock, delay));
+ return cond->wait_for(lock, delay) == std::cv_status::timeout ? 1 : 0;
}
void sg_cond_notify_one(sg_cond_t cond)