A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TorusZone: Add limiter for destination node
[simgrid.git]
/
src
/
s4u
/
s4u_Mutex.cpp
diff --git
a/src/s4u/s4u_Mutex.cpp
b/src/s4u/s4u_Mutex.cpp
index 38b57a6e95a20d9c4e7182aca44ea754d443d993..832c8fb9f12f10055eb397d2eb778cd0d65aeb87 100644
(file)
--- a/
src/s4u/s4u_Mutex.cpp
+++ b/
src/s4u/s4u_Mutex.cpp
@@
-7,21
+7,17
@@
#include "simgrid/mutex.h"
#include "simgrid/s4u/Mutex.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "simgrid/mutex.h"
#include "simgrid/s4u/Mutex.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
-#include "src/
mc/checke
r/SimcallObserver.hpp"
+#include "src/
kernel/acto
r/SimcallObserver.hpp"
namespace simgrid {
namespace s4u {
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()
{
/** @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();
+ 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)
}
/** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
@@
-31,7
+27,7
@@
void Mutex::lock()
void Mutex::unlock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
void Mutex::unlock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-
mc
::MutexUnlockSimcall observer{issuer};
+
kernel::actor
::MutexUnlockSimcall observer{issuer};
kernel::actor::simcall([this, issuer] { this->pimpl_->unlock(issuer); }, &observer);
}
kernel::actor::simcall([this, issuer] { this->pimpl_->unlock(issuer); }, &observer);
}
@@
-39,7
+35,7
@@
void Mutex::unlock()
bool Mutex::try_lock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
bool Mutex::try_lock()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
-
mc::MutexTrylockSimcall observer{issuer, pimpl_
};
+
kernel::actor::MutexLockSimcall observer{issuer, pimpl_, false
};
return kernel::actor::simcall([&observer] { return observer.get_mutex()->try_lock(observer.get_issuer()); },
&observer);
}
return kernel::actor::simcall([&observer] { return observer.get_mutex()->try_lock(observer.get_issuer()); },
&observer);
}
@@
-58,14
+54,12
@@
MutexPtr Mutex::create()
void intrusive_ptr_add_ref(const Mutex* mutex)
{
xbt_assert(mutex);
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);
}
void intrusive_ptr_release(const Mutex* mutex)
{
xbt_assert(mutex);
- if (mutex->pimpl_)
- mutex->pimpl_->unref();
+ mutex->pimpl_->unref();
}
} // namespace s4u
}
} // namespace s4u
@@
-74,10
+68,7
@@
void intrusive_ptr_release(const Mutex* mutex)
/* **************************** Public C interface *************************** */
sg_mutex_t sg_mutex_init()
{
/* **************************** 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_lock(sg_mutex_t mutex)
@@
-97,5
+88,5
@@
int sg_mutex_try_lock(sg_mutex_t mutex)
void sg_mutex_destroy(const_sg_mutex_t mutex)
{
void sg_mutex_destroy(const_sg_mutex_t mutex)
{
-
delete mutex
;
+
intrusive_ptr_release(mutex)
;
}
}