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
migrate to set_host in java too
[simgrid.git]
/
src
/
s4u
/
s4u_ConditionVariable.cpp
diff --git
a/src/s4u/s4u_ConditionVariable.cpp
b/src/s4u/s4u_ConditionVariable.cpp
index
0e3713d
..
0e9683f
100644
(file)
--- a/
src/s4u/s4u_ConditionVariable.cpp
+++ b/
src/s4u/s4u_ConditionVariable.cpp
@@
-19,7
+19,7
@@
namespace s4u {
ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
ConditionVariablePtr ConditionVariable::create()
{
kernel::activity::ConditionVariableImpl* cond =
-
simix
::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
+
kernel::actor
::simcall([] { return new kernel::activity::ConditionVariableImpl(); });
return ConditionVariablePtr(&cond->cond_, false);
}
return ConditionVariablePtr(&cond->cond_, false);
}
@@
-67,12
+67,12
@@
std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, doub
*/
void ConditionVariable::notify_one()
{
*/
void ConditionVariable::notify_one()
{
- simgrid::
simix
::simcall([this]() { cond_->signal(); });
+ simgrid::
kernel::actor
::simcall([this]() { cond_->signal(); });
}
void ConditionVariable::notify_all()
{
}
void ConditionVariable::notify_all()
{
- simgrid::
simix
::simcall([this]() { cond_->broadcast(); });
+ simgrid::
kernel::actor
::simcall([this]() { cond_->broadcast(); });
}
void intrusive_ptr_add_ref(ConditionVariable* cond)
}
void intrusive_ptr_add_ref(ConditionVariable* cond)
@@
-92,7
+92,7
@@
void intrusive_ptr_release(ConditionVariable* cond)
sg_cond_t sg_cond_init()
{
simgrid::kernel::activity::ConditionVariableImpl* cond =
sg_cond_t sg_cond_init()
{
simgrid::kernel::activity::ConditionVariableImpl* cond =
- simgrid::
simix
::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
+ simgrid::
kernel::actor
::simcall([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
return new simgrid::s4u::ConditionVariable(cond);
}
return new simgrid::s4u::ConditionVariable(cond);
}
@@
-105,7
+105,7
@@
void sg_cond_wait(sg_cond_t cond, sg_mutex_t mutex)
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
int sg_cond_wait_for(sg_cond_t cond, sg_mutex_t mutex, double delay)
{
std::unique_lock<simgrid::s4u::Mutex> lock(*mutex);
- return
static_cast<int>(cond->wait_for(lock, delay))
;
+ return
cond->wait_for(lock, delay) == std::cv_status::timeout ? 1 : 0
;
}
void sg_cond_notify_one(sg_cond_t cond)
}
void sg_cond_notify_one(sg_cond_t cond)