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
Fix initialization order.
[simgrid.git]
/
src
/
simix
/
smx_synchro.c
diff --git
a/src/simix/smx_synchro.c
b/src/simix/smx_synchro.c
index
f05cdca
..
eebc903
100644
(file)
--- a/
src/simix/smx_synchro.c
+++ b/
src/simix/smx_synchro.c
@@
-23,16
+23,15
@@
static void _SIMIX_sem_wait(smx_sem_t sem, double timeout, smx_process_t issuer,
static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
static smx_action_t SIMIX_synchro_wait(smx_host_t smx_host, double timeout)
{
XBT_IN("(%p, %f)",smx_host,timeout);
- surf_model_t ws_model = surf_resource_model(smx_host, SURF_WKS_LEVEL);
smx_action_t action;
action = xbt_mallocator_get(simix_global->action_mallocator);
action->type = SIMIX_ACTION_SYNCHRO;
action->name = xbt_strdup("synchro");
action->synchro.sleep =
smx_action_t action;
action = xbt_mallocator_get(simix_global->action_mallocator);
action->type = SIMIX_ACTION_SYNCHRO;
action->name = xbt_strdup("synchro");
action->synchro.sleep =
-
ws_model->extension.workstation.
sleep(smx_host, timeout);
+
surf_workstation_
sleep(smx_host, timeout);
-
ws_model->action_data_set
(action->synchro.sleep, action);
+
surf_action_set_data
(action->synchro.sleep, action);
XBT_OUT();
return action;
}
XBT_OUT();
return action;
}
@@
-73,8
+72,7
@@
void SIMIX_synchro_destroy(smx_action_t action)
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
-
- action->synchro.sleep->model_obj->action_unref(action->synchro.sleep);
+ surf_action_unref(action->synchro.sleep);
xbt_free(action->name);
xbt_mallocator_release(simix_global->action_mallocator, action);
XBT_OUT();
xbt_free(action->name);
xbt_mallocator_release(simix_global->action_mallocator, action);
XBT_OUT();
@@
-84,11
+82,9
@@
void SIMIX_post_synchro(smx_action_t action)
{
XBT_IN("(%p)",action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
{
XBT_IN("(%p)",action);
xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
- surf_model_t ws_model = action->synchro.sleep->model_obj;
-
- if (ws_model->action_state_get(action->synchro.sleep) == SURF_ACTION_FAILED)
+ if (surf_action_get_state(action->synchro.sleep) == SURF_ACTION_FAILED)
action->state = SIMIX_FAILED;
action->state = SIMIX_FAILED;
- else if(
ws_model->action_state_get
(action->synchro.sleep) == SURF_ACTION_DONE)
+ else if(
surf_action_get_state
(action->synchro.sleep) == SURF_ACTION_DONE)
action->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(action);
action->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(action);