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
Incorporate simgrid-java in simgrid-java/.
[simgrid.git]
/
src
/
simix
/
smx_synchro.c
diff --git
a/src/simix/smx_synchro.c
b/src/simix/smx_synchro.c
index
587e852
..
414b927
100644
(file)
--- a/
src/simix/smx_synchro.c
+++ b/
src/simix/smx_synchro.c
@@
-28,7
+28,7
@@
static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
action->type = SIMIX_ACTION_SYNCHRO;
action->name = xbt_strdup("synchro");
action->synchro.sleep =
action->type = SIMIX_ACTION_SYNCHRO;
action->name = xbt_strdup("synchro");
action->synchro.sleep =
- surf_workstation_model->extension.workstation.sleep(smx_host
->host
, timeout);
+ surf_workstation_model->extension.workstation.sleep(smx_host, timeout);
surf_workstation_model->action_data_set(action->synchro.sleep, action);
XBT_OUT();
surf_workstation_model->action_data_set(action->synchro.sleep, action);
XBT_OUT();
@@
-466,9
+466,6
@@
void SIMIX_sem_release(smx_sem_t sem)
XBT_OUT();
}
XBT_OUT();
}
-XBT_INLINE int SIMIX_pre_sem_would_block(smx_simcall_t simcall, smx_sem_t sem){
- return SIMIX_sem_would_block(sem);
-}
/** @brief Returns true if acquiring this semaphore would block */
XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem)
{
/** @brief Returns true if acquiring this semaphore would block */
XBT_INLINE int SIMIX_sem_would_block(smx_sem_t sem)
{