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
leaks --
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
ff7f7e7
..
de245a8
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-82,9
+82,9
@@
void SIMIX_post_synchro(smx_synchro_t synchro)
{
XBT_IN("(%p)",synchro);
xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
- if (synchro->synchro.sleep->getState() ==
SURF_ACTION_FAILED
)
+ if (synchro->synchro.sleep->getState() ==
simgrid::surf::Action::State::failed
)
synchro->state = SIMIX_FAILED;
- else if(synchro->synchro.sleep->getState() ==
SURF_ACTION_DONE
)
+ else if(synchro->synchro.sleep->getState() ==
simgrid::surf::Action::State::done
)
synchro->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(synchro);
@@
-212,8
+212,8
@@
void SIMIX_mutex_unlock(smx_mutex_t mutex, smx_process_t issuer)
/* If the mutex is not owned by the issuer, that's not good */
if (issuer != mutex->owner)
-
THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%d), not by you.",
-
SIMIX_process_get_name(mutex->owner),SIMIX_process_get_PID(mutex->owner));
+ THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%d), not by you.",
+ SIMIX_process_get_name(mutex->owner),SIMIX_process_get_PID(mutex->owner));
if (xbt_swag_size(mutex->sleeping) > 0) {
/*process to wake up */
@@
-284,7
+284,7
@@
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex
* \param simcall the simcall
*/
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
-
smx_mutex_t mutex, double timeout)
+ smx_mutex_t mutex, double timeout)
{
XBT_IN("(%p)",simcall);
smx_process_t issuer = simcall->issuer;