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
Merge pull request #1 from mquinson/master
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
090c872
..
ff7f7e7
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-4,6
+4,7
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "src/surf/surf_interface.hpp"
#include "smx_private.h"
#include "xbt/log.h"
#include "smx_private.h"
#include "xbt/log.h"
@@
-30,7
+31,7
@@
static smx_synchro_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout)
sync->name = xbt_strdup("synchro");
sync->synchro.sleep = surf_host_sleep(smx_host, timeout);
sync->name = xbt_strdup("synchro");
sync->synchro.sleep = surf_host_sleep(smx_host, timeout);
- s
urf_action_set_data(sync->synchro.sleep,
sync);
+ s
ync->synchro.sleep->setData(
sync);
XBT_OUT();
return sync;
}
XBT_OUT();
return sync;
}
@@
-71,7
+72,7
@@
void SIMIX_synchro_destroy(smx_synchro_t synchro)
XBT_IN("(%p)",synchro);
XBT_DEBUG("Destroying synchro %p", synchro);
xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
XBT_IN("(%p)",synchro);
XBT_DEBUG("Destroying synchro %p", synchro);
xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
- s
urf_action_unref(synchro->synchro.sleep
);
+ s
ynchro->synchro.sleep->unref(
);
xbt_free(synchro->name);
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
XBT_OUT();
xbt_free(synchro->name);
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
XBT_OUT();
@@
-81,9
+82,9
@@
void SIMIX_post_synchro(smx_synchro_t synchro)
{
XBT_IN("(%p)",synchro);
xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
{
XBT_IN("(%p)",synchro);
xbt_assert(synchro->type == SIMIX_SYNC_SYNCHRO);
- if (s
urf_action_get_state(synchro->synchro.sleep
) == SURF_ACTION_FAILED)
+ if (s
ynchro->synchro.sleep->getState(
) == SURF_ACTION_FAILED)
synchro->state = SIMIX_FAILED;
synchro->state = SIMIX_FAILED;
- else if(s
urf_action_get_state(synchro->synchro.sleep
) == SURF_ACTION_DONE)
+ else if(s
ynchro->synchro.sleep->getState(
) == SURF_ACTION_DONE)
synchro->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(synchro);
synchro->state = SIMIX_SRC_TIMEOUT;
SIMIX_synchro_finish(synchro);