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 framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
activity
/
ConditionVariableImpl.cpp
diff --git
a/src/kernel/activity/ConditionVariableImpl.cpp
b/src/kernel/activity/ConditionVariableImpl.cpp
index
c49ab05
..
ddd34cd
100644
(file)
--- a/
src/kernel/activity/ConditionVariableImpl.cpp
+++ b/
src/kernel/activity/ConditionVariableImpl.cpp
@@
-28,15
+28,15
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
mutex->unlock(issuer);
}
mutex->unlock(issuer);
}
- synchro = SIMIX_synchro_wait(issuer->host, timeout);
- synchro->simcalls.push_front(simcall);
+ synchro = SIMIX_synchro_wait(issuer->host
_
, timeout);
+ synchro->simcalls
_
.push_front(simcall);
issuer->waiting_synchro = synchro;
cond->sleeping.push_back(*simcall->issuer);
XBT_OUT();
}
/**
issuer->waiting_synchro = synchro;
cond->sleeping.push_back(*simcall->issuer);
XBT_OUT();
}
/**
- *
\
brief Handle a condition waiting simcall without timeouts
+ *
@
brief Handle a condition waiting simcall without timeouts
*/
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
*/
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
@@
-48,7
+48,7
@@
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex
}
/**
}
/**
- *
\
brief Handle a condition waiting simcall with timeouts
+ *
@
brief Handle a condition waiting simcall with timeouts
*/
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
{
*/
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
{
@@
-67,7
+67,7
@@
ConditionVariableImpl::ConditionVariableImpl() : cond_(this) {}
ConditionVariableImpl::~ConditionVariableImpl() = default;
/**
ConditionVariableImpl::~ConditionVariableImpl() = default;
/**
- *
\
brief Signalizes a condition.
+ *
@
brief Signalizes a condition.
*
* Signalizes a condition and wakes up a sleeping process.
* If there are no process sleeping, no action is done.
*
* Signalizes a condition and wakes up a sleeping process.
* If there are no process sleeping, no action is done.
@@
-100,7
+100,7
@@
void ConditionVariableImpl::signal()
}
/**
}
/**
- *
\
brief Broadcasts a condition.
+ *
@
brief Broadcasts a condition.
*
* Signal ALL processes waiting on a condition.
* If there are no process waiting, no action is done.
*
* Signal ALL processes waiting on a condition.
* If there are no process waiting, no action is done.