X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/61ab0b23d55ea10365ba11d22b8c11b39cbf16e9..9eee526194338d66601c96c441b53fa37f77c0dd:/src/simix/popping_bodies.cpp diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp index bc4c48744f..9c65c5c7fa 100644 --- a/src/simix/popping_bodies.cpp +++ b/src/simix/popping_bodies.cpp @@ -156,13 +156,6 @@ inline static void simcall_BODY_mutex_unlock(smx_mutex_t mutex) return simcall(SIMCALL_MUTEX_UNLOCK, mutex); } -inline static smx_cond_t simcall_BODY_cond_init() -{ - if (0) /* Go to that function to follow the code flow through the simcall barrier */ - SIMIX_cond_init(); - return simcall(SIMCALL_COND_INIT); -} - inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ @@ -170,11 +163,11 @@ inline static void simcall_BODY_cond_wait(smx_cond_t cond, smx_mutex_t mutex) return simcall(SIMCALL_COND_WAIT, cond, mutex); } -inline static void simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) +inline static int simcall_BODY_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ simcall_HANDLER_cond_wait_timeout(&SIMIX_process_self()->simcall, cond, mutex, timeout); - return simcall(SIMCALL_COND_WAIT_TIMEOUT, cond, mutex, timeout); + return simcall(SIMCALL_COND_WAIT_TIMEOUT, cond, mutex, timeout); } inline static void simcall_BODY_sem_acquire(smx_sem_t sem) @@ -184,11 +177,11 @@ inline static void simcall_BODY_sem_acquire(smx_sem_t sem) return simcall(SIMCALL_SEM_ACQUIRE, sem); } -inline static void simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeout) +inline static int simcall_BODY_sem_acquire_timeout(smx_sem_t sem, double timeout) { if (0) /* Go to that function to follow the code flow through the simcall barrier */ simcall_HANDLER_sem_acquire_timeout(&SIMIX_process_self()->simcall, sem, timeout); - return simcall(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem, timeout); + return simcall(SIMCALL_SEM_ACQUIRE_TIMEOUT, sem, timeout); } inline static sg_size_t simcall_BODY_storage_read(surf_storage_t st, sg_size_t size)