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
Add new type of scalar value 'STRING' for const char*
[simgrid.git]
/
src
/
simix
/
smx_user.c
diff --git
a/src/simix/smx_user.c
b/src/simix/smx_user.c
index
cf09a36
..
d019078
100644
(file)
--- a/
src/simix/smx_user.c
+++ b/
src/simix/smx_user.c
@@
-14,7
+14,7
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
static const char* simcall_names[] = {
#undef SIMCALL_ENUM_ELEMENT
static const char* simcall_names[] = {
#undef SIMCALL_ENUM_ELEMENT
-#define SIMCALL_ENUM_ELEMENT(x) #x /* generate strings from the enumeration values */
+#define SIMCALL_ENUM_ELEMENT(x
,y
) #x /* generate strings from the enumeration values */
SIMCALL_LIST
#undef SIMCALL_ENUM_ELEMENT
};
SIMCALL_LIST
#undef SIMCALL_ENUM_ELEMENT
};
@@
-204,6
+204,7
@@
void simcall_host_set_data(smx_host_t host, void *data)
* \param priority computation priority
* \return A new SIMIX execution action
*/
* \param priority computation priority
* \return A new SIMIX execution action
*/
+
smx_action_t simcall_host_execute(const char *name, smx_host_t host,
double computation_amount,
double priority)
smx_action_t simcall_host_execute(const char *name, smx_host_t host,
double computation_amount,
double priority)
@@
-219,9
+220,12
@@
smx_action_t simcall_host_execute(const char *name, smx_host_t host,
simcall->host_execute.host = host;
simcall->host_execute.computation_amount = computation_amount;
simcall->host_execute.priority = priority;
simcall->host_execute.host = host;
simcall->host_execute.computation_amount = computation_amount;
simcall->host_execute.priority = priority;
+
if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */
simcall->host_execute.result = NULL;
if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */
simcall->host_execute.result = NULL;
- SIMIX_simcall_push(simcall->issuer);
+
+ SIMIX_simcall(SIMCALL_HOST_EXECUTE, PTR(name), PTR(host), DOUBLE(computation_amount), DOUBLE(priority));
+
return simcall->host_execute.result;
}
return simcall->host_execute.result;
}