namespace simgrid {
namespace s4u {
-Mutex::~Mutex()
-{
- if (pimpl_ != nullptr)
- pimpl_->unref();
-}
-
/** @brief Blocks the calling actor until the mutex can be obtained */
void Mutex::lock()
{
- simcall_mutex_lock(pimpl_);
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ mc::MutexLockSimcall observer{issuer, pimpl_};
+ kernel::actor::simcall_blocking<void>([&observer] { observer.get_mutex()->lock(observer.get_issuer()); }, &observer);
}
/** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
bool Mutex::try_lock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::MutexTrylockSimcall observer{issuer, pimpl_};
+ mc::MutexLockSimcall observer{issuer, pimpl_, false};
return kernel::actor::simcall([&observer] { return observer.get_mutex()->try_lock(observer.get_issuer()); },
&observer);
}
void intrusive_ptr_add_ref(const Mutex* mutex)
{
xbt_assert(mutex);
- if (mutex->pimpl_)
- mutex->pimpl_->ref();
+ mutex->pimpl_->ref();
}
void intrusive_ptr_release(const Mutex* mutex)
{
xbt_assert(mutex);
- if (mutex->pimpl_)
- mutex->pimpl_->unref();
+ mutex->pimpl_->unref();
}
} // namespace s4u
/* **************************** Public C interface *************************** */
sg_mutex_t sg_mutex_init()
{
- simgrid::kernel::activity::MutexImpl* mutex =
- simgrid::kernel::actor::simcall([] { return new simgrid::kernel::activity::MutexImpl(); });
-
- return new simgrid::s4u::Mutex(mutex);
+ return simgrid::s4u::Mutex::create().detach();
}
void sg_mutex_lock(sg_mutex_t mutex)
void sg_mutex_destroy(const_sg_mutex_t mutex)
{
- delete mutex;
+ intrusive_ptr_release(mutex);
}