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
fix dist
[simgrid.git]
/
src
/
s4u
/
s4u_mutex.cpp
diff --git
a/src/s4u/s4u_mutex.cpp
b/src/s4u/s4u_mutex.cpp
index
20f6ee2
..
4f2cce6
100644
(file)
--- a/
src/s4u/s4u_mutex.cpp
+++ b/
src/s4u/s4u_mutex.cpp
@@
-6,26
+6,43
@@
#include "xbt/log.h"
#include "src/msg/msg_private.h"
#include "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "src/simix/smx_
network
_private.h"
+#include "src/simix/smx_
synchro
_private.h"
-#include "simgrid/s4u/
m
utex.hpp"
+#include "simgrid/s4u/
M
utex.hpp"
+namespace simgrid {
+namespace s4u {
-using namespace simgrid;
+/** @brief Blocks the calling actor until the mutex can be obtained */
+void Mutex::lock()
+{
+ simcall_mutex_lock(mutex_);
+}
-s4u::Mutex::Mutex() {
- smx_mutex_t smx_mutex = simcall_mutex_init();
- _mutex = std::shared_ptr<simgrid::simix::Mutex>(smx_mutex, SIMIX_mutex_destroy );
+/** @brief Release the ownership of the mutex, unleashing a blocked actor (if any)
+ *
+ * Will fail if the calling actor does not own the mutex.
+ */
+void Mutex::unlock()
+{
+ simcall_mutex_unlock(mutex_);
}
}
-void s4u::Mutex::lock() {
- simcall_mutex_lock(_mutex.get());
+/** @brief Acquire the mutex if it's free, and return false (without blocking) if not */
+bool Mutex::try_lock()
+{
+ return simcall_mutex_trylock(mutex_);
}
}
-void s4u::Mutex::unlock() {
- simcall_mutex_unlock(_mutex.get());
+/** @brief Create a new mutex
+ *
+ * See @ref s4u_raii.
+ */
+MutexPtr Mutex::createMutex()
+{
+ smx_mutex_t mutex = simcall_mutex_init();
+ return MutexPtr(&mutex->mutex(), false);
}
}
-bool s4u::Mutex::try_lock() {
- return simcall_mutex_trylock(_mutex.get());
+}
}
}