-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2021. 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/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
#include "src/kernel/activity/ConditionVariableImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
#include "xbt/log.hpp"
#include <exception>
ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
- simix::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
- return ConditionVariablePtr(&cond->cond_, false);
+ kernel::actor::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+ return ConditionVariablePtr(cond->get_iface(), false);
}
/**
*/
void ConditionVariable::wait(MutexPtr lock)
{
- simcall_cond_wait(cond_, lock->pimpl_);
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ 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(std::unique_lock<Mutex>& lock)
+void ConditionVariable::wait(const std::unique_lock<Mutex>& lock)
{
- simcall_cond_wait(cond_, lock.mutex()->pimpl_);
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ 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);
}
-std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout)
+std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock<Mutex>& lock, double timeout)
{
// The simcall uses -1 for "any timeout" but we don't want this:
if (timeout < 0)
timeout = 0.0;
- if (simcall_cond_wait_timeout(cond_, 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(std::unique_lock<Mutex>& lock, double timeout_time)
+std::cv_status ConditionVariable::wait_until(const std::unique_lock<Mutex>& lock, double timeout_time)
{
double now = SIMIX_get_clock();
double timeout;
*/
void ConditionVariable::notify_one()
{
- simgrid::simix::simcall([this]() { cond_->signal(); });
+ simgrid::kernel::actor::simcall([this]() { pimpl_->signal(); });
}
void ConditionVariable::notify_all()
{
- simgrid::simix::simcall([this]() { cond_->broadcast(); });
+ simgrid::kernel::actor::simcall([this]() { pimpl_->broadcast(); });
}
-void intrusive_ptr_add_ref(ConditionVariable* cond)
+void intrusive_ptr_add_ref(const ConditionVariable* cond)
{
- intrusive_ptr_add_ref(cond->cond_);
+ intrusive_ptr_add_ref(cond->pimpl_);
}
-void intrusive_ptr_release(ConditionVariable* cond)
+void intrusive_ptr_release(const ConditionVariable* cond)
{
- intrusive_ptr_release(cond->cond_);
+ intrusive_ptr_release(cond->pimpl_);
}
} // namespace s4u
/* **************************** Public C interface *************************** */
sg_cond_t sg_cond_init()
{
- simgrid::kernel::activity::ConditionVariableImpl* cond =
- simgrid::simix::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
-
- return new simgrid::s4u::ConditionVariable(cond);
+ return simgrid::s4u::ConditionVariable::create().detach();
}
void sg_cond_wait(sg_cond_t cond, sg_mutex_t mutex)
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)
cond->notify_all();
}
-void sg_cond_destroy(sg_cond_t cond)
+void sg_cond_destroy(const_sg_cond_t cond)
{
- delete cond;
+ intrusive_ptr_release(cond);
}