-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2022. 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/Mutex.hpp"
+#include <simgrid/modelchecker.h>
+#include <simgrid/mutex.h>
+#include <simgrid/s4u/Mutex.hpp>
+
#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/actor/SynchroObserver.hpp"
+#include "src/mc/mc_replay.hpp"
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
/** @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();
+
+ if (MC_is_active() || MC_record_replay_is_active()) { // Split in 2 simcalls for transition persistency
+ kernel::actor::MutexObserver lock_observer{issuer, mc::Transition::Type::MUTEX_LOCK, pimpl_};
+ auto acquisition =
+ kernel::actor::simcall_answered([issuer, this] { return pimpl_->lock_async(issuer); }, &lock_observer);
+
+ kernel::actor::MutexObserver wait_observer{issuer, mc::Transition::Type::MUTEX_WAIT, pimpl_};
+ kernel::actor::simcall_blocking([issuer, &acquisition] { acquisition->wait_for(issuer, -1); }, &wait_observer);
+
+ } else { // Do it in one simcall only
+ kernel::actor::simcall_blocking([issuer, this] { pimpl_->lock_async(issuer)->wait_for(issuer, -1); });
+ }
}
/** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
*/
void Mutex::unlock()
{
- simcall_mutex_unlock(pimpl_);
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ kernel::actor::MutexObserver observer{issuer, mc::Transition::Type::MUTEX_UNLOCK, pimpl_};
+ kernel::actor::simcall_answered([this, issuer] { this->pimpl_->unlock(issuer); }, &observer);
}
/** @brief Acquire the mutex if it's free, and return false (without blocking) if not */
bool Mutex::try_lock()
{
- return simcall_mutex_trylock(pimpl_);
+ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
+ kernel::actor::MutexObserver observer{issuer, mc::Transition::Type::MUTEX_TRYLOCK, pimpl_};
+ return kernel::actor::simcall_answered([&observer] { return observer.get_mutex()->try_lock(observer.get_issuer()); },
+ &observer);
}
/** @brief Create a new mutex
*/
MutexPtr Mutex::create()
{
- smx_mutex_t mutex = simcall_mutex_init();
+ auto* mutex = new kernel::activity::MutexImpl();
return MutexPtr(&mutex->mutex(), false);
}
/* refcounting of the intrusive_ptr is delegated to the implementation object */
-void intrusive_ptr_add_ref(Mutex* mutex)
+void intrusive_ptr_add_ref(const Mutex* mutex)
+{
+ intrusive_ptr_add_ref(mutex->pimpl_);
+}
+void intrusive_ptr_release(const Mutex* mutex)
+{
+ intrusive_ptr_release(mutex->pimpl_);
+}
+
+} // namespace simgrid::s4u
+
+/* **************************** Public C interface *************************** */
+sg_mutex_t sg_mutex_init()
{
- xbt_assert(mutex);
- SIMIX_mutex_ref(mutex->pimpl_);
+ return simgrid::s4u::Mutex::create().detach();
}
-void intrusive_ptr_release(Mutex* mutex)
+
+void sg_mutex_lock(sg_mutex_t mutex)
+{
+ mutex->lock();
+}
+
+void sg_mutex_unlock(sg_mutex_t mutex)
+{
+ mutex->unlock();
+}
+
+int sg_mutex_try_lock(sg_mutex_t mutex)
+{
+ return mutex->try_lock();
+}
+
+void sg_mutex_destroy(const_sg_mutex_t mutex)
{
- xbt_assert(mutex);
- SIMIX_mutex_unref(mutex->pimpl_);
+ intrusive_ptr_release(mutex);
}
-} // namespace s4u
-} // namespace simgrid