-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2023. 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. */
-#include "simgrid/cond.h"
-#include "simgrid/forward.h"
-#include "simgrid/s4u/ConditionVariable.hpp"
-#include "simgrid/simix.h"
+#include <simgrid/cond.h>
+#include <simgrid/s4u/ConditionVariable.hpp>
+#include <xbt/log.h>
+
+#include "src/kernel/activity/ActivityImpl.hpp"
#include "src/kernel/activity/ConditionVariableImpl.hpp"
-#include "src/kernel/activity/MutexImpl.hpp"
-#include "src/mc/checker/SimcallObserver.hpp"
-#include "xbt/log.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
-#include <exception>
#include <mutex>
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
- kernel::actor::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+ kernel::actor::simcall_answered([] { return new kernel::activity::ConditionVariableImpl(); });
return ConditionVariablePtr(cond->get_iface(), false);
}
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::ConditionVariableObserver 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::ConditionVariableObserver observer{issuer, pimpl_, lock.mutex()->pimpl_};
+ kernel::actor::simcall_blocking(
[&observer] { observer.get_cond()->wait(observer.get_mutex(), -1.0, observer.get_issuer()); }, &observer);
}
timeout = 0.0;
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::ConditionWaitSimcall observer{issuer, pimpl_, lock.mutex()->pimpl_, timeout};
- kernel::actor::simcall_blocking<void>(
+ kernel::actor::ConditionVariableObserver 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);
- bool timed_out = observer.get_result();
if (timed_out) {
// If we reached the timeout, we have to take the lock again:
lock.mutex()->lock();
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;
*/
void ConditionVariable::notify_one()
{
- simgrid::kernel::actor::simcall([this]() { pimpl_->signal(); });
+ simgrid::kernel::actor::simcall_answered([this]() { pimpl_->signal(); });
}
void ConditionVariable::notify_all()
{
- simgrid::kernel::actor::simcall([this]() { pimpl_->broadcast(); });
+ simgrid::kernel::actor::simcall_answered([this]() { pimpl_->broadcast(); });
}
void intrusive_ptr_add_ref(const ConditionVariable* cond)
intrusive_ptr_release(cond->pimpl_);
}
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
/* **************************** Public C interface *************************** */
sg_cond_t sg_cond_init()
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
- std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
+ std::unique_lock lock(*mutex);
return cond->wait_for(lock, delay) == std::cv_status::timeout;
}