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
unify version name of executable
[simgrid.git]
/
src
/
simix
/
smx_user.c
diff --git
a/src/simix/smx_user.c
b/src/simix/smx_user.c
index
4b873f9
..
a4453a8
100644
(file)
--- a/
src/simix/smx_user.c
+++ b/
src/simix/smx_user.c
@@
-760,9
+760,11
@@
void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate,
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_action_t comm = simcall_comm_isend(rdv, task_size, rate,
+ smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
+ comm = simcall_comm_isend(rdv, task_size, rate,
src_buff, src_buff_size, match_fun, NULL, data, 0);
simcall_comm_wait(comm, timeout);
src_buff, src_buff_size, match_fun, NULL, data, 0);
simcall_comm_wait(comm, timeout);
+ comm = NULL;
}
else {
simcall_BODY_comm_send(rdv, task_size, rate, src_buff, src_buff_size,
}
else {
simcall_BODY_comm_send(rdv, task_size, rate, src_buff, src_buff_size,
@@
-801,9
+803,11
@@
void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
if (MC_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_action_t comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
+ smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
+ comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size,
match_fun, data);
simcall_comm_wait(comm, timeout);
match_fun, data);
simcall_comm_wait(comm, timeout);
+ comm = NULL;
}
else {
simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,
}
else {
simcall_BODY_comm_recv(rdv, dst_buff, dst_buff_size,
@@
-1203,18
+1207,18
@@
void simcall_file_set_data(smx_file_t fd, void *data)
* \ingroup simix_file_management
*
*/
* \ingroup simix_file_management
*
*/
-s
ize_t simcall_file_read(size_t size, smx_file_t fd
)
+s
g_storage_size_t simcall_file_read(smx_file_t fd, sg_storage_size_t size
)
{
{
- return simcall_BODY_file_read(
size, fd
);
+ return simcall_BODY_file_read(
fd, size
);
}
/**
* \ingroup simix_file_management
*
*/
}
/**
* \ingroup simix_file_management
*
*/
-s
ize_t simcall_file_write(size_t size, smx_file_t fd
)
+s
g_storage_size_t simcall_file_write(smx_file_t fd, sg_storage_size_t size
)
{
{
- return simcall_BODY_file_write(
size, fd
);
+ return simcall_BODY_file_write(
fd, size
);
}
/**
}
/**
@@
-1256,7
+1260,7
@@
xbt_dict_t simcall_file_ls(const char* mount, const char* path)
* \ingroup simix_file_management
*
*/
* \ingroup simix_file_management
*
*/
-size_t simcall_file_get_size (smx_file_t fd){
+s
g_storage_s
ize_t simcall_file_get_size (smx_file_t fd){
return simcall_BODY_file_get_size(fd);
}
return simcall_BODY_file_get_size(fd);
}
@@
-1273,9
+1277,9
@@
xbt_dynar_t simcall_file_get_info(smx_file_t fd)
* \ingroup simix_storage_management
* \brief Returns the free space size on a given storage element.
* \param storage name
* \ingroup simix_storage_management
* \brief Returns the free space size on a given storage element.
* \param storage name
- * \return Return the free space size on a given storage element (as size_t)
+ * \return Return the free space size on a given storage element (as s
g_storage_s
ize_t)
*/
*/
-size_t simcall_storage_get_free_size (const char* name){
+s
g_storage_s
ize_t simcall_storage_get_free_size (const char* name){
return simcall_BODY_storage_get_free_size(name);
}
return simcall_BODY_storage_get_free_size(name);
}
@@
-1283,9
+1287,9
@@
size_t simcall_storage_get_free_size (const char* name){
* \ingroup simix_storage_management
* \brief Returns the used space size on a given storage element.
* \param storage name
* \ingroup simix_storage_management
* \brief Returns the used space size on a given storage element.
* \param storage name
- * \return Return the used space size on a given storage element (as size_t)
+ * \return Return the used space size on a given storage element (as s
g_storage_s
ize_t)
*/
*/
-size_t simcall_storage_get_used_size (const char* name){
+s
g_storage_s
ize_t simcall_storage_get_used_size (const char* name){
return simcall_BODY_storage_get_used_size(name);
}
return simcall_BODY_storage_get_used_size(name);
}
@@
-1293,9
+1297,9
@@
size_t simcall_storage_get_used_size (const char* name){
* \ingroup simix_storage_management
* \brief Returns the list of storages mounted on an host.
* \param host A SIMIX host
* \ingroup simix_storage_management
* \brief Returns the list of storages mounted on an host.
* \param host A SIMIX host
- * \return a d
ynar
containing all storages mounted on the host
+ * \return a d
ict
containing all storages mounted on the host
*/
*/
-xbt_d
ynar
_t simcall_host_get_storage_list(smx_host_t host)
+xbt_d
ict
_t simcall_host_get_storage_list(smx_host_t host)
{
return simcall_BODY_host_get_storage_list(host);
}
{
return simcall_BODY_host_get_storage_list(host);
}