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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_conditionVariable.cpp
diff --git
a/src/s4u/s4u_conditionVariable.cpp
b/src/s4u/s4u_conditionVariable.cpp
index
98b4e6b
..
33e9df7
100644
(file)
--- a/
src/s4u/s4u_conditionVariable.cpp
+++ b/
src/s4u/s4u_conditionVariable.cpp
@@
-11,7
+11,7
@@
#include "simgrid/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
#include "simgrid/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
-#include "src/simix/smx_synchro_private.h"
+#include "src/simix/smx_synchro_private.h
pp
"
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
@@
-74,14
+74,14
@@
std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, doub
timeout = timeout_time - now;
return this->wait_for(lock, timeout);
}
timeout = timeout_time - now;
return this->wait_for(lock, timeout);
}
-
+
/**
* Notify functions
*/
void ConditionVariable::notify_one() {
simcall_cond_signal(cond_);
}
/**
* Notify functions
*/
void ConditionVariable::notify_one() {
simcall_cond_signal(cond_);
}
-
+
void ConditionVariable::notify_all() {
simcall_cond_broadcast(cond_);
}
void ConditionVariable::notify_all() {
simcall_cond_broadcast(cond_);
}