#include "simgrid/mutex.h"
#include "simgrid/s4u/Mutex.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
-#include "src/mc/checker/SimcallObserver.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
namespace simgrid {
namespace s4u {
void Mutex::lock()
{
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);
+ kernel::actor::MutexLockSimcall observer{issuer, pimpl_};
+ kernel::actor::simcall_blocking([&observer] { observer.get_mutex()->lock(observer.get_issuer()); }, &observer);
}
/** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
void Mutex::unlock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::MutexUnlockSimcall observer{issuer};
+ kernel::actor::MutexUnlockSimcall observer{issuer, pimpl_};
kernel::actor::simcall([this, issuer] { this->pimpl_->unlock(issuer); }, &observer);
}
bool Mutex::try_lock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
- mc::MutexLockSimcall observer{issuer, pimpl_, false};
+ kernel::actor::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