#include "simgrid/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
#include "src/kernel/activity/ConditionVariableImpl.hpp"
-#include "src/mc/checker/SimcallObserver.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
#include "xbt/log.hpp"
#include <exception>
void ConditionVariable::wait(MutexPtr lock)
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::ConditionWaitSimcall observer{issuer, pimpl_, lock->pimpl_};
- kernel::actor::simcall_blocking<void>(
+ kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock->pimpl_};
+ kernel::actor::simcall_blocking(
[&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
}
void ConditionVariable::wait(const std::unique_lock<Mutex>& lock)
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_};
- kernel::actor::simcall_blocking<void>(
+ kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_};
+ kernel::actor::simcall_blocking(
[&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
}
if (timeout < 0)
timeout = 0.0;
- if (simcall_cond_wait_timeout(pimpl_, lock.mutex()->pimpl_, timeout)) {
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ kernel::actor::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_, timeout};
+ bool timed_out = kernel::actor::simcall_blocking(
+ [&observer] { observer.get_cond()->wait(observer.get_mutex(), observer.get_timeout(), observer.get_issuer()); },
+ &observer);
+ if (timed_out) {
// If we reached the timeout, we have to take the lock again:
lock.mutex()->lock();
return std::cv_status::timeout;
std::cv_status ConditionVariable::wait_until(const std::unique_lock<Mutex>& lock, double timeout_time)
{
- double now = SIMIX_get_clock();
+ double now = Engine::get_clock();
double timeout;
if (timeout_time < now)
timeout = 0.0;
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
- return cond->wait_for(lock, delay) == std::cv_status::timeout ? 1 : 0;
+ return cond->wait_for(lock, delay) == std::cv_status::timeout;
}
void sg_cond_notify_one(sg_cond_t cond)