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 cxx flag for win build
[simgrid.git]
/
src
/
simix
/
smx_synchro.c
diff --git
a/src/simix/smx_synchro.c
b/src/simix/smx_synchro.c
index
1237446
..
eebc903
100644
(file)
--- a/
src/simix/smx_synchro.c
+++ b/
src/simix/smx_synchro.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-23,14
+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);
+
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 =
- surf_workstation_
model->extension.workstation.sleep(smx_host->
host, timeout);
+ surf_workstation_
sleep(smx_
host, timeout);
- surf_
workstation_model->action_data_set
(action->synchro.sleep, action);
+ surf_
action_set_data
(action->synchro.sleep, action);
XBT_OUT();
return action;
}
XBT_OUT();
return action;
}
@@
-70,7
+71,8
@@
void SIMIX_synchro_destroy(smx_action_t action)
{
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
{
XBT_IN("(%p)",action);
XBT_DEBUG("Destroying synchro %p", action);
- action->synchro.sleep->model_type->action_unref(action->synchro.sleep);
+ xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
+ 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();
@@
-79,9
+81,10
@@
void SIMIX_synchro_destroy(smx_action_t action)
void SIMIX_post_synchro(smx_action_t action)
{
XBT_IN("(%p)",action);
void SIMIX_post_synchro(smx_action_t action)
{
XBT_IN("(%p)",action);
- if (surf_workstation_model->action_state_get(action->synchro.sleep) == SURF_ACTION_FAILED)
+ xbt_assert(action->type == SIMIX_ACTION_SYNCHRO);
+ if (surf_action_get_state(action->synchro.sleep) == SURF_ACTION_FAILED)
action->state = SIMIX_FAILED;
action->state = SIMIX_FAILED;
- else if(surf_
workstation_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);
@@
-456,7
+459,6
@@
void SIMIX_sem_release(smx_sem_t sem)
XBT_DEBUG("Sem release semaphore %p", sem);
if ((proc = xbt_swag_extract(sem->sleeping))) {
XBT_DEBUG("Sem release semaphore %p", sem);
if ((proc = xbt_swag_extract(sem->sleeping))) {
- proc = xbt_swag_extract(sem->sleeping);
SIMIX_synchro_destroy(proc->waiting_action);
proc->waiting_action = NULL;
SIMIX_simcall_answer(&proc->simcall);
SIMIX_synchro_destroy(proc->waiting_action);
proc->waiting_action = NULL;
SIMIX_simcall_answer(&proc->simcall);
@@
-467,7
+469,7
@@
void SIMIX_sem_release(smx_sem_t sem)
}
/** @brief Returns true if acquiring this semaphore would block */
}
/** @brief Returns true if acquiring this semaphore would block */
-
XBT_INLINE
int SIMIX_sem_would_block(smx_sem_t sem)
+int SIMIX_sem_would_block(smx_sem_t sem)
{
XBT_IN("(%p)",sem);
XBT_OUT();
{
XBT_IN("(%p)",sem);
XBT_OUT();